From 90896f2e0ea06af22bda925c71a7470cc1dda263 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Thu, 10 Feb 2005 12:54:34 +0000 Subject: [PATCH] r10324: 08 Feb 2005 Kevin Rosenberg * sql/oodml.lisp: Use explicit database in fault-join-target-slot [Patch from Walter Pelissero] --- ChangeLog | 4 ++++ sql/oodml.lisp | 3 ++- tests/test-oodml.lisp | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 70ea1dc..0de5645 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +08 Feb 2005 Kevin Rosenberg + * sql/oodml.lisp: Use explicit database in fault-join-target-slot + [Patch from Walter Pelissero] + 29 Jan 2005 Kevin Rosenberg * 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 b1a5d6a..a5b080f 100644 --- 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 4add4ad..0457499 100644 --- 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)) -- 2.34.1