r9199: fold clsql-base and clsql-base-sys into clsql-base

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

diff --git a/base/loop-extension.lisp b/base/loop-extension.lisp
index fb45905ba364af35c4833255b6d64e980fe05757..f8129b53cf527d5438ccf20bdb4e1245a38d8bd9 100644 (file)
--- a/base/loop-extension.lisp
+++ b/base/loop-extension.lisp
@@ -54,7 +54,7 @@
     (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
       ((consp variable)
        (let ((query-var (ansi-loop::loop-gentemp 'loop-record-))
@@ -63,7 +63,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 +71,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 +87,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,7 +146,7 @@
     (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
       ((consp iter-var)
        (let ((query-var (gensym "LOOP-RECORD-"))
@@ -162,18 +162,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 +189,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))
          ()
          ()