From ed46a5c8a09a913ddfcfdb7a6548d7ae36f4e511 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Wed, 30 Mar 2011 23:32:47 -0600 Subject: [PATCH] Fix previous patch for SBCL so that patch works on non-SBCL systems --- ChangeLog | 5 +++++ debian/changelog | 6 ++++++ sql/metaclasses.lisp | 6 ++++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 21b84f4..b9dc606 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-03-30 Kevin Rosenberg + * Version 5.3.1 + * sql/metaclasses.lisp: Fix previous patch to work + on non-SBCL systems + 2011-03-29 Kevin Rosenberg * Version 5.3.0 * sql/metaclasses.lisp: Apply one-line patch to fix diff --git a/debian/changelog b/debian/changelog index 37ed1f5..691d37d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-sql (5.3.1-1) unstable; urgency=low + + * New upstream + + -- Kevin M. Rosenberg Wed, 30 Mar 2011 23:32:06 -0600 + cl-sql (5.3.0-1) unstable; urgency=low * New upstream diff --git a/sql/metaclasses.lisp b/sql/metaclasses.lisp index 20645de..d942c6d 100644 --- a/sql/metaclasses.lisp +++ b/sql/metaclasses.lisp @@ -319,7 +319,7 @@ column definition in the database.") :accessor view-class-slot-autoincrement-sequence :initarg :autoincrement-sequence :initform nil - :documentation "A string naming the (possibly automatically generated) sequence + :documentation "A string naming the (possibly automatically generated) sequence for a slot with an :auto-increment constraint."))) (defparameter *db-info-lambda-list* @@ -536,7 +536,9 @@ implementations." ;; defclass expansion, which is too early for the CLSQL type ;; conversion to take place. This gets rid of it. It's ugly ;; but it's better than nothing -wcp10/4/10. - #+(and sbcl #.(cl:if (cl:find-symbol "%TYPE-CHECK-FUNCTION" :sb-pcl) '(and) '(or))) + #+(and sbcl #.(cl:if (cl:and (cl:find-package :sb-pcl) + (cl:find-symbol "%TYPE-CHECK-FUNCTION" :sb-pcl)) + '(list 'cl:and) '(list 'cl:or))) (setf (slot-value esd 'sb-pcl::%type-check-function) nil) ) -- 2.34.1