r9564: 8 Jun 2004 Kevin Rosenberg <kevin@rosenberg.net>

        * Version 2.11.6 released
        * sql/oodml.lisp: Commit patch from Edi Weitz
        to fix symbol writing/reading
        * TODO: Add need for symbol slot test

diff --git a/ChangeLog b/ChangeLog
index 06a8dfcaf076f80699b46bcf84f973fa228f50d0..8b963d0c0f0bf72fc1d56d61d26fd5c0538bc94b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+8 Jun 2004 Kevin Rosenberg <kevin@rosenberg.net>
+       * Version 2.11.6 released
+       * sql/oodml.lisp: Commit patch from Edi Weitz
+       to fix symbol writing/reading
+       * TODO: Add need for symbol slot test
+       

 7 Jun 2004 Marcus Pearce <m.t.pearce@city.ac.uk> 
        * sql/package.lisp: remove duplicate export of 
        *CACHE-TABLE-QUERIES-DEFAULT*. 
 7 Jun 2004 Marcus Pearce <m.t.pearce@city.ac.uk> 
        * sql/package.lisp: remove duplicate export of 
        *CACHE-TABLE-QUERIES-DEFAULT*. 

diff --git a/TODO b/TODO
index 9a4acf7f3ae68350b7d1e3c2aaafc90a51baa8af..c5e706c5b8051697f20c0710424e4fc57d19816b 100644 (file)
--- a/TODO
+++ b/TODO
@@ -9,6 +9,7 @@ TESTS TO ADD
 * owner phrases for postgresql and oracle backends
 * Number and Char field types
 * Add test case for return type of (setf slot-value-using-class)
 * owner phrases for postgresql and oracle backends
 * Number and Char field types
 * Add test case for return type of (setf slot-value-using-class)

+* symbol slot

  
 VARIANCES FROM COMMONSQL
 
  
 VARIANCES FROM COMMONSQL
 

diff --git a/debian/changelog b/debian/changelog
index 8f68d471956e0ccfefb9f41af10a37e165556189..79e1309dc5ccd7d48ae729b7f4180c4d72a8c991 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-sql (2.11.6-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Mon, 07 Jun 2004 13:01:23 -0600
+

 cl-sql (2.11.5-1) unstable; urgency=low
 
   * New upstream
 cl-sql (2.11.5-1) unstable; urgency=low
 
   * New upstream

diff --git a/sql/oodml.lisp b/sql/oodml.lisp
index 8b1d0ef7b6b436c136f8850768442f16efaeb0e0..399519cfa0bef8d9544cf3a9b458e4c90513deb4 100644 (file)
--- a/sql/oodml.lisp
+++ b/sql/oodml.lisp
@@ -87,14 +87,11 @@
 ;; Called by 'get-slot-values-from-view'
 ;;
 
 ;; Called by 'get-slot-values-from-view'
 ;;
 

-(defvar *update-context* nil)
-

 (defmethod update-slot-from-db ((instance standard-db-object) slotdef value)
   (declare (optimize (speed 3) #+cmu (extensions:inhibit-warnings 3)))
   (let* ((slot-reader (view-class-slot-db-reader slotdef))
         (slot-name   (slot-definition-name slotdef))
 (defmethod update-slot-from-db ((instance standard-db-object) slotdef value)
   (declare (optimize (speed 3) #+cmu (extensions:inhibit-warnings 3)))
   (let* ((slot-reader (view-class-slot-db-reader slotdef))
         (slot-name   (slot-definition-name slotdef))

-        (slot-type   (specified-type slotdef))
-        (*update-context* (cons (type-of instance) slot-name)))
+        (slot-type   (specified-type slotdef)))

     (cond ((and value (null slot-reader))
            (setf (slot-value instance slot-name)
                  (read-sql-value value (delistify slot-type)
     (cond ((and value (null slot-reader))
            (setf (slot-value instance slot-name)
                  (read-sql-value value (delistify slot-type)


@@ -418,14 +415,12 @@
 
 (defmethod database-output-sql-as-type ((type (eql 'symbol)) val database db-type)
   (declare (ignore database db-type))
 
 (defmethod database-output-sql-as-type ((type (eql 'symbol)) val database db-type)
   (declare (ignore database db-type))

-  (if (keywordp val)
-      (symbol-name val)
-      (if val
-          (concatenate 'string
-                       (package-name (symbol-package val))
-                       "::"
-                       (symbol-name val))
-          "")))
+  (if val
+    (concatenate 'string
+                 (package-name (symbol-package val))
+                 "::"
+                 (symbol-name val))
+    ""))

 
 (defmethod database-output-sql-as-type ((type (eql 'keyword)) val database db-type)
   (declare (ignore database db-type))
 
 (defmethod database-output-sql-as-type ((type (eql 'keyword)) val database db-type)
   (declare (ignore database db-type))


@@ -484,8 +479,7 @@
   (declare (ignore database db-type))
   (when (< 0 (length val))
     (unless (string= val (symbol-name-default-case "NIL"))
   (declare (ignore database db-type))
   (when (< 0 (length val))
     (unless (string= val (symbol-name-default-case "NIL"))

-      (intern (symbol-name-default-case val)
-              (symbol-package *update-context*)))))
+      (read-from-string val))))

 
 (defmethod read-sql-value (val (type (eql 'integer)) database db-type)
   (declare (ignore database db-type))
 
 (defmethod read-sql-value (val (type (eql 'integer)) database db-type)
   (declare (ignore database db-type))