X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-postgresql%2Fpostgresql-sql.lisp;h=82f03e2454a0d63fff2ddfb4822fd96f31169d9d;hp=d93b153d2f06106b016fa4cfab8516733b4165d8;hb=555141f5d077a76f5bdd6ae83a2b3aee2c66f0c3;hpb=bb2818fb8a6714a55b360dec0bb043c5edccb3f4

diff --git a/db-postgresql/postgresql-sql.lisp b/db-postgresql/postgresql-sql.lisp
index d93b153..82f03e2 100644
--- a/db-postgresql/postgresql-sql.lisp
+++ b/db-postgresql/postgresql-sql.lisp
@@ -127,12 +127,14 @@
 	(declare (type pgsql-conn-def connection))
 	(when (not (eq (PQstatus connection) 
 		       pgsql-conn-status-type#connection-ok))
-	  (error 'sql-connection-error
-		 :database-type database-type
-		 :connection-spec connection-spec
-		 :error-id (PQstatus connection)
-		 :message (tidy-error-message 
-			   (PQerrorMessage connection))))
+          (let ((pqstatus (PQstatus connection))
+                (pqmessage (tidy-error-message (PQerrorMessage connection))))
+            (PQfinish connection)
+            (error 'sql-connection-error
+                   :database-type database-type
+                   :connection-spec connection-spec
+                   :error-id pqstatus
+                   :message  pqmessage)))
 	(make-instance 'postgresql-database
 		       :name (database-name-from-spec connection-spec
 						      database-type)
@@ -158,25 +160,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
@@ -216,7 +222,7 @@
                (error 'sql-database-data-error
                       :database database
                       :expression sql-expression
-                      :error-id (PQresultStatus result)
+                      :error-id (PQresultErrorField result +PG-DIAG-SQLSTATE+)
                       :message (tidy-error-message
 				(PQresultErrorMessage result)))))
           (PQclear result))))))
@@ -408,7 +414,7 @@
 
 (defmethod database-probe (connection-spec (type (eql :postgresql)))
   (when (find (second connection-spec) (database-list connection-spec type)
-	      :key #'car :test #'string-equal)
+              :test #'string-equal)
     t))
 
 
@@ -424,7 +430,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