r9279: Handle differences in direct-slot-definition values which

[clsql.git] / sql / objects.lisp

diff --git a/sql/objects.lisp b/sql/objects.lisp
index adaf9793631cb57363301b22ef09021e6d5a4d5c..e0d2cef682f51d1738885d4351cfb6f3c5bf3303 100644 (file)
--- a/sql/objects.lisp
+++ b/sql/objects.lisp
@@ -21,9 +21,10 @@
   (:metaclass standard-db-class)
   (:documentation "Superclass for all CLSQL View Classes."))
 
-(defvar *update-records-on-make-instance* nil
-  "When T, UPDATE-RECORDS-FROM-INSTANCE will be automatically called
-when a new instance of a view-class is created.")
+(defvar *db-auto-sync* nil 
+  "A non-nil value means that creating View Class instances or
+  setting their slots automatically creates/updates the
+  corresponding records in the underlying database.")
 
 (defvar *db-deserializing* nil)
 (defvar *db-initializing* nil)
@@ -43,20 +44,25 @@ when a new instance of a view-class is created.")
               (setf (slot-value instance slot-name) nil))))))
   (call-next-method))
 
-#+ignore ;; not currently used
 (defmethod (setf slot-value-using-class) (new-value (class standard-db-class)
-                                         instance slot)
-  (declare (ignore new-value instance slot))
-  (call-next-method))
+                                         instance slot-def)
+  (declare (ignore new-value))
+  (let ((slot-name (%svuc-slot-name slot-def))
+        (slot-kind (view-class-slot-db-kind slot-def)))
+    (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)
   (declare (ignore all-keys))
   (let ((*db-initializing* t))
     (call-next-method)
-    (when (and *update-records-on-make-instance*
+    (when (and *db-auto-sync*
               (not *db-deserializing*))
-      #+nil (created-object object)
       (update-records-from-instance object))))
 
 ;;
@@ -233,11 +239,6 @@ superclass of the newly-defined View Class."
 ;; Called by 'get-slot-values-from-view'
 ;;
 
-(declaim (inline delistify))
-(defun delistify (list)
-  (if (listp list)
-      (car list)
-      list))
 
 (defvar *update-context* nil)
 
@@ -732,6 +733,8 @@ superclass of the newly-defined View Class."
   (let* ((dbi (view-class-slot-db-info slot-def))
         (ts (gethash :target-slot dbi))
         (jc (gethash :join-class dbi))
+        (ts-view-table (view-table (find-class ts)))
+        (jc-view-table (view-table (find-class jc)))
         (tdbi (view-class-slot-db-info 
                (find ts (class-slots (find-class jc))
                      :key #'slot-definition-name)))
@@ -743,11 +746,15 @@ superclass of the newly-defined View Class."
        (:immediate
         (let ((res
                (find-all (list ts) 
-                         :inner-join (sql-expression :attribute jc)
+                         :inner-join (sql-expression :table jc-view-table)
                          :on (sql-operation 
                               '==
-                              (sql-expression :attribute (gethash :foreign-key tdbi) :table ts)
-                              (sql-expression :attribute (gethash :home-key tdbi) :table jc))
+                              (sql-expression 
+                               :attribute (gethash :foreign-key tdbi) 
+                               :table ts-view-table)
+                              (sql-expression 
+                               :attribute (gethash :home-key tdbi) 
+                               :table jc-view-table))
                          :where jq
                          :result-types :auto)))
           (mapcar #'(lambda (i)
@@ -772,16 +779,16 @@ superclass of the newly-defined View Class."
                   (setf (slot-value jcc (gethash :home-key tdbi)) 
                         fk)
                   (list instance jcc)))
-            (select (sql-expression :attribute (gethash :foreign-key tdbi) :table jc)
-                    :from (sql-expression :table jc)
+            (select (sql-expression :attribute (gethash :foreign-key tdbi) :table jc-view-table)
+                    :from (sql-expression :table jc-view-table)
                     :where jq)))))))
 
 (defun update-object-joins (objects &key (slots t) (force-p t)
-                           class-name (max-len *default-update-objects-max-len))
+                           class-name (max-len *default-update-objects-max-len*))
   "Updates the remote join slots, that is those slots defined without :retrieval :immediate."
   (when objects
     (unless class-name
-      (class-name (class-of (first object))))
+      (class-name (class-of (first objects))))
     )
   )
 
@@ -873,7 +880,6 @@ superclass of the newly-defined View Class."
             (let* ((class-name (class-name vclass))
                    (db-vals (butlast vals (- (list-length vals)
                                              (list-length selects))))
-                   (*db-initializing* t)
                    (obj (make-instance class-name :view-database database)))
               ;; use refresh keyword here 
               (setf obj (get-slot-values-from-view obj (mapcar #'car selects) 
@@ -890,8 +896,6 @@ superclass of the newly-defined View Class."
                   (car objects)
                   objects))))
     (let* ((*db-deserializing* t)
-          (*default-database* (or database
-                                  (error 'clsql-base::clsql-no-database-error :database nil)))
           (sclasses (mapcar #'find-class view-classes))
           (sels (mapcar #'generate-selection-list sclasses))
           (fullsels (apply #'append sels))