r8824: allegro and lispwork fixes

diff --git a/usql-tests/test-init.lisp b/usql-tests/test-init.lisp
index 3076a21d0d11ef4b469a5d9592f1c64476c83416..0300371fc11b2a1745626fd6e6d5e86305401f8d 100644 (file)
--- a/usql-tests/test-init.lisp
+++ b/usql-tests/test-init.lisp
@@ -29,7 +29,7 @@
            :initarg :height)
    (married :db-kind :base :accessor married :type boolean :nulls-ok t
             :initarg :married)
-   (birthday :nulls-ok t :type wall-time :initarg :birthday)
+   (birthday :nulls-ok t :type clsql-base:wall-time :initarg :birthday)
    (hobby :db-kind :virtual :initarg :hobby :initform nil)))
   
 (def-view-class employee (person)

diff --git a/usql/metaclasses.lisp b/usql/metaclasses.lisp
index 6332d9ea528b9d9c12b53396e00484191382d153..fb05188464769f0e1e7fa27e9c46108763faf161 100644 (file)
--- a/usql/metaclasses.lisp
+++ b/usql/metaclasses.lisp
@@ -145,7 +145,6 @@ of the default method.  The extra allowed options are the value of the
     result))
 
 
-#+(or cmu scl sbcl openmcl)
 (defmethod validate-superclass ((class standard-db-class)
                                (superclass standard-class))
   t)
@@ -277,13 +276,14 @@ of the default method.  The extra allowed options are the value of the
     (let ((all-slots (mapcar #'frob-slot slots)))
       (setq all-slots (remove-if #'not-db-col all-slots))
       (setq all-slots (stable-sort all-slots #'string< :key #'car))
-      (setf (object-definition class) all-slots
-           (key-slots class) (remove-if-not (lambda (slot)
-                                              (eql (slot-value slot 'db-kind)
-                                                   :key))
-                                            (class-slots class))))))
-
-#+allegro
+      (setf (object-definition class) all-slots))
+    #-(or allegro openmcl)
+    (setf (key-slots class) (remove-if-not (lambda (slot)
+                                            (eql (slot-value slot 'db-kind)
+                                                 :key))
+                                          (class-slots class)))))
+
+#+(or allegro openmcl)
 (defmethod finalize-inheritance :after ((class standard-db-class))
   (setf (key-slots class) (remove-if-not (lambda (slot)
                                           (eql (slot-value slot 'db-kind)