r9041:

diff --git a/base/basic-sql.lisp b/base/basic-sql.lisp
index 38733147d990750b4eb971c90a5c96d96b734561..4e968e826b4570052da98d728f1778e5a8e4c161 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 flatp
                   (mapcar #'car res)
-                  res)))
+               res)))
     (record-sql-action res :result database)
     res))
 

diff --git a/base/database.lisp b/base/database.lisp
index 62c6077d313ac7684e8debfd7b209da31a7d6b89..953c40a3bc51779d74b4375a2292f04ea59c97f5 100644 (file)
--- a/base/database.lisp
+++ b/base/database.lisp
@@ -190,8 +190,8 @@ if the database connection has been lost."
                              
     (when (is-database-open db)
       (if force
-         (ignore-errors (disconnect db))
-         (disconnect db :error nil)))
+         (ignore-errors (disconnect :database db))
+         (disconnect :database db :error nil)))
     
     (connect (connection-spec db))))
 

diff --git a/debian/changelog b/debian/changelog
index f09deac2ca7d78c7c616d69249ea0a10cef884fa..1884e939777941601c0d27010c1bd616e71ab995 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-sql (2.7.4-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sat, 17 Apr 2004 09:08:18 -0600
+
 cl-sql (2.7.3-1) unstable; urgency=low
 
   * New upstream