r9244: Automated commit for Debian build of clsql upstream-version-2.10.11

[clsql.git] / sql / sql.lisp

diff --git a/sql/sql.lisp b/sql/sql.lisp
index 8107bd96c1a0fe21b97a97b8d26cf6ed1bf185a1..273b8498d55eff1982ef69dd46aa397125b42640 100644 (file)
--- a/sql/sql.lisp
+++ b/sql/sql.lisp
@@ -12,11 +12,10 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(in-package #:clsql-sys)
+(in-package #:clsql)
   
 ;;; Basic operations on databases
 
-
 (defmethod database-query-result-set ((expr %sql-expression) database
                                       &key full-set result-types)
   (database-query-result-set (sql-output expr database) database
@@ -29,9 +28,9 @@
 
 
 (defmethod query ((expr %sql-expression) &key (database *default-database*)
-                  (result-types nil) (flatp nil))
+                  (result-types :auto) (flatp nil) (field-names t))
   (query (sql-output expr database) :database database :flatp flatp
-         :result-types result-types))
+         :result-types result-types :field-names field-names))
 
 (defun truncate-database (&key (database *default-database*))
   (unless (typep database 'database)