From: Kevin M. Rosenberg Date: Mon, 7 Jun 2004 19:01:47 +0000 (+0000) Subject: r9564: 8 Jun 2004 Kevin Rosenberg X-Git-Tag: v3.8.6~326 X-Git-Url: http://git.kpe.io/?p=clsql.git;a=commitdiff_plain;h=5e33459f30bccb5c83fdb5eefadaa4022ebafa42 r9564: 8 Jun 2004 Kevin Rosenberg * 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 06a8dfc..8b963d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +8 Jun 2004 Kevin Rosenberg + * 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 * sql/package.lisp: remove duplicate export of *CACHE-TABLE-QUERIES-DEFAULT*. diff --git a/TODO b/TODO index 9a4acf7..c5e706c 100644 --- 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) +* symbol slot VARIANCES FROM COMMONSQL diff --git a/debian/changelog b/debian/changelog index 8f68d47..79e1309 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-sql (2.11.6-1) unstable; urgency=low + + * New upstream + + -- Kevin M. Rosenberg Mon, 07 Jun 2004 13:01:23 -0600 + cl-sql (2.11.5-1) unstable; urgency=low * New upstream diff --git a/sql/oodml.lisp b/sql/oodml.lisp index 8b1d0ef..399519c 100644 --- a/sql/oodml.lisp +++ b/sql/oodml.lisp @@ -87,14 +87,11 @@ ;; 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)) - (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) @@ -418,14 +415,12 @@ (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)) @@ -484,8 +479,7 @@ (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))