r10325: * sql/oodml.lisp: Use explicit database in fault-join-target-slot

[clsql.git] / sql / oodml.lisp

diff --git a/sql/oodml.lisp b/sql/oodml.lisp
index 7f606636631fb913e8d4624c8c371f7e6f155946..d76712c2d6e7726c65b91675fb5ab65fc29a71c9 100644 (file)
--- a/sql/oodml.lisp
+++ b/sql/oodml.lisp
@@ -248,6 +248,7 @@
     (if vd
        (let ((qualifier (key-qualifier-for-instance instance :database vd)))
          (delete-records :from vt :where qualifier :database vd)
+         (setf (record-caches vd) nil)
          (setf (slot-value instance 'view-database) nil)
           (values))
        (signal-no-database-error vd))))
@@ -642,7 +643,8 @@
                                :attribute (gethash :home-key tdbi) 
                                :table jc-view-table))
                          :where jq
-                         :result-types :auto)))
+                         :result-types :auto
+                         :database (view-database object))))
           (mapcar #'(lambda (i)
                       (let* ((instance (car i))
                              (jcc (make-instance jc :view-database (view-database instance))))
@@ -667,7 +669,8 @@
                   (list instance jcc)))
             (select (sql-expression :attribute (gethash :foreign-key tdbi) :table jc-view-table)
                     :from (sql-expression :table jc-view-table)
-                    :where jq)))))))
+                    :where jq
+                    :database (view-database object))))))))
 
 
 ;;; Remote Joins