(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)
(error 'sql-database-data-error
:database database
:expression sql-expression
- :error-id (PQresultStatus result)
+ :error-id (uffi:convert-from-foreign-string (PQresultErrorField result +PG-DIAG-SQLSTATE+))
:message (tidy-error-message
(PQresultErrorMessage result)))))
(PQclear result))))))
(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))
(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