r10284: * sql/utils.lisp: Fix unnecessary consing noted by Fred Gilham.

[clsql.git] / sql / metaclasses.lisp

diff --git a/sql/metaclasses.lisp b/sql/metaclasses.lisp
index 7980e325edcf6737aefb3d2f3ec5b7e93a9db9ea..909f622b4ffcc1f0f1137d372c8327581403ba86 100644 (file)
--- a/sql/metaclasses.lisp
+++ b/sql/metaclasses.lisp
@@ -167,9 +167,9 @@
 
 (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 'type)))
+           (let ((type (slot-definition-type slot)))
              (if (eq type t)
                  (setq type nil))
              (list (slot-value slot 'name)
@@ -309,7 +309,7 @@ column definition in the database.")
 (defun parse-db-info (db-info-list)
   (destructuring-bind
        (&key join-class home-key key-join foreign-key (delete-rule nil)
-             (target-slot nil) (retrieval :deferred) (set nil))
+             (target-slot nil) (retrieval :deferred) (set t))
       db-info-list
     (let ((ih (make-hash-table :size 6)))
       (if join-class
@@ -423,13 +423,15 @@ which does type checking before storing a value in a slot."
       (car list)
       list))
 
-(declaim (inline delistify))
+(declaim (inline delistify-dsd))
 (defun delistify-dsd (list)
   "Some MOPs, like openmcl 0.14.2, cons attribute values in a list."
   (if (and (listp list) (null (cdr list)))
       (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)
@@ -442,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 'type)
-       (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
@@ -508,9 +511,9 @@ which does type checking before storing a value in a slot."
        (t
         (let ((type-predicate #+openmcl (slot-value esd 'ccl::type-predicate)))
           #-openmcl (declare (ignore type-predicate))
-          (change-class esd 'view-class-effective-slot-definition
-                        #+allegro :name 
-                        #+allegro (slot-definition-name dsd))
+          #-clisp (change-class esd 'view-class-effective-slot-definition
+                                #+allegro :name 
+                                #+allegro (slot-definition-name dsd))
           #+openmcl (setf (slot-value esd 'ccl::type-predicate)
                           type-predicate))