Changed compute-effective-slot-definition to correctly copy the

autoincrement-sequence slot to the ESD previously it was being skipped
(seemingly by accident).

Thanks to flip214 on #lisp for the bug report

diff --git a/ChangeLog b/ChangeLog
index 986022402eab31b2e1603f7577b9b310941a29a3..6df4c81960242c6a8c040be3dc0ea75e4c0a84c4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-06-22  Russ Tyndall  <russ@acceleration.net>
+       * sql/metaclasses.lisp: Changed compute-effective-slot-definition
+       to correctly copy the autoincrement-sequence slot to the ESD
+       previously it was being skipped (seemingly by accident).  Thanks
+       to flip214 on #lisp for the bug report
+
 2012-04-26  Kevin Rosenberg  <kevin@rosenberg.net>
        * Version 6.2 released: thanks to all the contributors!
 

diff --git a/sql/metaclasses.lisp b/sql/metaclasses.lisp
index df3c36e0e12f51836fc21e9c3557e0e02ce7cee3..73c67cb732300a26ae526628be0be36e8be37b76 100644 (file)
--- a/sql/metaclasses.lisp
+++ b/sql/metaclasses.lisp
@@ -472,32 +472,22 @@ implementations."
         (view-class-slot-definition-mixin
          (setf (slot-value esd 'column) (compute-column-name dsd))
 
-         (setf (slot-value esd 'db-type)
-           (when (slot-boundp dsd 'db-type)
-             (delistify-dsd
-              (view-class-slot-db-type dsd))))
-
-         (setf (slot-value esd 'void-value)
-               (delistify-dsd
-                (view-class-slot-void-value dsd)))
-
-         ;; :db-kind slot value defaults to :base (store slot value in
-         ;; database)
-
-         (setf (slot-value esd 'db-kind)
-           (if (slot-boundp dsd 'db-kind)
-               (delistify-dsd (view-class-slot-db-kind dsd))
-             :base))
-
-         (setf (slot-value esd 'db-reader)
-           (when (slot-boundp dsd 'db-reader)
-             (delistify-dsd (view-class-slot-db-reader dsd))))
-         (setf (slot-value esd 'db-writer)
-           (when (slot-boundp dsd 'db-writer)
-             (delistify-dsd (view-class-slot-db-writer dsd))))
-         (setf (slot-value esd 'db-constraints)
-           (when (slot-boundp dsd 'db-constraints)
-             (delistify-dsd (view-class-slot-db-constraints dsd))))
+         (macrolet
+             ((safe-copy-value (name &optional default)
+                (let ((fn (intern (format nil "~A~A" 'view-class-slot- name ))))
+                  `(setf (slot-value esd ',name)
+                    (or (when (slot-boundp dsd ',name)
+                          (delistify-dsd (,fn dsd)))
+                     ,default)))))
+           (safe-copy-value autoincrement-sequence)
+           (safe-copy-value db-type)
+           (safe-copy-value void-value)
+           (safe-copy-value db-reader)
+           (safe-copy-value db-writer)
+           ;; :db-kind slot value defaults to :base (store slot value in
+           ;; database)
+           (safe-copy-value db-kind :base)
+           (safe-copy-value db-constraints))
 
          ;; I wonder if this slot option and the previous could be merged,
          ;; so that :base and :key remain keyword options, but :db-kind