X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=base%2Fbasic-sql.lisp;h=055e33a20dda2b351c09b0869049e5170afadac3;hb=f716bb1161cf9e89a96945c4a444244f9d303691;hp=64fdb44038d4741eecb6b5c7ceb27e5768067e66;hpb=d8cc56b3f55e00fda2afffe8dae7d158bf33e2d8;p=clsql.git

diff --git a/base/basic-sql.lisp b/base/basic-sql.lisp
index 64fdb44..055e33a 100644
--- a/base/basic-sql.lisp
+++ b/base/basic-sql.lisp
@@ -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))
+                  (result-types nil) (flatp nil) (field-names t))
   (record-sql-action query-expression :query 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-action res :result database)
-    res))
+  (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
 
@@ -59,11 +60,6 @@ pair."))
     (record-sql-action res :result database))
   (values))
 
-
-(defun describe-table (table &key (database *default-database*))
-  "Return list of 2-element lists containing table name and type."
-  (database-describe-table database table))
-
 (defmacro do-query (((&rest args) query-expression
 		     &key (database '*default-database*) (result-types nil))
 		    &body body)