From 9dd97b8754afa3ff7b3a5d63ee8635fb6734e121 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Tue, 6 Apr 2004 04:51:38 +0000 Subject: [PATCH] r8824: allegro and lispwork fixes --- usql-tests/test-init.lisp | 2 +- usql/metaclasses.lisp | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/usql-tests/test-init.lisp b/usql-tests/test-init.lisp index 3076a21..0300371 100644 --- 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 6332d9e..fb05188 100644 --- 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) -- 2.34.1