X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=base%2Floop-extension.lisp;h=fa66079c821da6d0e77a318bbca8f7c155375044;hp=c3a2b9f2e930f37be93d1cce60f903d369321955;hb=c4ffac239e4910bff542dadf3212ad95803af64e;hpb=e2c86e8c664d8b3ecfd215843a9a1fbf5fa83693

diff --git a/base/loop-extension.lisp b/base/loop-extension.lisp
index c3a2b9f..fa66079 100644
--- a/base/loop-extension.lisp
+++ b/base/loop-extension.lisp
@@ -41,7 +41,7 @@
     (unless in-phrase
       (ansi-loop::loop-error "Missing OF or IN iteration path."))
     (unless from-phrase
-      (setq from-phrase '(*default-database*)))
+      (setq from-phrase '(clsql-base-sys:*default-database*)))
     (cond
       ((consp variable)
        (let ((query-var (ansi-loop::loop-gentemp 'loop-record-))
@@ -50,22 +50,22 @@
 			      'loop-record-result-set-))
 	     (step-var (ansi-loop::loop-gentemp 'loop-record-step-)))
 	 (push `(when ,result-set-var
-		 (database-dump-result-set ,result-set-var ,db-var))
+		 (clsql-base-sys:database-dump-result-set ,result-set-var ,db-var))
 	       ansi-loop::*loop-epilogue*)
 	 `(((,variable nil ,data-type) (,query-var ,(first in-phrase))
 	    (,db-var ,(first from-phrase))
 	    (,result-set-var nil)
 	    (,step-var nil))
 	   ((multiple-value-bind (%rs %cols)
-		(database-query-result-set ,query-var ,db-var)
+		(clsql-base-sys:database-query-result-set ,query-var ,db-var)
 	      (setq ,result-set-var %rs ,step-var (make-list %cols))))
 	   ()
 	   ()
-	   (not (database-store-next-row ,result-set-var ,db-var ,step-var))
+	   (not (clsql-base-sys:database-store-next-row ,result-set-var ,db-var ,step-var))
 	   (,variable ,step-var)
 	   (not ,result-set-var)
 	   ()
-	   (not (database-store-next-row ,result-set-var ,db-var ,step-var))
+	   (not (clsql-base-sys:database-store-next-row ,result-set-var ,db-var ,step-var))
 	   (,variable ,step-var))))
       (t
        (let ((query-var (ansi-loop::loop-gentemp 'loop-record-))
@@ -73,21 +73,21 @@
 	     (result-set-var (ansi-loop::loop-gentemp
 			      'loop-record-result-set-)))
 	 (push `(when ,result-set-var
-		 (database-dump-result-set ,result-set-var ,db-var))
+		 (clsql-base-sys:database-dump-result-set ,result-set-var ,db-var))
 	       ansi-loop::*loop-epilogue*)
 	 `(((,variable nil ,data-type) (,query-var ,(first in-phrase))
 	    (,db-var ,(first from-phrase))
 	    (,result-set-var nil))
 	   ((multiple-value-bind (%rs %cols)
-		(database-query-result-set ,query-var ,db-var)
+		(clsql-base-sys:database-query-result-set ,query-var ,db-var)
 	      (setq ,result-set-var %rs ,variable (make-list %cols))))
 	   ()
 	   ()
-	   (not (database-store-next-row ,result-set-var ,db-var ,variable))
+	   (not (clsql-base-sys:database-store-next-row ,result-set-var ,db-var ,variable))
 	   ()
 	   (not ,result-set-var)
 	   ()
-	   (not (database-store-next-row ,result-set-var ,db-var ,variable))
+	   (not (clsql-base-sys:database-store-next-row ,result-set-var ,db-var ,variable))
 	   ()))))))
 
 #+(or cmu scl)