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

[clsql.git] / sql / sql.lisp

diff --git a/sql/sql.lisp b/sql/sql.lisp
index a59989043b5e146daa35aec52be12b3658252a82..8107bd96c1a0fe21b97a97b8d26cf6ed1bf185a1 100644 (file)
--- a/sql/sql.lisp
+++ b/sql/sql.lisp
@@ -33,9 +33,9 @@
   (query (sql-output expr database) :database database :flatp flatp
          :result-types result-types))
 
-(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 +191,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 +262,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))