(in-package #:cl-user)
(defpackage #:clsql-postgresql
- (:use #:common-lisp #:clsql-sys #:postgresql #:clsql-uffi)
+ (:use #:common-lisp #:clsql-sys #:pgsql #:clsql-uffi)
(:export #:postgresql-database)
(:documentation "This is the CLSQL interface to PostgreSQL."))
(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)
: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
(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))))))
(defmethod database-create-large-object ((database postgresql-database))
(lo-create (database-conn-ptr database)
- (logior postgresql::+INV_WRITE+ postgresql::+INV_READ+)))
+ (logior pgsql::+INV_WRITE+ pgsql::+INV_READ+)))
#+mb-original
(with-transaction (:database database)
(unwind-protect
(progn
- (setf fd (lo-open ptr object-id postgresql::+INV_WRITE+))
+ (setf fd (lo-open ptr object-id pgsql::+INV_WRITE+))
(when (>= fd 0)
(when (= (lo-write ptr fd data length) length)
(setf result t))))
(database-execute-command "begin" database)
(unwind-protect
(progn
- (setf fd (lo-open ptr object-id postgresql::+INV_WRITE+))
+ (setf fd (lo-open ptr object-id pgsql::+INV_WRITE+))
(when (>= fd 0)
(when (= (lo-write ptr fd data length) length)
(setf result t))))
(unwind-protect
(progn
(database-execute-command "begin" database)
- (setf fd (lo-open ptr object-id postgresql::+INV_READ+))
+ (setf fd (lo-open ptr object-id pgsql::+INV_READ+))
(when (>= fd 0)
(setf length (lo-lseek ptr fd 0 2))
(lo-lseek ptr fd 0 0)
(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 db)
(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)
+ (declare (type pgsql::pgsql-conn-ptr connection))
+ (unless (eq (PQstatus connection)
+ pgsql-conn-status-type#connection-ok)
;; Connect failed
(error 'sql-connection-error
:database-type :postgresql