X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=base%2Fbasic-sql.lisp;h=eaccc03315e1770b8139e0be2a10cbd27bd7a757;hp=4610c4208793c21cf3e85d57ddb8564b4392880f;hb=9bbed78051e80e6ab76ae47834136035602bbbf1;hpb=d68d59f99911564ac2af867561fefef107cb14e8

diff --git a/base/basic-sql.lisp b/base/basic-sql.lisp
index 4610c42..eaccc03 100644
--- a/base/basic-sql.lisp
+++ b/base/basic-sql.lisp
@@ -12,7 +12,7 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(in-package #:clsql-base-sys)
+(in-package #:clsql-base)
 
 ;;; Query
 
@@ -30,16 +30,17 @@ one result per row. Returns a list of lists of values of the result of
 that expression and a list of field names selected in sql-exp."))
 
 (defmethod query ((query-expression string) &key (database *default-database*)
-                  (result-types nil) (flatp nil))
-  (record-sql-command query-expression database)
-  (let* ((res (database-query query-expression database result-types))
-         (res (if (and flatp (= (length
-                                 (slot-value query-expression 'selections))
-                                1))
-                  (mapcar #'car res)
-                  res)))
-    (record-sql-result res database)
-    res))
+                  (result-types :auto) (flatp nil) (field-names t))
+  (record-sql-action query-expression :query database)
+  (multiple-value-bind (rows names) (database-query query-expression database result-types
+                                                    field-names)
+    (let ((result (if (and flatp (= 1 (length (car rows))))
+                      (mapcar #'car rows)
+                    rows)))
+      (record-sql-action result :result database)
+      (if field-names
+	  (values result names)
+	result))))
 
 ;;; Execute
 
@@ -54,14 +55,13 @@ pair."))
 
 (defmethod execute-command ((sql-expression string)
                             &key (database *default-database*))
-  (record-sql-command sql-expression database)
+  (record-sql-action sql-expression :command database)
   (let ((res (database-execute-command sql-expression database)))
-    (record-sql-result res database))
+    (record-sql-action res :result database))
   (values))
 
-
 (defmacro do-query (((&rest args) query-expression
-		     &key (database '*default-database*) (types nil))
+		     &key (database '*default-database*) (result-types nil))
 		    &body body)
   "Repeatedly executes BODY within a binding of ARGS on the attributes
 of each record resulting from QUERY. The return value is determined by
@@ -74,7 +74,7 @@ the result of executing BODY. The default value of DATABASE is
     `(let ((,db ,database))
       (multiple-value-bind (,result-set ,columns)
           (database-query-result-set ,query-expression ,db
-                                     :full-set nil :types ,types)
+                                     :full-set nil :result-types ,result-types)
         (when ,result-set
           (unwind-protect
                (do ((,row (make-list ,columns)))
@@ -86,7 +86,7 @@ the result of executing BODY. The default value of DATABASE is
 
 (defun map-query (output-type-spec function query-expression
 		  &key (database *default-database*)
-		  (types nil))
+		  (result-types nil))
   "Map the function over all tuples that are returned by the query in
 query-expression.  The results of the function are collected as
 specified in output-type-spec and returned like in MAP."
@@ -94,21 +94,21 @@ specified in output-type-spec and returned like in MAP."
 	       `(if (atom ,type) ,type (car ,type))))
     (case (type-specifier-atom output-type-spec)
       ((nil) 
-       (map-query-for-effect function query-expression database types))
+       (map-query-for-effect function query-expression database result-types))
       (list 
-       (map-query-to-list function query-expression database types))
+       (map-query-to-list function query-expression database result-types))
       ((simple-vector simple-string vector string array simple-array
 	bit-vector simple-bit-vector base-string
 	simple-base-string)
-       (map-query-to-simple output-type-spec function query-expression database types))
+       (map-query-to-simple output-type-spec function query-expression database result-types))
       (t
        (funcall #'map-query (cmucl-compat:result-type-or-lose output-type-spec t)
-              function query-expression :database database :types types)))))
+              function query-expression :database database :result-types result-types)))))
 
-(defun map-query-for-effect (function query-expression database types)
+(defun map-query-for-effect (function query-expression database result-types)
   (multiple-value-bind (result-set columns)
       (database-query-result-set query-expression database :full-set nil
-				 :types types)
+				 :result-types result-types)
     (when result-set
       (unwind-protect
 	   (do ((row (make-list columns)))
@@ -117,10 +117,10 @@ specified in output-type-spec and returned like in MAP."
 	     (apply function row))
 	(database-dump-result-set result-set database)))))
 		     
-(defun map-query-to-list (function query-expression database types)
+(defun map-query-to-list (function query-expression database result-types)
   (multiple-value-bind (result-set columns)
       (database-query-result-set query-expression database :full-set nil
-				 :types types)
+				 :result-types result-types)
     (when result-set
       (unwind-protect
 	   (let ((result (list nil)))
@@ -132,10 +132,10 @@ specified in output-type-spec and returned like in MAP."
 	(database-dump-result-set result-set database)))))
 
 
-(defun map-query-to-simple (output-type-spec function query-expression database types)
+(defun map-query-to-simple (output-type-spec function query-expression database result-types)
   (multiple-value-bind (result-set columns rows)
       (database-query-result-set query-expression database :full-set t
-				 :types types)
+				 :result-types result-types)
     (when result-set
       (unwind-protect
 	   (if rows