r9509: * sql/ooddl.lisp: Commit patch from Edi Weitz fixing return

        type (setf slot-value-using-class)

diff --git a/ChangeLog b/ChangeLog
index f682d2c7e6a84e72da6f686b11a26c85af0fc4de..119049aec003a76cff87a48954a3698e7f92736e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+27 May 2004 Kevin Rosenberg <kevin@rosenberg.net>
+       * sql/ooddl.lisp: Commit patch from Edi Weitz fixing return
+       type (setf slot-value-using-class)
+       

 26 May 2004 Kevin Rosenberg <kevin@rosenberg.net>
        * sql/oodml.lisp: Commit universal-time typo patch from Edi Weitz
        * test/test-init.lisp: Add universal-time slot to person.
 26 May 2004 Kevin Rosenberg <kevin@rosenberg.net>
        * sql/oodml.lisp: Commit universal-time typo patch from Edi Weitz
        * test/test-init.lisp: Add universal-time slot to person.

diff --git a/TODO b/TODO
index 1181bdcd881e4476ecc1b442bfa457b3d25cb055..9a4acf7f3ae68350b7d1e3c2aaafc90a51baa8af 100644 (file)
--- a/TODO
+++ b/TODO
@@ -8,7 +8,7 @@ TESTS TO ADD
 * for-each-row macro
 * owner phrases for postgresql and oracle backends
 * Number and Char field types
 * for-each-row macro
 * owner phrases for postgresql and oracle backends
 * Number and Char field types

-
+* Add test case for return type of (setf slot-value-using-class)

  
 VARIANCES FROM COMMONSQL
 
  
 VARIANCES FROM COMMONSQL
 

diff --git a/db-sqlite/sqlite-loader.lisp b/db-sqlite/sqlite-loader.lisp
index aa25d5e44d835b34cb5207eb13a0f2bf947acbdf..59baaee3822d4cfe8d81b0a0dcb477775e1c27ab 100644 (file)
--- a/db-sqlite/sqlite-loader.lisp
+++ b/db-sqlite/sqlite-loader.lisp
@@ -23,18 +23,14 @@
 to load the SQLite library succesfully.  If this differs at your site,
 set to the right path before compiling or loading the system.")
 
 to load the SQLite library succesfully.  If this differs at your site,
 set to the right path before compiling or loading the system.")
 

-(defvar *sqlite-library-loaded* #+clisp t
-                               #-clisp nil
-    "T if foreign library was able to be loaded successfully")
+(defvar *sqlite-library-loaded* nil
+  "T if foreign library was able to be loaded successfully")

 
 (defmethod database-type-library-loaded ((database-type (eql :sqlite)))
   "T if foreign library was able to be loaded successfully. "
   *sqlite-library-loaded*)
 
 (defmethod database-type-load-foreign ((database-type (eql :sqlite)))
 
 (defmethod database-type-library-loaded ((database-type (eql :sqlite)))
   "T if foreign library was able to be loaded successfully. "
   *sqlite-library-loaded*)
 
 (defmethod database-type-load-foreign ((database-type (eql :sqlite)))

-  #+clisp
-   t
-  #-clisp

   (let ((libpath (uffi:find-foreign-library
                  '("libsqlite" "sqlite")
                  '(#+64bit "/usr/lib64/"
   (let ((libpath (uffi:find-foreign-library
                  '("libsqlite" "sqlite")
                  '(#+64bit "/usr/lib64/"

diff --git a/sql/ooddl.lisp b/sql/ooddl.lisp
index d2158cc99091cbf36215b8d53b5c2df37268aaea..c5e9d885b941d07a9d203313bdd1a2de30c6c794 100644 (file)
--- a/sql/ooddl.lisp
+++ b/sql/ooddl.lisp
@@ -50,12 +50,13 @@
   (let* ((slot-name (%svuc-slot-name slot-def))
         (slot-object (%svuc-slot-object slot-def class))
         (slot-kind (view-class-slot-db-kind slot-object)))
   (let* ((slot-name (%svuc-slot-name slot-def))
         (slot-object (%svuc-slot-object slot-def class))
         (slot-kind (view-class-slot-db-kind slot-object)))

-    (call-next-method)
-    (when (and *db-auto-sync* 
-              (not *db-initializing*)
-              (not *db-deserializing*)
-              (not (eql slot-kind :virtual)))
-      (update-record-from-slot instance slot-name))))
+    (prog1
+      (call-next-method)
+      (when (and *db-auto-sync* 
+                 (not *db-initializing*)
+                 (not *db-deserializing*)
+                 (not (eql slot-kind :virtual)))
+        (update-record-from-slot instance slot-name)))))

 
 (defmethod initialize-instance ((object standard-db-object)
                                        &rest all-keys &key &allow-other-keys)
 
 (defmethod initialize-instance ((object standard-db-object)
                                        &rest all-keys &key &allow-other-keys)