X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=sql%2Foodml.lisp;h=7f606636631fb913e8d4624c8c371f7e6f155946;hb=8be012819c4ecad867ac6f1b0f476116dc14fc15;hp=9d8154f44b6a0c6ea72c8c013d825884351f92dd;hpb=6ae958418dd080abc577c24b5e66af9783441b3f;p=clsql.git

diff --git a/sql/oodml.lisp b/sql/oodml.lisp
index 9d8154f..7f60663 100644
--- a/sql/oodml.lisp
+++ b/sql/oodml.lisp
@@ -737,15 +737,22 @@ 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)))