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

[clsql.git] / base / basic-sql.lisp

diff --git a/base/basic-sql.lisp b/base/basic-sql.lisp
index 4546f4e1b4214b874887ef350940f8db9015c1f0..eaccc03315e1770b8139e0be2a10cbd27bd7a757 100644 (file)
--- 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,7 +30,7 @@ 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) (field-names t))
+                  (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)
@@ -38,7 +38,9 @@ that expression and a list of field names selected in sql-exp."))
                       (mapcar #'car rows)
                     rows)))
       (record-sql-action result :result database)
-      (values result names))))
+      (if field-names
+         (values result names)
+       result))))
 
 ;;; Execute