X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=base%2Fbasic-sql.lisp;h=bf8ef80f4934d8f692c48fd863d2cf8d24dd6b2d;hb=afe872863374de73b2f2ef767e742a40d7465e4a;hp=4e968e826b4570052da98d728f1778e5a8e4c161;hpb=d2df77ea1494c4801d071c8f0e5f7886fd018da9;p=clsql.git

diff --git a/base/basic-sql.lisp b/base/basic-sql.lisp
index 4e968e8..bf8ef80 100644
--- a/base/basic-sql.lisp
+++ b/base/basic-sql.lisp
@@ -30,14 +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 :auto) (flatp nil) (field-names t))
   (record-sql-action query-expression :query database)
-  (let* ((res (database-query query-expression database result-types))
-         (res (if flatp
-                  (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