r8980: multiple fixes from Marcus Pearce

[clsql.git] / sql / sql.lisp

diff --git a/sql/sql.lisp b/sql/sql.lisp
index a904c89ba7af437459d289932cc3f3c4bb6fda18..8cf7758263c04133f7a864bca783af375ea40ca5 100644 (file)
--- a/sql/sql.lisp
+++ b/sql/sql.lisp
@@ -27,11 +27,6 @@
   (execute-command (sql-output expr database) :database database)
   (values))
 
-(defmethod explain ((expr %sql-expression) &key (database *default-database*))
-  (let ((expression (sql-output expr database)))
-    (format *standard-output* "explain: ~S~%" expression)
-    (execute-command (concatenate 'string "explain " expression))))
-
 
 (defmethod query ((expr %sql-expression) &key (database *default-database*)
                   (result-types nil) (flatp nil))
@@ -43,12 +38,12 @@
     (clsql-base-sys::signal-no-database-error database))
   (unless (is-database-open database)
     (database-reconnect database))
-  (dolist (table (list-tables database))
-    (drop-table table database))
-  (dolist (index (list-indexes database))
-    (drop-index index database))
-  (dolist (seq (list-sequences database))
-    (drop-sequence seq database)))
+  (dolist (table (list-tables :database database))
+    (drop-table table :database database))
+  (dolist (index (list-indexes :database database))
+    (drop-index index :database database))
+  (dolist (seq (list-sequences :database database))
+    (drop-sequence seq :database database)))
 
 (defun print-query (query-exp &key titles (formats t) (sizes t) (stream t)
                              (database *default-database*))