X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-postgresql%2Fpostgresql-sql.lisp;h=6a8c7c83290c6852deff730f229e432e4b9661d8;hp=447bd7e212bb7d91e15d5f2a7432444991183330;hb=d9f41af62750c622945bb17b622a39689ee5b840;hpb=8c6c643e3debe875bd14408cc3129d8148dfd125 diff --git a/db-postgresql/postgresql-sql.lisp b/db-postgresql/postgresql-sql.lisp index 447bd7e..6a8c7c8 100644 --- a/db-postgresql/postgresql-sql.lisp +++ b/db-postgresql/postgresql-sql.lisp @@ -77,7 +77,7 @@ (uffi:def-type pgsql-result-def pgsql-result) -(defclass postgresql-database (database) +(defclass postgresql-database (generic-postgresql-database) ((conn-ptr :accessor database-conn-ptr :initarg :conn-ptr :type pgsql-conn-def) (lock @@ -158,25 +158,29 @@ :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 @@ -373,144 +377,7 @@ ;;; 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 ""))) - -(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)) - -(defmethod database-list-views ((database postgresql-database) - &key (owner nil)) - (database-list-objects-of-type database "v" 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 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)) - (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 attname FROM pg_class,pg_attribute WHERE pg_class.oid=attrelid AND relname='~A'~A" - (string-downcase table) - owner-clause) - database nil nil)))) - (if result - (remove-if #'(lambda (it) (member it '("cmin" - "cmax" - "xmax" - "xmin" - "oid" - "ctid" - ;; kmr -- added tableoid - "tableoid") :test #'equal)) - result)))) - -(defmethod database-attribute-type (attribute (table string) - (database postgresql-database) - &key (owner nil)) - (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 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)) - (database-execute-command - (concatenate 'string "CREATE SEQUENCE " (sql-escape sequence-name)) - database)) - -(defmethod database-drop-sequence (sequence-name - (database postgresql-database)) - (database-execute-command - (concatenate 'string "DROP SEQUENCE " (sql-escape sequence-name)) database)) - -(defmethod database-list-sequences ((database postgresql-database) - &key (owner nil)) - (database-list-objects-of-type database "S" owner)) - -(defmethod database-set-sequence-position (name (position integer) - (database postgresql-database)) - (values - (parse-integer - (caar - (database-query - (format nil "SELECT SETVAL ('~A', ~A)" name position) - database nil nil))))) - -(defmethod database-sequence-next (sequence-name - (database postgresql-database)) - (values - (parse-integer - (caar - (database-query - (concatenate 'string "SELECT NEXTVAL ('" (sql-escape sequence-name) "')") - database nil nil))))) - -(defmethod database-sequence-last (sequence-name (database postgresql-database)) - (values - (parse-integer - (caar - (database-query - (concatenate 'string "SELECT LAST_VALUE ('" sequence-name "')") - database nil nil))))) + (defmethod database-create (connection-spec (type (eql :postgresql))) (destructuring-bind (host name user password) connection-spec @@ -548,30 +415,6 @@ :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 - (progn - (setf (slot-value database 'clsql-sys::state) :open) - (mapcar #'car (database-query "select datname from pg_database" - database nil nil))) - (progn - (database-disconnect database) - (setf (slot-value database 'clsql-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 nil)) (defun %pg-database-connection (connection-spec) (check-connection-spec connection-spec :postgresql @@ -585,7 +428,8 @@ (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 @@ -604,11 +448,5 @@ ;;; 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))