X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=sql%2Foodml.lisp;h=7f606636631fb913e8d4624c8c371f7e6f155946;hb=952ec6d5f4eeec95f2b9b077a49723b51912d38c;hp=f3c4437b26504775746501ad9a76ac060320f028;hpb=d9f41af62750c622945bb17b622a39689ee5b840;p=clsql.git

diff --git a/sql/oodml.lisp b/sql/oodml.lisp
index f3c4437..7f60663 100644
--- a/sql/oodml.lisp
+++ b/sql/oodml.lisp
@@ -737,21 +737,29 @@ maximum of MAX-LEN instances updated in each query."
 								      keys))
 				      :result-types :auto
 				      :flatp t)))
+
 	      (dolist (object objects)
 		(when (or force-p (not (slot-boundp object slotdef-name)))
-		  (let ((res (find (slot-value object home-key) results 
-				   :key #'(lambda (res) (slot-value res foreign-key))
-				   :test #'equal)))
+		  (let ((res (remove-if-not #'(lambda (obj)
+						(equal obj (slot-value
+							    object
+							    home-key)))
+					    results
+					    :key #'(lambda (res)
+						     (slot-value res
+								 foreign-key)))))
 		    (when res
-		      (setf (slot-value object slotdef-name) res)))))))))))
+		      (setf (slot-value object slotdef-name)
+			    (if (gethash :set dbi) res (car res)))))))))))))
   (values))
-  
+
 (defun fault-join-slot-raw (class object slot-def)
   (let* ((dbi (view-class-slot-db-info slot-def))
 	 (jc (gethash :join-class dbi)))
     (let ((jq (join-qualifier class object slot-def)))
       (when jq 
-        (select jc :where jq :flatp t :result-types nil)))))
+        (select jc :where jq :flatp t :result-types nil
+		:database (view-database object))))))
 
 (defun fault-join-slot (class object slot-def)
   (let* ((dbi (view-class-slot-db-info slot-def))