r10547: fix warning

[clsql.git] / sql / metaclasses.lisp

diff --git a/sql/metaclasses.lisp b/sql/metaclasses.lisp
index a086288198f03161cfe8ca33cfd0f2a38f1e0054..c76a210f6e8c6aedc3337ca93ba48027f6717fb1 100644 (file)
--- a/sql/metaclasses.lisp
+++ b/sql/metaclasses.lisp
@@ -78,7 +78,7 @@
        ((typep arg 'sql-ident)
         (slot-value arg 'name))
        ((stringp arg)
-        (intern (symbol-name-default-case arg)))))
+        (intern arg))))
 
 (defun column-name-from-arg (arg)
   (cond ((symbolp arg)
@@ -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)
@@ -311,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
@@ -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
@@ -510,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))