X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=sql%2Fgeneric-postgresql.lisp;h=aac16ddc85acad1727bca12b56ce0028ce44c056;hp=af0ef61fabb0ff15a91f65792d33313771af8677;hb=f6ab1b1e5f2cac1257f2a37de4260840c3204d51;hpb=7308bdf188da6424e615ca14096ef53cfb845a90 diff --git a/sql/generic-postgresql.lisp b/sql/generic-postgresql.lisp index af0ef61..aac16dd 100644 --- a/sql/generic-postgresql.lisp +++ b/sql/generic-postgresql.lisp @@ -27,41 +27,47 @@ (declare (ignore type args database)) "VARCHAR") -(defmethod database-get-type-specifier ((type (eql 'simple-base-string)) args database +(defmethod database-get-type-specifier ((type (eql 'string)) args database (db-type (eql :postgresql))) (declare (ignore database)) (if args - (format nil "VARCHAR(~A)" (car args)) - "VARCHAR")) + (format nil "CHAR(~A)" (car args)) + "VARCHAR")) -(defmethod database-get-type-specifier ((type (eql 'simple-string)) args database +(defmethod database-get-type-specifier ((type (eql 'tinyint)) args database (db-type (eql :postgresql))) - (declare (ignore database)) - (if args - (format nil "VARCHAR(~A)" (car args)) - "VARCHAR")) + (declare (ignore args database)) + "INT2") -(defmethod database-get-type-specifier ((type (eql 'string)) args database +(defmethod database-get-type-specifier ((type (eql 'smallint)) args database (db-type (eql :postgresql))) - (declare (ignore database)) - (if args - (format nil "VARCHAR(~A)" (car args)) - "VARCHAR")) + (declare (ignore args database)) + "INT2") (defmethod database-get-type-specifier ((type (eql 'wall-time)) args database (db-type (eql :postgresql))) (declare (ignore args database)) "TIMESTAMP WITHOUT TIME ZONE") +(defmethod database-get-type-specifier ((type (eql 'number)) args database + (db-type (eql :postgresql))) + (declare (ignore database)) + (cond + ((and (consp args) (= (length args) 2)) + (format nil "NUMERIC(~D,~D)" (first args) (second args))) + ((and (consp args) (= (length args) 1)) + (format nil "NUMERIC(~D)" (first args))) + (t + "NUMERIC"))) ;;; 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))")) @@ -79,11 +85,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)) @@ -93,7 +99,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) @@ -101,7 +107,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)) @@ -119,7 +125,7 @@ (result (mapcar #'car (database-query - (format nil "SELECT attname FROM pg_class,pg_attribute WHERE pg_class.oid=attrelid AND relname='~A'~A" + (format nil "SELECT attname FROM pg_class,pg_attribute WHERE pg_class.oid=attrelid AND attisdropped = FALSE AND relname='~A'~A" (string-downcase table) owner-clause) database nil nil)))) @@ -131,7 +137,7 @@ "oid" "ctid" ;; kmr -- added tableoid - "tableoid") :test #'equal)) + "tableoid") :test #'equal)) result)))) (defmethod database-attribute-type (attribute (table string) @@ -144,15 +150,29 @@ (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))))) + (destructuring-bind (typname attlen atttypmod attnull) row + + (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 + colprec) + (setf (values collen colprec) + (case coltype + ((:numeric :decimal) + (if (= -1 atttypmod) + (values nil nil) + (values (ash (- atttypmod 4) -16) + (boole boole-and (- atttypmod 4) #xffff)))) + (otherwise + (values + (cond ((and (= -1 attlen) (= -1 atttypmod)) nil) + ((= -1 attlen) (- atttypmod 4)) + (t attlen)) + nil)))) + (values coltype collen colprec colnull)))))) (defmethod database-create-sequence (sequence-name (database generic-postgresql-database)) @@ -178,7 +198,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 @@ -192,7 +212,7 @@ (parse-integer (caar (database-query - (concatenate 'string "SELECT LAST_VALUE ('" sequence-name "')") + (concatenate 'string "SELECT LAST_VALUE FROM " sequence-name) database nil nil))))) (defun postgresql-database-list (connection-spec type) @@ -203,7 +223,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) @@ -215,9 +235,13 @@ (defmethod database-list (connection-spec (type (eql :postgresql-socket))) (postgresql-database-list connection-spec type)) - +#+nil (defmethod database-describe-table ((database generic-postgresql-database) table) - (database-query + ;; 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 (format nil "select a.attname, t.typname from pg_class c, pg_attribute a, pg_type t where c.relname = '~a' @@ -227,3 +251,106 @@ (sql-escape (string-downcase table))) database :auto nil)) +;;; Prepared statements + +(defvar *next-prepared-id-num* 0) +(defun next-prepared-id () + (let ((num (incf *next-prepared-id-num*))) + (format nil "CLSQL_PS_~D" num))) + +(defclass postgresql-stmt () + ((database :initarg :database :reader database) + (id :initarg :id :reader id) + (bindings :initarg :bindings :reader bindings) + (field-names :initarg :field-names :accessor stmt-field-names) + (result-types :initarg :result-types :reader result-types))) + +(defun clsql-type->postgresql-type (type) + (cond + ((in type :int :integer) "INT4") + ((in type :short) "INT2") + ((in type :bigint) "INT8") + ((in type :float :double :number) "NUMERIC") + ((and (consp type) (in (car type) :char :varchar)) "VARCHAR") + (t + (error 'sql-user-error + :message + (format nil "Unknown clsql type ~A." type))))) + +(defun prepared-sql-to-postgresql-sql (sql) + ;; FIXME: Convert #\? to "$n". Don't convert within strings + (declare (simple-string sql)) + (with-output-to-string (out) + (do ((len (length sql)) + (param 0) + (in-str nil) + (pos 0 (1+ pos))) + ((= len pos)) + (declare (fixnum len param pos)) + (let ((c (schar sql pos))) + (declare (character c)) + (cond + ((or (char= c #\") (char= c #\')) + (setq in-str (not in-str)) + (write-char c out)) + ((and (char= c #\?) (not in-str)) + (write-char #\$ out) + (write-string (write-to-string (incf param)) out)) + (t + (write-char c out))))))) + +(defmethod database-prepare (sql-stmt types (database generic-postgresql-database) result-types field-names) + (let ((id (next-prepared-id))) + (database-execute-command + (format nil "PREPARE ~A (~{~A~^,~}) AS ~A" + id + (mapcar #'clsql-type->postgresql-type types) + (prepared-sql-to-postgresql-sql sql-stmt)) + database) + (make-instance 'postgresql-stmt + :id id + :database database + :result-types result-types + :field-names field-names + :bindings (make-list (length types))))) + +(defmethod database-bind-parameter ((stmt postgresql-stmt) position value) + (setf (nth (1- position) (bindings stmt)) value)) + +(defun binding-to-param (binding) + (typecase binding + (string + (concatenate 'string "'" (sql-escape-quotes binding) "'")) + (t + binding))) + +(defmethod database-run-prepared ((stmt postgresql-stmt)) + (with-slots (database id bindings field-names result-types) stmt + (let ((query (format nil "EXECUTE ~A (~{~A~^,~})" + id (mapcar #'binding-to-param bindings)))) + (cond + ((and field-names (not (consp field-names))) + (multiple-value-bind (res names) + (database-query query database result-types field-names) + (setf field-names names) + (values res names))) + (field-names + (values (nth-value 0 (database-query query database result-types nil)) + field-names)) + (t + (database-query query database result-types field-names)))))) + +;;; Capabilities + +(defmethod db-type-has-fancy-math? ((db-type (eql :postgresql))) + t) + +(defmethod db-type-default-case ((db-type (eql :postgresql))) + :lower) + +(defmethod db-type-has-prepared-stmt? ((db-type (eql :postgresql))) + t) + +(defmethod db-type-has-prepared-stmt? ((db-type (eql :postgresql-socket))) + t) +