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 155843ecaab3a5d784978d6a2c45a6ffc0d3e4b7..a7f126ca8255164e362ea93bc1f89815f3263de5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 01 Oct 2004 Kevin Rosenberg <kevin@rosenberg.net>
+       * 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 <kevin@rosenberg.net>
        * sql/metaclass.lisp: Support CLISP's attribute name

diff --git a/debian/changelog b/debian/changelog
index 488d84d8a596d6151553df53dad87b638de7efd8..61767d74a3605a1a8e853ff0c667174e6f9181de 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-sql (3.0.7-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  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 a086288198f03161cfe8ca33cfd0f2a38f1e0054..ae511ee71c9f6c953952f065bcb3b4dfc9cac5e3 100644 (file)
--- 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 3ec173a40576e7534e8145d67791322ef7824660..fe201eb4c8e71a8318c225cdc9c87c2ee813ff53 100644 (file)
--- 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.")