From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Sat, 17 Apr 2004 15:13:40 +0000 (+0000)
Subject: r9041:
X-Git-Tag: v3.8.6~615
X-Git-Url: http://git.kpe.io/?p=clsql.git;a=commitdiff_plain;h=d2df77ea1494c4801d071c8f0e5f7886fd018da9;ds=sidebyside

r9041:
---

diff --git a/base/basic-sql.lisp b/base/basic-sql.lisp
index 3873314..4e968e8 100644
--- 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 62c6077..953c40a 100644
--- 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 f09deac..1884e93 100644
--- 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