X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=sql%2Fgeneric-postgresql.lisp;h=a2dd4372daf6d9c30d8fd925b48b99a4fefa6bd6;hp=983af78b767025a496968f2e272e0e5c41b9563b;hb=9ba5ee2647740aca7777ac12a21db32837f3f2b6;hpb=656074cf47344a3cedaf1986fc7677f573fd5c6f diff --git a/sql/generic-postgresql.lisp b/sql/generic-postgresql.lisp index 983af78..a2dd437 100644 --- a/sql/generic-postgresql.lisp +++ b/sql/generic-postgresql.lisp @@ -15,7 +15,7 @@ (in-package #:clsql-sys) (defclass generic-postgresql-database (database) - () + ((has-table-pg_roles :type boolean :reader has-table-pg_roles :initform nil)) (:documentation "Encapsulate same behavior across postgresql and postgresql-socket backends.")) @@ -51,7 +51,7 @@ (defmethod database-get-type-specifier ((type (eql 'number)) args database (db-type (eql :postgresql))) - (declare (ignore database db-type)) + (declare (ignore database)) (cond ((and (consp args) (= (length args) 2)) (format nil "NUMERIC(~D,~D)" (first args) (second args))) @@ -63,21 +63,49 @@ ;;; Backend functions (defun owner-clause (owner) - (cond + (cond ((stringp owner) (format nil - " AND (relowner=(SELECT usesysid FROM pg_user WHERE (usename='~A')))" + " AND (relowner=(SELECT usesysid FROM pg_user WHERE (usename='~A')))" owner)) ((null owner) - (format nil " AND (NOT (relowner=1))")) + (format nil " AND (relowner<>(SELECT usesysid FROM pg_user WHERE usename='postgres'))")) (t ""))) +(defun has-table (name database) + (let ((name-retrieved + (caar (database-query + (format nil "SELECT relname FROM pg_class WHERE relname='~A'" + name) + database nil nil)))) + (if (and (stringp name-retrieved) (plusp (length name-retrieved))) + t + nil))) + +(defmethod slot-unbound (class (obj generic-postgresql-database) + (slot (eql 'has-table-pg_roles))) + ;; Lazily cache slot value + (declare (ignore class)) + (setf (slot-value obj 'has-table-pg_roles) (has-table "pg_roles" obj))) + (defun database-list-objects-of-type (database type owner) (mapcar #'car (database-query (format nil - "SELECT relname FROM pg_class WHERE (relkind = '~A')~A" + (if (and (has-table-pg_roles database) + (not (eq owner :all))) + " + SELECT c.relname + FROM pg_catalog.pg_class c + LEFT JOIN pg_catalog.pg_roles r ON r.oid = c.relowner + LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace + WHERE c.relkind IN ('~A','') + AND n.nspname NOT IN ('pg_catalog', 'pg_toast') + AND pg_catalog.pg_table_is_visible(c.oid) + ~A" + "SELECT relname FROM pg_class WHERE (relkind = +'~A')~A") type (owner-clause owner)) database nil nil))) @@ -85,11 +113,11 @@ (defmethod database-list-tables ((database generic-postgresql-database) &key (owner nil)) (database-list-objects-of-type database "r" owner)) - + (defmethod database-list-views ((database generic-postgresql-database) &key (owner nil)) (database-list-objects-of-type database "v" owner)) - + (defmethod database-list-indexes ((database generic-postgresql-database) &key (owner nil)) (database-list-objects-of-type database "i" owner)) @@ -99,7 +127,7 @@ &key (owner nil)) (let ((indexrelids (database-query - (format + (format nil "select indexrelid from pg_index where indrelid=(select relfilenode from pg_class where relname='~A'~A)" (string-downcase table) @@ -107,7 +135,7 @@ database :auto nil)) (result nil)) (dolist (indexrelid indexrelids (nreverse result)) - (push + (push (caar (database-query (format nil "select relname from pg_class where relfilenode='~A'" (car indexrelid)) @@ -137,7 +165,7 @@ "oid" "ctid" ;; kmr -- added tableoid - "tableoid") :test #'equal)) + "tableoid") :test #'equal)) result)))) (defmethod database-attribute-type (attribute (table string) @@ -154,7 +182,7 @@ (setf attlen (parse-integer attlen :junk-allowed t) atttypmod (parse-integer atttypmod :junk-allowed t)) - + (let ((coltype (ensure-keyword typname)) (colnull (if (string-equal "f" attnull) 1 0)) collen @@ -198,7 +226,7 @@ (format nil "SELECT SETVAL ('~A', ~A)" name position) database nil nil))))) -(defmethod database-sequence-next (sequence-name +(defmethod database-sequence-next (sequence-name (database generic-postgresql-database)) (values (parse-integer @@ -223,7 +251,7 @@ (unwind-protect (progn (setf (slot-value database 'clsql-sys::state) :open) - (mapcar #'car (database-query "select datname from pg_database" + (mapcar #'car (database-query "select datname from pg_database" database nil nil))) (progn (database-disconnect database) @@ -235,13 +263,13 @@ (defmethod database-list (connection-spec (type (eql :postgresql-socket))) (postgresql-database-list connection-spec type)) -#+nil +#+nil (defmethod database-describe-table ((database generic-postgresql-database) table) ;; MTP: LIST-ATTRIBUTE-TYPES currently executes separate queries for ;; each attribute. It would be more efficient to have a single SQL ;; query return the type data for all attributes. This code is ;; retained as an example of how to do this for PostgreSQL. - (database-query + (database-query (format nil "select a.attname, t.typname from pg_class c, pg_attribute a, pg_type t where c.relname = '~a' @@ -273,8 +301,8 @@ ((in type :float :double :number) "NUMERIC") ((and (consp type) (in (car type) :char :varchar)) "VARCHAR") (t - (error 'sql-user-error - :message + (error 'sql-user-error + :message (format nil "Unknown clsql type ~A." type))))) (defun prepared-sql-to-postgresql-sql (sql) @@ -294,7 +322,7 @@ (setq in-str (not in-str)) (write-char c out)) ((and (char= c #\?) (not in-str)) - (write-char #\$ out) + (write-char #\$ out) (write-string (write-to-string (incf param)) out)) (t (write-char c out))))))) @@ -315,7 +343,7 @@ :bindings (make-list (length types))))) (defmethod database-bind-parameter ((stmt postgresql-stmt) position value) - (setf (nth (1- position) (bindings stmt)) value)) + (setf (nth (1- position) (bindings stmt)) value)) (defun binding-to-param (binding) (typecase binding