r9042: Automated commit for Debian build of clsql upstream-version-2.7.5

diff --git a/ChangeLog b/ChangeLog
index b186b5ad17f7869e054daf8468eeae7cdc2be750..2500721e17eb6b5f9cd14dbb8af3d3645f78ca45 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+16 Apr 2004 Kevin Rosenberg (kevin@rosenberg.net)
+       * Version 2.7.5
+       * base/basic-sql.lisp: Fix FLATP in QUERY
+
 16 Apr 2004 Kevin Rosenberg (kevin@rosenberg.net)
        * Version 2.7.3: Implement RECONNECT
 

diff --git a/base/basic-sql.lisp b/base/basic-sql.lisp
index 4e968e826b4570052da98d728f1778e5a8e4c161..7b5452823748c5451baf6caff8b14c8324f37fa8 100644 (file)
--- a/base/basic-sql.lisp
+++ b/base/basic-sql.lisp
@@ -33,7 +33,7 @@ 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 flatp
+         (res (if (and flatp (= 1 (length (car res))))
                   (mapcar #'car res)
                res)))
     (record-sql-action res :result database)

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