X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-postgresql%2Fpostgresql-sql.lisp;h=2f0ae75ba19a38917cd5cba388426bd984975b7a;hb=8b5250e14e3280bdc4641c3b35a8dc68ca4dbde7;hp=5355972a63fc26fca77e33c9213f51df30c28ea3;hpb=e5744a78271044484b3399d4fc1d55b3e8808784;p=clsql.git diff --git a/db-postgresql/postgresql-sql.lisp b/db-postgresql/postgresql-sql.lisp index 5355972..2f0ae75 100644 --- a/db-postgresql/postgresql-sql.lisp +++ b/db-postgresql/postgresql-sql.lisp @@ -79,7 +79,10 @@ (defclass postgresql-database (database) ((conn-ptr :accessor database-conn-ptr :initarg :conn-ptr - :type pgsql-conn-def))) + :type pgsql-conn-def) + (lock + :accessor database-lock + :initform (make-process-lock "conn")))) (defmethod database-type ((database postgresql-database)) :postgresql) @@ -133,6 +136,7 @@ (make-instance 'postgresql-database :name (database-name-from-spec connection-spec database-type) + :database-type :postgresql :connection-spec connection-spec :conn-ptr connection))))) @@ -142,7 +146,7 @@ (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) @@ -162,15 +166,18 @@ (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 @@ -180,6 +187,13 @@ (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))) @@ -362,22 +376,26 @@ ;;; 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)) @@ -389,7 +407,28 @@ (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)) @@ -513,17 +552,71 @@ (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 + (format nil "select a.attname, t.typname + from pg_class c, pg_attribute a, pg_type t + where c.relname = '~a' + and a.attnum > 0 + and a.attrelid = c.oid + and a.atttypid = t.oid" + (sql-escape (string-downcase table))) + database :auto)) + +(defun %pg-database-connection (connection-spec) + (check-connection-spec connection-spec :postgresql + (host db user password &optional port options tty)) + (macrolet ((coerce-string (var) + `(unless (typep ,var 'simple-base-string) + (setf ,var (coerce ,var 'simple-base-string))))) + (destructuring-bind (host db user password &optional port options tty) + connection-spec + (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) + ;; Connect failed + (error 'clsql-connect-error + :database-type :postgresql + :connection-spec connection-spec + :errno (pqstatus connection) + :error (pqerrormessage connection))) + connection)))) + +(defmethod database-reconnect ((database postgresql-database)) + (let ((lock (database-lock database))) + (with-process-lock (lock "Reconnecting") + (with-slots (connection-spec conn-ptr) + database + (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))