r9228: add tests for result-types for map-query and do-query, ignore incorrect select...

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

diff --git a/base/loop-extension.lisp b/base/loop-extension.lisp
index fb45905ba364af35c4833255b6d64e980fe05757..39a6dfd366461e74d5e3549fd2ffef031c25b81d 100644 (file)
--- a/base/loop-extension.lisp
+++ b/base/loop-extension.lisp
@@ -2,22 +2,16 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          loop-extension.lisp
-;;;; Purpose:       Extensions to the Loop macro for CMUCL
-;;;; Programmer:    Pierre R. Mai
+;;;; Name: loop-extension.lisp
+;;;; Purpose: Extensions to the Loop macro for CLSQL
 ;;;;
-;;;; Copyright (c) 1999-2001 Pierre R. Mai
+;;;; Copyright (c) 2001-2004 Kevin Rosenberg and (c) 1999-2001 Pierre R. Mai
 ;;;;
 ;;;; $Id$
-;;;;
-;;;; The functions in this file were orignally distributed in the
-;;;; MaiSQL package in the file sql/sql.cl
 ;;;; *************************************************************************
 
 (in-package #:cl-user)
 
-;;;; MIT-LOOP extension
-
 #+(or allegro sbcl)
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defpackage #:ansi-loop 
@@ -54,8 +48,13 @@
     (unless in-phrase
       (ansi-loop::loop-error "Missing OF or IN iteration path."))
     (unless from-phrase
-      (setq from-phrase '(clsql-base-sys:*default-database*)))
+      (setq from-phrase '(clsql-base:*default-database*)))
     (cond
+      ;; Object query resulting in a list of returned object instances
+      #+ignore
+      ((consp (car in-phrase))
+       (ansi-loop::loop-error "object query not yet supported"))
+      
       ((consp variable)
        (let ((query-var (ansi-loop::loop-gentemp 'loop-record-))
             (db-var (ansi-loop::loop-gentemp 'loop-record-database-))
@@ -63,7 +62,7 @@
                              'loop-record-result-set-))
             (step-var (ansi-loop::loop-gentemp 'loop-record-step-)))
         (push `(when ,result-set-var
-                 (clsql-base-sys:database-dump-result-set ,result-set-var ,db-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))
@@ -71,15 +70,15 @@
            (,result-set-var nil)
            (,step-var nil))
           ((multiple-value-bind (%rs %cols)
-               (clsql-base-sys:database-query-result-set ,query-var ,db-var)
+               (clsql-base:database-query-result-set ,query-var ,db-var)
              (setq ,result-set-var %rs ,step-var (make-list %cols))))
           ()
           ()
-          (not (clsql-base-sys:database-store-next-row ,result-set-var ,db-var ,step-var))
+          (not (clsql-base:database-store-next-row ,result-set-var ,db-var ,step-var))
           (,variable ,step-var)
           (not ,result-set-var)
           ()
-          (not (clsql-base-sys:database-store-next-row ,result-set-var ,db-var ,step-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-))
@@ -87,22 +86,22 @@
             (result-set-var (ansi-loop::loop-gentemp
                              'loop-record-result-set-)))
         (push `(when ,result-set-var
-                (clsql-base-sys:database-dump-result-set ,result-set-var ,db-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-sys:database-query-result-set ,query-var ,db-var)
+               (clsql-base:database-query-result-set ,query-var ,db-var)
              (setq ,result-set-var %rs ,variable (make-list %cols))))
           ()
           ()
-          (not (clsql-base-sys:database-store-next-row ,result-set-var ,db-var ,variable))
+          (not (clsql-base:database-store-next-row ,result-set-var ,db-var ,variable))
           ()
           (not ,result-set-var)
           ()
-          (not (clsql-base-sys:database-store-next-row ,result-set-var ,db-var ,variable))
+          (not (clsql-base:database-store-next-row ,result-set-var ,db-var ,variable))
           ()))))))
 
 #+(or cmu scl sbcl openmcl allegro)
@@ -146,8 +145,14 @@
     (unless in-phrase
       (error "Missing OF or IN iteration path."))
     (unless from-phrase
-      (setq from-phrase '(clsql-base-sys:*default-database*)))
+      (setq from-phrase '(clsql-base:*default-database*)))
+
     (cond
+      ;; Object query resulting in a list of returned object instances
+      #+ignore
+      ((consp (car in-phrase))
+       (error "Object query not yet supported."))
+      
       ((consp iter-var)
        (let ((query-var (gensym "LOOP-RECORD-"))
             (db-var (gensym "LOOP-RECORD-DATABASE-"))
@@ -162,18 +167,18 @@
            (,result-set-var nil)
            (,step-var nil))
          `((multiple-value-bind (%rs %cols)
-               (clsql-base-sys:database-query-result-set ,query-var ,db-var)
+               (clsql-base:database-query-result-set ,query-var ,db-var)
              (setq ,result-set-var %rs ,step-var (make-list %cols))))
          ()
          ()
-         `((unless (clsql-base-sys:database-store-next-row ,result-set-var ,db-var ,step-var)
+         `((unless (clsql-base:database-store-next-row ,result-set-var ,db-var ,step-var)
              (when ,result-set-var
-               (clsql-base-sys:database-dump-result-set ,result-set-var ,db-var))
+               (clsql-base:database-dump-result-set ,result-set-var ,db-var))
              t))
          `(,iter-var ,step-var)
-         `((unless (clsql-base-sys:database-store-next-row ,result-set-var ,db-var ,step-var)
+         `((unless (clsql-base:database-store-next-row ,result-set-var ,db-var ,step-var)
              (when ,result-set-var
-               (clsql-base-sys:database-dump-result-set ,result-set-var ,db-var))
+               (clsql-base:database-dump-result-set ,result-set-var ,db-var))
              t))
          `(,iter-var ,step-var)
          ()
@@ -189,18 +194,18 @@
            (,db-var ,(first from-phrase))
            (,result-set-var nil))
          `((multiple-value-bind (%rs %cols)
-               (clsql-base-sys:database-query-result-set ,query-var ,db-var)
+               (clsql-base:database-query-result-set ,query-var ,db-var)
              (setq ,result-set-var %rs ,iter-var (make-list %cols))))
          ()
          ()
-         `((unless (clsql-base-sys:database-store-next-row ,result-set-var ,db-var ,iter-var)
+         `((unless (clsql-base:database-store-next-row ,result-set-var ,db-var ,iter-var)
              (when ,result-set-var
-               (clsql-base-sys:database-dump-result-set ,result-set-var ,db-var))
+               (clsql-base:database-dump-result-set ,result-set-var ,db-var))
              t))
           ()
-         `((unless (clsql-base-sys:database-store-next-row ,result-set-var ,db-var ,iter-var)
+         `((unless (clsql-base:database-store-next-row ,result-set-var ,db-var ,iter-var)
              (when ,result-set-var
-               (clsql-base-sys:database-dump-result-set ,result-set-var ,db-var))
+               (clsql-base:database-dump-result-set ,result-set-var ,db-var))
              t))
          ()
          ()