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

diff --git a/base/loop-extension.lisp b/base/loop-extension.lisp
index 526bafd..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
@@ -54,17 +54,18 @@
       (setq variable (list variable)))
 
     (cond
-      ;; Object query resulting in a list of returned object instances
-      ((and (consp (first in-phrase))
-	    (string-equal "select" (symbol-name (caar in-phrase)))
-	    (eq 'quote (first (second (first in-phrase))))
-	    (symbolp (second (second (first in-phrase)))))
+     ;; 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 ,(first in-phrase))
+	    (,result-var (clsql-base:query ,(first in-phrase)))
 	    (,step-var nil))
 	   ()
 	   ()
@@ -159,10 +160,12 @@
       (setq iter-var (list iter-var)))
 
     (cond
-      ;; Object query resulting in a list of returned object instances
-      ((and (string-equal "select" (symbol-name (car in-phrase)))
-	    (eq 'quote (first (second in-phrase)))
-	    (symbolp (second (second in-phrase))))
+     ;; 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-")))
@@ -170,8 +173,8 @@
 	  t
 	  nil
 	  `(,@(mapcar (lambda (v) `(,v nil)) iter-var)
-	    (,result-var ,in-phrase)
-	    (,step-var nil))
+	      (,result-var (clsql-base:query ,in-phrase))
+	      (,step-var nil))
 	  ()
 	  ()
 	  ()