r9241: add type-modified database identifier support to SELECT

[clsql.git] / sql / sql.lisp

diff --git a/sql/sql.lisp b/sql/sql.lisp
index c322666eb2932fdf6c1dde4cde3d47e6e7fd7bd4..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,13 +28,13 @@
 
 
 (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)
+(defun truncate-database (&key (database *default-database*))
   (unless (typep database 'database)
-    (clsql-base-sys::signal-no-database-error database))
+    (clsql-base::signal-no-database-error database))
   (unless (is-database-open database)
     (database-reconnect database))
   (when (db-type-has-views? (database-underlying-type database))