From: Kevin M. Rosenberg Date: Fri, 1 Oct 2004 14:39:42 +0000 (+0000) Subject: r10075: * sql/metaclass.lisp: Rework CLISP MOP handling X-Git-Tag: v3.8.6~226 X-Git-Url: http://git.kpe.io/?p=clsql.git;a=commitdiff_plain;h=e15b72fefebeee46a83d357db2813031edcc6fbd r10075: * sql/metaclass.lisp: Rework CLISP MOP handling * sql/ooddl.lisp: Work-around to have CLISP finalize standard-db-class --- diff --git a/ChangeLog b/ChangeLog index 155843e..a7f126c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ 01 Oct 2004 Kevin Rosenberg + * Version 3.0.7 released * sql/oodml.lisp, sql/package.lisp, db-mysql/mysql-objects.lisp: Add support for mediumint. + * sql/metaclass.lisp: Rework CLISP MOP handling + * sql/ooddl.lisp: Work-around to have CLISP finalize standard-db-class 28 Sep 2004 Kevin Rosenberg * sql/metaclass.lisp: Support CLISP's attribute name diff --git a/debian/changelog b/debian/changelog index 488d84d..61767d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-sql (3.0.7-1) unstable; urgency=low + + * New upstream + + -- Kevin M. Rosenberg Fri, 1 Oct 2004 08:38:52 -0600 + cl-sql (3.0.6-1) unstable; urgency=low * New upstream diff --git a/sql/metaclasses.lisp b/sql/metaclasses.lisp index a086288..ae511ee 100644 --- a/sql/metaclasses.lisp +++ b/sql/metaclasses.lisp @@ -165,13 +165,11 @@ (nth (1+ pos) list))))) (mapcar #'extract keys))) -(defvar *impl-type-attrib-name* #-clisp 'type #+clisp 'clos::$type) - (defun describe-db-layout (class) (flet ((not-db-col (col) - (not (member (nth 2 col) '(nil :base :key)))) + (not (member (nth 2 col) '(nil :base :key)))) (frob-slot (slot) - (let ((type (slot-value slot *impl-type-attrib-name*))) + (let ((type (slot-definition-type slot))) (if (eq type t) (setq type nil)) (list (slot-value slot 'name) @@ -432,6 +430,8 @@ which does type checking before storing a value in a slot." (car list) list)) +(defvar *impl-type-attrib-name* #-clisp 'type #+clisp 'clos::$type) + (defmethod compute-effective-slot-definition ((class standard-db-class) #+kmr-normal-cesd slot-name direct-slots) @@ -444,9 +444,10 @@ which does type checking before storing a value in a slot." (null (specified-type dsd))) (setf (specified-type dsd) (slot-definition-type dsd)) - (setf (slot-value dsd *impl-type-attrib-name*) - (compute-lisp-type-from-slot-specification - dsd (slot-definition-type dsd)))) + (setf #-clisp (slot-value dsd 'type) + #+clisp (slot-definition-type dsd) + (compute-lisp-type-from-slot-specification + dsd (slot-definition-type dsd)))) (let ((esd (call-next-method))) (typecase dsd diff --git a/sql/ooddl.lisp b/sql/ooddl.lisp index 3ec173a..fe201eb 100644 --- a/sql/ooddl.lisp +++ b/sql/ooddl.lisp @@ -20,6 +20,10 @@ :db-kind :virtual)) (:metaclass standard-db-class) (:documentation "Superclass for all CLSQL View Classes.")) +#+clisp +(eval-when (:compile-toplevel :load-toplevel :execute) + (make-instance 'standard-db-object) + (finalize-inheritance (find-class 'standard-db-object))) (defparameter *default-string-length* 255 "The length of a string which does not have a user-specified length.")