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 6b2fb4b0b892391a84bd15227ff298c98cd94b2e..e0d2cef682f51d1738885d4351cfb6f3c5bf3303 100644 (file)
--- a/sql/objects.lisp
+++ b/sql/objects.lisp
@@ -239,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)
 
@@ -738,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)))
@@ -749,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)
@@ -778,8 +779,8 @@ 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)
@@ -787,7 +788,7 @@ superclass of the newly-defined View Class."
   "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))))
     )
   )