X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=sql%2Fobjects.lisp;h=fccf37dbb2a359dc854e1e31c268525af9d6f91e;hp=1342fe3a09ced2c6a4dc7b2740aed1e7788944f8;hb=f469a630aeb903c0574dea5b1ac478bed182d072;hpb=9f88a2a19d13afb9ab7f35ad1df522d00301b56d

diff --git a/sql/objects.lisp b/sql/objects.lisp
index 1342fe3..fccf37d 100644
--- a/sql/objects.lisp
+++ b/sql/objects.lisp
@@ -718,6 +718,19 @@ superclass of the newly-defined View Class."
 	 (res (fault-join-slot-raw class object slot-def)))
     (when res
       (cond
+       ((and ts (gethash :target-slot dbi) (gethash :set dbi))
+	(mapcar (lambda (obj)
+		  (let* ((target-name (gethash :target-slot dbi))
+			 (target-class (find-class target-name)))
+		    (cons 
+		     (car
+		      (fault-join-slot-raw 
+		       target-class
+		       obj
+		       (find target-name (class-slots (class-of obj))
+			     :key #'slot-definition-name)))
+		     obj)))
+		 res))
 	((and ts (gethash :set dbi))
 	 (mapcar (lambda (obj)
 		   (cons obj (slot-value obj ts))) res))
@@ -769,10 +782,10 @@ superclass of the newly-defined View Class."
 
 (defun find-all (view-classes &rest args &key all set-operation distinct from
                  where group-by having order-by order-by-descending offset limit
-		 refresh flatp (database *default-database*))
+		 refresh flatp result-types (database *default-database*))
   "Called by SELECT to generate object query results when the
   View Classes VIEW-CLASSES are passed as arguments to SELECT."
-  (declare (ignore all set-operation group-by having offset limit)
+  (declare (ignore all set-operation group-by having offset limit result-types)
            (optimize (debug 3) (speed 1)))
   (remf args :from)
   (remf args :flatp)