: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
(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
;;; Database capabilities
-(defmethod db-type-has-fancy-math? ((db-type (eql :postgresql)))
- t)
-
-(defmethod db-type-default-case ((db-type (eql :postgresql)))
- :lower)
-
(when (clsql-sys:database-type-library-loaded :postgresql)
(clsql-sys:initialize-database-type :database-type :postgresql))