X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=sql%2Fsql.lisp;h=273b8498d55eff1982ef69dd46aa397125b42640;hb=5990bfce392a05c10237d4f97b008c4f828028e5;hp=a59989043b5e146daa35aec52be12b3658252a82;hpb=967266c94b00f91e5967b8330fe2b9134b0c0447;p=clsql.git

diff --git a/sql/sql.lisp b/sql/sql.lisp
index a599890..273b849 100644
--- 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))
@@ -191,10 +190,11 @@ condition is true."
 
 (let ((keyword-package (symbol-package :foo)))
   (defmethod database-output-sql ((sym symbol) database)
-    (declare (ignore database))
-    (if (equal (symbol-package sym) keyword-package)
-        (concatenate 'string "'" (string sym) "'")
-        (symbol-name sym))))
+    (convert-to-db-default-case
+     (if (equal (symbol-package sym) keyword-package)
+	 (concatenate 'string "'" (string sym) "'")
+	 (symbol-name sym))
+     database)))
 
 (defmethod database-output-sql ((tee (eql t)) database)
   (declare (ignore database))
@@ -261,7 +261,8 @@ condition is true."
 			   &key (database *default-database*))
   (database-describe-table
    database
-   (convert-to-db-default-case (symbol-name (slot-value table 'name)) database)))
+   (convert-to-db-default-case 
+    (symbol-name (slot-value table 'name)) database)))
 
 #+nil
 (defmethod add-storage-class ((self database) (class symbol) &key (sequence t))