r10156: * Version 3.1.1

        * sql/generic-postgresql.lisp: Commit patch from Chris Capel to
        ignore columns which have been dropped.

diff --git a/ChangeLog b/ChangeLog
index 5c88642bf4d73e1c6f80105df55f6d4e2fca0460..276cb9d0a5cdbfbdc34571140e03bd9c90d31087 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 11 Nov 2004 Kevin Rosenberg <kevin@rosenberg.net>
+       * Version 3.1.1
+       * sql/generic-postgresql.lisp: Commit patch from Chris Capel to
+       ignore columns which have been dropped.
        * clsql-postgresql-socket.asd, db-postgresql-socket/postgresql-socket-package.lisp:
-       Use sb-md5 package on SBCL, recommended by Chris capel
+       Use sb-md5 package on SBCL, recommended by Chris Capel
        
 09 Nov 2004 Kevin Rosenberg <kevin@rosenberg.net>
        * Version 3.1.0 released: New SQLite3 backend by Aurelio Bignoli

diff --git a/debian/changelog b/debian/changelog
index e4cc865083d8db160739f450ac5f15856c9a2c36..0a4ea088e0ed25dbc8bfeade6b5dca6c3d447b06 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cl-sql (3.1.1-1) unstable; urgency=low
+
+  * New upstream
+  * Rebuild against mysqlclient (closes:280253)
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Fri, 12 Nov 2004 08:09:38 -0700
+
 cl-sql (3.1.0-1) unstable; urgency=low
 
   * New upstream

diff --git a/sql/generic-postgresql.lisp b/sql/generic-postgresql.lisp
index 5149bb08a6db516621c89870892825fb292b90c7..ac01e7ba073ecdfe4d2dcb91039c12796f8d3706 100644 (file)
--- a/sql/generic-postgresql.lisp
+++ b/sql/generic-postgresql.lisp
@@ -115,7 +115,7 @@
          (result
          (mapcar #'car
                  (database-query
-                  (format nil "SELECT attname FROM pg_class,pg_attribute WHERE pg_class.oid=attrelid AND relname='~A'~A"
+                  (format nil "SELECT attname FROM pg_class,pg_attribute WHERE pg_class.oid=attrelid AND attisdropped = FALSE AND relname='~A'~A"
                            (string-downcase table)
                            owner-clause)
                    database nil nil))))