X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-postgresql%2Fpostgresql-sql.lisp;h=70cf3b169205e0cfb10e430b348e3f9d2099282e;hb=967266c94b00f91e5967b8330fe2b9134b0c0447;hp=76cab66a214f27e70cf4ec8d18cacb7609561945;hpb=c4da3cfcbb955395d8a556e1f89aadad696302b7;p=clsql.git diff --git a/db-postgresql/postgresql-sql.lisp b/db-postgresql/postgresql-sql.lisp index 76cab66..70cf3b1 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))))) @@ -362,22 +366,27 @@ ;;; Object listing +(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 ""))) + (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)))) - + (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 +398,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)) @@ -479,57 +509,105 @@ (defmethod database-create (connection-spec (type (eql :postgresql))) (destructuring-bind (host name user password) connection-spec - (declare (ignore password)) - (let ((asdf::*verbose-out* (make-string-output-stream))) - (unwind-protect - (let* ((status (asdf:run-shell-command - "su -c ~A createdb -h~A ~A" - user - (if host host "localhost") - name)) - (result (get-output-stream-string asdf::*verbose-out*))) - - (if (search "database creation failed: ERROR:" result) - (error 'clsql-access-error - :connection-spec connection-spec - :database-type type - :error - (format nil "database-create failed: ~s" result)) - t)) - (close asdf::*verbose-out*))))) + (declare (ignore user password)) + (multiple-value-bind (output status) + (clsql-base-sys:command-output "createdb -h~A ~A" + (if host host "localhost") + name) + (if (or (not (zerop status)) + (search "database creation failed: ERROR:" output)) + (error 'clsql-access-error + :connection-spec connection-spec + :database-type type + :error + (format nil "database-create failed: ~A" + output)) + t)))) (defmethod database-destroy (connection-spec (type (eql :postgresql))) (destructuring-bind (host name user password) connection-spec - (declare (ignore password)) - (let ((asdf::*verbose-out* (make-string-output-stream))) - (unwind-protect - (let* ((status (asdf:run-shell-command - "su -c ~A dropdb -h~A ~A" - user - (if host host "localhost") - name)) - (result (get-output-stream-string asdf::*verbose-out*))) - - (if (search "database removal failed: ERROR:" result) - (error 'clsql-access-error - :connection-spec connection-spec - :database-type type - :error - (format nil "database-destroy failed: ~s" result)) - t)) - (close asdf::*verbose-out*))))) + (declare (ignore user password)) + (multiple-value-bind (output status) + (clsql-base-sys:command-output "dropdb -h~A ~A" + (if host host "localhost") + name) + (if (or (not (zerop status)) + (search "database removal failed: ERROR:" output)) + (error 'clsql-access-error + :connection-spec connection-spec + :database-type type + :error + (format nil "database-destory failed: ~A" + output)) + t)))) (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 - (find name (database-query "select datname from pg_database" - database :auto) - :key #'car :test #'string-equal) - (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))