(setf (database-conn-ptr database) nil)
t)
-(defmethod database-query (query-expression (database postgresql-database) result-types)
+(defmethod database-query (query-expression (database postgresql-database) result-types field-names)
(let ((conn-ptr (database-conn-ptr database)))
(declare (type pgsql-conn-def conn-ptr))
(uffi:with-cstring (query-native query-expression)
(setq result-types
(canonicalize-types result-types num-fields
result))
- (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)))))
+ (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)))))
(t
(error 'clsql-sql-error
:database database
(PQresultErrorMessage result)))))
(PQclear result))))))
+(defun result-field-names (num-fields result)
+ "Return list of result field names."
+ (let ((names '()))
+ (dotimes (i num-fields (nreverse names))
+ (declare (fixnum i))
+ (push (uffi:convert-from-foreign-string (PQfname res-ptr i)) names))))
+
(defmethod database-execute-command (sql-expression
(database postgresql-database))
(let ((conn-ptr (database-conn-ptr database)))
;;; Object listing
-(defmethod database-list-objects-of-type ((database postgresql-database)
- type owner)
- (let ((owner-clause
- (cond ((stringp owner)
- (format nil " AND (relowner=(SELECT usesysid FROM pg_user WHERE (usename='~A')))" owner))
- ((null owner)
- (format nil " AND (NOT (relowner=1))"))
- (t ""))))
- (mapcar #'car
- (database-query
- (format nil
- "SELECT relname FROM pg_class WHERE (relkind = '~A')~A"
- type
- owner-clause)
- database nil))))
-
+(defun owner-clause (owner)
+ (cond
+ ((stringp owner)
+ (format
+ nil
+ " AND (relowner=(SELECT usesysid FROM pg_user WHERE (usename='~A')))"
+ owner))
+ ((null owner)
+ (format nil " AND (NOT (relowner=1))"))
+ (t "")))
+
+(defun database-list-objects-of-type (database type owner)
+ (mapcar #'car
+ (database-query
+ (format nil
+ "SELECT relname FROM pg_class WHERE (relkind = '~A')~A"
+ type
+ (owner-clause owner))
+ database nil)))
+
(defmethod database-list-tables ((database postgresql-database)
&key (owner nil))
(database-list-objects-of-type database "r" owner))
(defmethod database-list-indexes ((database postgresql-database)
&key (owner nil))
(database-list-objects-of-type database "i" owner))
-
+
+
+(defmethod database-list-table-indexes (table (database postgresql-database)
+ &key (owner nil))
+ (let ((indexrelids
+ (database-query
+ (format
+ nil
+ "select indexrelid from pg_index where indrelid=(select relfilenode from pg_class where relname='~A'~A)"
+ (string-downcase table)
+ (owner-clause owner))
+ database :auto))
+ (result nil))
+ (dolist (indexrelid indexrelids (nreverse result))
+ (push
+ (caar (database-query
+ (format nil "select relname from pg_class where relfilenode='~A'"
+ (car indexrelid))
+ database
+ nil))
+ result))))
+
(defmethod database-list-attributes ((table string)
(database postgresql-database)
&key (owner nil))
(defmethod database-probe (connection-spec (type (eql :postgresql)))
+ (when (find (second connection-spec) (database-list connection-spec type)
+ :key #'car :test #'string-equal)
+ t))
+
+(defmethod database-list (connection-spec (type (eql :postgresql)))
(destructuring-bind (host name user password) connection-spec
+ (declare (ignore name))
(let ((database (database-connect (list host "template1" user password)
type)))
(unwind-protect
- (when
- (find name (database-query "select datname from pg_database"
- database :auto)
- :key #'car :test #'string-equal)
- t)
- (database-disconnect database)))))
+ (progn
+ (setf (slot-value database 'clsql-base-sys::state) :open)
+ (mapcar #'car (database-query "select datname from pg_database"
+ database nil)))
+ (progn
+ (database-disconnect database)
+ (setf (slot-value database 'clsql-base-sys::state) :closed))))))
(defmethod database-describe-table ((database postgresql-database) table)
(database-query
and a.attnum > 0
and a.attrelid = c.oid
and a.atttypid = t.oid"
- (sql-escape (string-downcase
- (etypecase table
- (string table)
- (clsql-base-sys::sql-create-table
- (symbol-name
- (slot-value table 'clsql-base-sys::name)))))))
+ (sql-escape (string-downcase table)))
database :auto))
(defun %pg-database-connection (connection-spec)
(setf conn-ptr (%pg-database-connection connection-spec))
database))))
+;;; 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-base-sys:database-type-library-loaded :postgresql)
(clsql-base-sys:initialize-database-type :database-type :postgresql))