r9335: Automated commit for Debian build of clsql upstream-version-2.10.16

[clsql.git] / base / loop-extension.lisp

diff --git a/base/loop-extension.lisp b/base/loop-extension.lisp
index 4fc421bb56452ecf71af888c32997faed4e64472..1746832147e8e3e28f0e827e49107ca1eb79e9f6 100644 (file)
--- 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,8 +54,9 @@
       (setq variable (list variable)))
 
     (cond
-      ;; Object query resulting in a list of returned object instances
+     ;; 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)))))
@@ -64,7 +65,7 @@
                              '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))
          ()
          ()
          ()