r9119: Automated commit for Debian build of clsql upstream-version-2.9.2

[clsql.git] / base / basic-sql.lisp

diff --git a/base/basic-sql.lisp b/base/basic-sql.lisp
index 64fdb44038d4741eecb6b5c7ceb27e5768067e66..7b5452823748c5451baf6caff8b14c8324f37fa8 100644 (file)
--- a/base/basic-sql.lisp
+++ b/base/basic-sql.lisp
@@ -33,11 +33,9 @@ that expression and a list of field names selected in sql-exp."))
                   (result-types nil) (flatp nil))
   (record-sql-action query-expression :query database)
   (let* ((res (database-query query-expression database result-types))
-         (res (if (and flatp (= (length
-                                 (slot-value query-expression 'selections))
-                                1))
+         (res (if (and flatp (= 1 (length (car res))))
                   (mapcar #'car res)
-                  res)))
+               res)))
     (record-sql-action res :result database)
     res))
 
@@ -59,11 +57,6 @@ pair."))
     (record-sql-action res :result database))
   (values))
 
-
-(defun describe-table (table &key (database *default-database*))
-  "Return list of 2-element lists containing table name and type."
-  (database-describe-table database table))
-
 (defmacro do-query (((&rest args) query-expression
                     &key (database '*default-database*) (result-types nil))
                    &body body)