X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-postgresql%2Fpostgresql-sql.lisp;h=a55683144423b38bcffe04c6b5d0260d2467e35a;hp=5758730e07f19486a79086b364456f3277a8a080;hb=9bbed78051e80e6ab76ae47834136035602bbbf1;hpb=064bb338ef1375940085db10ec5a202d32e6b68b diff --git a/db-postgresql/postgresql-sql.lisp b/db-postgresql/postgresql-sql.lisp index 5758730..a556831 100644 --- a/db-postgresql/postgresql-sql.lisp +++ b/db-postgresql/postgresql-sql.lisp @@ -16,7 +16,7 @@ (in-package #:cl-user) (defpackage #:clsql-postgresql - (:use #:common-lisp #:clsql-base-sys #:postgresql #:clsql-uffi) + (:use #:common-lisp #:clsql-base #:postgresql #:clsql-uffi) (:export #:postgresql-database) (:documentation "This is the CLSQL interface to PostgreSQL.")) @@ -146,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) @@ -166,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 @@ -184,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-cstring (PQfname result i)) names)))) + (defmethod database-execute-command (sql-expression (database postgresql-database)) (let ((conn-ptr (database-conn-ptr database))) @@ -366,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 nil))) + (defmethod database-list-tables ((database postgresql-database) &key (owner nil)) (database-list-objects-of-type database "r" owner)) @@ -393,7 +407,27 @@ (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 nil)) + (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 nil)) + result)))) + (defmethod database-list-attributes ((table string) (database postgresql-database) &key (owner nil)) @@ -408,7 +442,7 @@ (format nil "SELECT attname FROM pg_class,pg_attribute WHERE pg_class.oid=attrelid AND relname='~A'~A" (string-downcase table) owner-clause) - database nil)))) + database nil nil)))) (if result (reverse (remove-if #'(lambda (it) (member it '("cmin" @@ -424,21 +458,22 @@ (defmethod database-attribute-type (attribute (table string) (database postgresql-database) &key (owner nil)) - (let* ((owner-clause - (cond ((stringp owner) - (format nil " AND (relowner=(SELECT usesysid FROM pg_user WHERE usename='~A'))" owner)) - ((null owner) " AND (not (relowner=1))") - (t ""))) - (result - (mapcar #'car - (database-query - (format nil "SELECT pg_type.typname FROM pg_type,pg_class,pg_attribute WHERE pg_class.oid=pg_attribute.attrelid AND pg_class.relname='~A' AND pg_attribute.attname='~A' AND pg_attribute.atttypid=pg_type.oid~A" + (let ((row (car (database-query + (format nil "SELECT pg_type.typname,pg_attribute.attlen,pg_attribute.atttypmod,pg_attribute.attnotnull FROM pg_type,pg_class,pg_attribute WHERE pg_class.oid=pg_attribute.attrelid AND pg_class.relname='~A' AND pg_attribute.attname='~A' AND pg_attribute.atttypid=pg_type.oid~A" (string-downcase table) - (string-downcase attribute) - owner-clause) - database nil)))) - (when result - (intern (string-upcase (car result)) :keyword)))) + (string-downcase attribute) + (owner-clause owner)) + database nil nil)))) + (when row + (values + (ensure-keyword (first row)) + (if (string= "-1" (second row)) + (- (parse-integer (third row) :junk-allowed t) 4) + (parse-integer (second row))) + nil + (if (string-equal "f" (fourth row)) + 1 + 0))))) (defmethod database-create-sequence (sequence-name (database postgresql-database)) @@ -462,7 +497,7 @@ (caar (database-query (format nil "SELECT SETVAL ('~A', ~A)" name position) - database nil))))) + database nil nil))))) (defmethod database-sequence-next (sequence-name (database postgresql-database)) @@ -471,7 +506,7 @@ (caar (database-query (concatenate 'string "SELECT NEXTVAL ('" (sql-escape sequence-name) "')") - database nil))))) + database nil nil))))) (defmethod database-sequence-last (sequence-name (database postgresql-database)) (values @@ -479,13 +514,13 @@ (caar (database-query (concatenate 'string "SELECT LAST_VALUE ('" sequence-name "')") - database nil))))) + database nil nil))))) (defmethod database-create (connection-spec (type (eql :postgresql))) (destructuring-bind (host name user password) connection-spec (declare (ignore user password)) (multiple-value-bind (output status) - (clsql-base-sys:command-output "createdb -h~A ~A" + (clsql-base:command-output "createdb -h~A ~A" (if host host "localhost") name) (if (or (not (zerop status)) @@ -502,7 +537,7 @@ (destructuring-bind (host name user password) connection-spec (declare (ignore user password)) (multiple-value-bind (output status) - (clsql-base-sys:command-output "dropdb -h~A ~A" + (clsql-base:command-output "dropdb -h~A ~A" (if host host "localhost") name) (if (or (not (zerop status)) @@ -517,16 +552,23 @@ (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::state) :open) + (mapcar #'car (database-query "select datname from pg_database" + database nil nil))) + (progn + (database-disconnect database) + (setf (slot-value database 'clsql-base::state) :closed)))))) (defmethod database-describe-table ((database postgresql-database) table) (database-query @@ -536,13 +578,8 @@ 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))))))) - database :auto)) + (sql-escape (string-downcase table))) + database :auto nil)) (defun %pg-database-connection (connection-spec) (check-connection-spec connection-spec :postgresql @@ -554,15 +591,15 @@ connection-spec (coerce-string db) (coerce-string user) - (let ((connection (pqsetdblogin host port options tty db user password))) + (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) :connection-ok) ;; Connect failed (error 'clsql-connect-error :database-type :postgresql :connection-spec connection-spec - :errno (pqstatus connection) - :error (pqerrormessage connection))) + :errno (PQstatus connection) + :error (PQerrorMessage connection))) connection)))) (defmethod database-reconnect ((database postgresql-database)) @@ -573,5 +610,13 @@ (setf conn-ptr (%pg-database-connection connection-spec)) database)))) -(when (clsql-base-sys:database-type-library-loaded :postgresql) - (clsql-base-sys:initialize-database-type :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-base:database-type-library-loaded :postgresql) + (clsql-base:initialize-database-type :database-type :postgresql))