r10077: * multiple: Apply patch from Joerg Hoehle with multiple

[clsql.git] / db-postgresql / postgresql-sql.lisp

diff --git a/db-postgresql/postgresql-sql.lisp b/db-postgresql/postgresql-sql.lisp
index d93b153d2f06106b016fa4cfab8516733b4165d8..6a8c7c83290c6852deff730f229e432e4b9661d8 100644 (file)
--- a/db-postgresql/postgresql-sql.lisp
+++ b/db-postgresql/postgresql-sql.lisp
@@ -158,25 +158,29 @@
                  :message (tidy-error-message (PQerrorMessage conn-ptr))))
         (unwind-protect
             (case (PQresultStatus result)
+             ;; User gave a command rather than a query 
+              (#.pgsql-exec-status-type#command-ok
+               nil)
               (#.pgsql-exec-status-type#empty-query
                nil)
               (#.pgsql-exec-status-type#tuples-ok
               (let ((num-fields (PQnfields result)))
-                (setq result-types
-                  (canonicalize-types result-types num-fields
-                                            result))
-                 (values
-                  (loop for tuple-index from 0 below (PQntuples result)
-                        collect
-                        (loop for i from 0 below num-fields
-                              collect
-                              (if (zerop (PQgetisnull result tuple-index i))
-                                  (convert-raw-field
-                                   (PQgetvalue result tuple-index i)
-                                   result-types i)
-                                nil)))
-                  (when field-names
-                    (result-field-names num-fields result)))))
+                (when result-types
+                  (setq result-types
+                    (canonicalize-types result-types num-fields
+                                        result)))
+                (let ((res (loop for tuple-index from 0 below (PQntuples result)
+                               collect
+                                 (loop for i from 0 below num-fields
+                                     collect
+                                       (if (zerop (PQgetisnull result tuple-index i))
+                                           (convert-raw-field
+                                            (PQgetvalue result tuple-index i)
+                                            result-types i)
+                                         nil)))))
+                  (if field-names
+                      (values res (result-field-names num-fields result))
+                    res))))
               (t
                (error 'sql-database-data-error
                       :database database
@@ -424,7 +428,8 @@
       (coerce-string user)
       (let ((connection (PQsetdbLogin host port options tty db user password)))
         (declare (type postgresql::pgsql-conn-ptr connection))
-        (unless (eq (PQstatus connection) :connection-ok)
+        (unless (eq (PQstatus connection)
+                   pgsql-conn-status-type#connection-ok)
           ;; Connect failed
           (error 'sql-connection-error
                  :database-type :postgresql