r10324: 08 Feb 2005 Kevin Rosenberg <kevin@rosenberg.net>

        * sql/oodml.lisp: Use explicit database in fault-join-target-slot
        [Patch from Walter Pelissero]

diff --git a/ChangeLog b/ChangeLog
index 70ea1dce1daed04e7c41f659fe956f07abc3562c..0de5645a79aec9433c156d87d16efe6c41f054cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+08 Feb 2005 Kevin Rosenberg <kevin@rosenberg.net>
+       * sql/oodml.lisp: Use explicit database in fault-join-target-slot
+       [Patch from Walter Pelissero]
+       
 29 Jan 2005 Kevin Rosenberg <kevin@rosenberg.net>
        * db-postgresql/postgresql-loader.lisp: Add additional
        directories to Fink on darwin [patch from Cyrus Harmon].

diff --git a/sql/oodml.lisp b/sql/oodml.lisp
index b1a5d6adc117ef8481b06a697d6dd8ee4fb89cbe..a5b080f01f15f1007c5be49b0513df84b113dbf9 100644 (file)
--- a/sql/oodml.lisp
+++ b/sql/oodml.lisp
@@ -668,7 +668,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

diff --git a/tests/test-oodml.lisp b/tests/test-oodml.lisp
index 4add4ad181817f68bafe0379fbf02308f1ffb497..0457499e7ccc256da7885cb816b30c7e0aed7fc8 100644 (file)
--- a/tests/test-oodml.lisp
+++ b/tests/test-oodml.lisp
@@ -454,7 +454,7 @@
                 (every #'(lambda (dea) (typep (slot-value dea 'address) 'address)) dea-list)
                 (mapcar #'(lambda (dea) (slot-value (slot-value dea 'address) 'addressid)) dea-list))))
          t t t t (1 1 2 2 2))
-       
+
        (deftest :oodml/uoj/2
            (progn
              (clsql:update-objects-joins (list company1))