X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=base%2Floop-extension.lisp;h=1746832147e8e3e28f0e827e49107ca1eb79e9f6;hp=3c334b0b5433d665c5b531c05f87caa1313b6ce4;hb=09f07ac9d914a83f9426609f3264f4e66b5a6d97;hpb=e17f07ac3185371f7d2c989c9780f70767296a54

diff --git a/base/loop-extension.lisp b/base/loop-extension.lisp
index 3c334b0..1746832 100644
--- a/base/loop-extension.lisp
+++ b/base/loop-extension.lisp
@@ -2,7 +2,7 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name: loop-extension.lisp
+;;;; Name:    loop-extension.lisp
 ;;;; Purpose: Extensions to the Loop macro for CLSQL
 ;;;;
 ;;;; Copyright (c) 2001-2004 Kevin Rosenberg and (c) 1999-2001 Pierre R. Mai
@@ -49,14 +49,43 @@
       (ansi-loop::loop-error "Missing OF or IN iteration path."))
     (unless from-phrase
       (setq from-phrase '(clsql-base:*default-database*)))
+
+    (unless (consp variable)
+      (setq variable (list variable)))
+
     (cond
-      ;; Object query resulting in a list of returned object instances
-      ((and (consp in-phrase)
-	    (consp (car in-phrase))
-	    (consp (second (car in-phrase)))
-	    (eq 'quote (first (second (car in-phrase))))
-	    (symbolp (second (second (car in-phrase)))))
-       (ansi-loop::loop-error "object query not yet supported"))
+     ;; object query
+     ((and (consp (first in-phrase))
+	   (string-equal "sql-query" (symbol-name (caar in-phrase)))
+	   (consp (second (first in-phrase)))
+	   (eq 'quote (first (second (first in-phrase))))
+	   (symbolp (second (second (first in-phrase)))))
+
+       (let ((result-var (ansi-loop::loop-gentemp
+			      'loop-record-result-))
+	     (step-var (ansi-loop::loop-gentemp 'loop-record-step-)))
+	 `(((,variable nil ,@(and data-type (list data-type)))
+	    (,result-var (clsql-base:query ,(first in-phrase)))
+	    (,step-var nil))
+	   ()
+	   ()
+	   ()
+	   (if (null ,result-var)
+	       t
+	       (progn
+		 (setq ,step-var (first ,result-var))
+		 (setq ,result-var (rest ,result-var))
+		 nil))
+	   (,variable ,step-var)
+	   (null ,result-var)
+	   ()
+	   (if (null ,result-var)
+	       t
+	       (progn
+		 (setq ,step-var (first ,result-var))
+		 (setq ,result-var (rest ,result-var))
+		 nil))
+	   (,variable ,step-var))))
       
       ((consp variable)
        (let ((query-var (ansi-loop::loop-gentemp 'loop-record-))
@@ -82,30 +111,7 @@
 	   (not ,result-set-var)
 	   ()
 	   (not (clsql-base:database-store-next-row ,result-set-var ,db-var ,step-var))
-	   (,variable ,step-var))))
-      (t
-       (let ((query-var (ansi-loop::loop-gentemp 'loop-record-))
-	     (db-var (ansi-loop::loop-gentemp 'loop-record-database-))
-	     (result-set-var (ansi-loop::loop-gentemp
-			      'loop-record-result-set-)))
-	 (push `(when ,result-set-var
-		 (clsql-base:database-dump-result-set ,result-set-var ,db-var))
-	       ansi-loop::*loop-epilogue*)
-	 `(((,variable nil ,@(and data-type (list data-type)))
-	    (,query-var ,(first in-phrase))
-	    (,db-var ,(first from-phrase))
-	    (,result-set-var nil))
-	   ((multiple-value-bind (%rs %cols)
-		(clsql-base:database-query-result-set ,query-var ,db-var :result-types :auto)
-	      (setq ,result-set-var %rs ,variable (make-list %cols))))
-	   ()
-	   ()
-	   (not (clsql-base:database-store-next-row ,result-set-var ,db-var ,variable))
-	   ()
-	   (not ,result-set-var)
-	   ()
-	   (not (clsql-base:database-store-next-row ,result-set-var ,db-var ,variable))
-	   ()))))))
+	   (,variable ,step-var)))))))
 
 #+(or cmu scl sbcl openmcl allegro)
 (ansi-loop::add-loop-path '(record records tuple tuples)
@@ -150,14 +156,45 @@
     (unless from-phrase
       (setq from-phrase '(clsql-base:*default-database*)))
 
+    (unless (consp iter-var)
+      (setq iter-var (list iter-var)))
+
     (cond
-      ;; Object query resulting in a list of returned object instances
-      ((and (consp in-phrase)
-	    (consp (car in-phrase))
-	    (consp (second (car in-phrase)))
-	    (eq 'quote (first (second (car in-phrase))))
-	    (symbolp (second (second (car in-phrase)))))
-       (loop-error "object query not yet supported"))
+     ;; object query
+     ((and (consp in-phrase)
+	   (string-equal "sql-query" (symbol-name (car in-phrase)))
+	   (consp (second in-phrase))
+	   (eq 'quote (first (second in-phrase)))
+	   (symbolp (second (second in-phrase))))
+
+       (let ((result-var (gensym "LOOP-RECORD-RESULT-"))
+	     (step-var (gensym "LOOP-RECORD-STEP-")))
+	 (values
+	  t
+	  nil
+	  `(,@(mapcar (lambda (v) `(,v nil)) iter-var)
+	      (,result-var (clsql-base:query ,in-phrase))
+	      (,step-var nil))
+	  ()
+	  ()
+	  ()
+	  `((if (null ,result-var)
+		t
+		(progn
+		  (setq ,step-var (first ,result-var))
+		  (setq ,result-var (rest ,result-var))
+		  nil)))
+	  `(,iter-var ,step-var)
+	  `((if (null ,result-var)
+		t
+		(progn
+		  (setq ,step-var (first ,result-var))
+		  (setq ,result-var (rest ,result-var))
+		  nil)))
+	   `(,iter-var ,step-var)
+	   ()
+	   ()
+	   )))
       
       ((consp iter-var)
        (let ((query-var (gensym "LOOP-RECORD-"))
@@ -188,32 +225,5 @@
 	      t))
 	  `(,iter-var ,step-var)
 	  ()
-	  ())))
-      (t
-       (let ((query-var (gensym "LOOP-RECORD-"))
-	     (db-var (gensym "LOOP-RECORD-DATABASE-"))
-	     (result-set-var (gensym "LOOP-RECORD-RESULT-SET-")))
-	 (values
-	  t
-	  nil
-	  `((,iter-var nil ,iter-var-data-type) (,query-var ,in-phrase)
-	    (,db-var ,(first from-phrase))
-	    (,result-set-var nil))
-	  `((multiple-value-bind (%rs %cols)
-		(clsql-base:database-query-result-set ,query-var ,db-var :result-types :auto)
-	      (setq ,result-set-var %rs ,iter-var (make-list %cols))))
-	  ()
-	  ()
-	  `((unless (clsql-base:database-store-next-row ,result-set-var ,db-var ,iter-var)
-	      (when ,result-set-var
-		(clsql-base:database-dump-result-set ,result-set-var ,db-var))
-	      t))
-	   ()
-	  `((unless (clsql-base:database-store-next-row ,result-set-var ,db-var ,iter-var)
-	      (when ,result-set-var
-		(clsql-base:database-dump-result-set ,result-set-var ,db-var))
-	      t))
-	  ()
-	  ()
 	  ()))))))