X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-postgresql-socket%2Fpostgresql-socket-sql.lisp;h=46e82ce928c64140be4ae54cd8e846eb74beed62;hp=ebda22c0a7b4557c82504aeedb825b80ad314702;hb=e622ee6f4bf2b9fe81af59d566e651c983a4833b;hpb=8a8ee2d7d791b7a3efaed06420802a925d16fca3 diff --git a/db-postgresql-socket/postgresql-socket-sql.lisp b/db-postgresql-socket/postgresql-socket-sql.lisp index ebda22c..46e82ce 100644 --- a/db-postgresql-socket/postgresql-socket-sql.lisp +++ b/db-postgresql-socket/postgresql-socket-sql.lisp @@ -106,10 +106,10 @@ doesn't depend on UFFI." (defun convert-to-clsql-warning (database condition) (ecase *backend-warning-behavior* (:warn - (warn 'clsql-database-warning :database database + (warn 'sql-database-warning :database database :message (postgresql-condition-message condition))) (:error - (error 'clsql-sql-error :database database + (error 'sql-database-error :database database :message (format nil "Warning upgraded to error: ~A" (postgresql-condition-message condition)))) ((:ignore nil) @@ -117,10 +117,11 @@ doesn't depend on UFFI." ))) (defun convert-to-clsql-error (database expression condition) - (error 'clsql-sql-error :database database + (error 'sql-database-data-error + :database database :expression expression - :errno (type-of condition) - :error (postgresql-condition-message condition))) + :error-id (type-of condition) + :message (postgresql-condition-message condition))) (defmacro with-postgresql-handlers ((database &optional expression) @@ -142,7 +143,7 @@ doesn't depend on UFFI." (eql :postgresql-socket))) t) -(defclass postgresql-socket-database (database) +(defclass postgresql-socket-database (generic-postgresql-database) ((connection :accessor database-connection :initarg :connection :type postgresql-connection))) @@ -181,7 +182,7 @@ doesn't depend on UFFI." (handler-case (handler-bind ((postgresql-warning (lambda (c) - (warn 'clsql-simple-warning + (warn 'sql-warning :format-control "~A" :format-arguments (list (princ-to-string c)))))) @@ -191,11 +192,11 @@ doesn't depend on UFFI." :password password)) (postgresql-error (c) ;; Connect failed - (error 'clsql-connect-error + (error 'sql-connection-error :database-type database-type :connection-spec connection-spec - :errno (type-of c) - :error (postgresql-condition-message c))) + :error-id (type-of c) + :message (postgresql-condition-message c))) (:no-error (connection) ;; Success, make instance (make-instance 'postgresql-socket-database @@ -217,11 +218,11 @@ doesn't depend on UFFI." (wait-for-query-results connection) (unless (eq status :cursor) (close-postgresql-connection connection) - (error 'clsql-sql-error + (error 'sql-database-data-error :database database :expression expression - :errno 'missing-result - :error "Didn't receive result cursor for query.")) + :error-id "missing-result" + :message "Didn't receive result cursor for query.")) (setq result-types (canonicalize-types result-types cursor)) (values (loop for row = (read-cursor-row cursor result-types) @@ -230,11 +231,11 @@ doesn't depend on UFFI." finally (unless (null (wait-for-query-results connection)) (close-postgresql-connection connection) - (error 'clsql-sql-error + (error 'sql-database-data-error :database database :expression expression - :errno 'multiple-results - :error "Received multiple results for query."))) + :error-id "multiple-results" + :message "Received multiple results for query."))) (when field-names (mapcar #'car (postgresql-cursor-fields cursor)))))))) @@ -258,19 +259,19 @@ doesn't depend on UFFI." ((eq status :completed) (unless (null (wait-for-query-results connection)) (close-postgresql-connection connection) - (error 'clsql-sql-error + (error 'sql-database-data-error :database database :expression expression - :errno 'multiple-results - :error "Received multiple results for command.")) + :error-id "multiple-results" + :message "Received multiple results for command.")) result) (t (close-postgresql-connection connection) - (error 'clsql-sql-error + (error 'sql-database-data-error :database database :expression expression - :errno 'missing-result - :error "Didn't receive completion for command."))))))) + :errno "missing-result" + :message "Didn't receive completion for command."))))))) (defstruct postgresql-socket-result-set (done nil) @@ -288,11 +289,11 @@ doesn't depend on UFFI." (wait-for-query-results connection) (unless (eq status :cursor) (close-postgresql-connection connection) - (error 'clsql-sql-error + (error 'sql-database-data-error :database database :expression expression - :errno 'missing-result - :error "Didn't receive result cursor for query.")) + :error-id "missing-result" + :message "Didn't receive result cursor for query.")) (values (make-postgresql-socket-result-set :done nil :cursor cursor @@ -322,149 +323,6 @@ doesn't depend on UFFI." (setf (postgresql-socket-result-set-done result-set) t) (wait-for-query-results (database-connection database))))))) -;;; 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-socket-database) - &key (owner nil)) - (database-list-objects-of-type database "r" owner)) - -(defmethod database-list-views ((database postgresql-socket-database) - &key (owner nil)) - (database-list-objects-of-type database "v" owner)) - -(defmethod database-list-indexes ((database postgresql-socket-database) - &key (owner nil)) - (database-list-objects-of-type database "i" owner)) - -(defmethod database-list-table-indexes (table - (database postgresql-socket-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-socket-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 - (reverse - (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-socket-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-socket-database)) - (database-execute-command - (concatenate 'string "CREATE SEQUENCE " (sql-escape sequence-name)) - database)) - -(defmethod database-drop-sequence (sequence-name - (database postgresql-socket-database)) - (database-execute-command - (concatenate 'string "DROP SEQUENCE " (sql-escape sequence-name)) database)) - -(defmethod database-list-sequences ((database postgresql-socket-database) - &key (owner nil)) - (database-list-objects-of-type database "S" owner)) - -(defmethod database-set-sequence-position (name (position integer) - (database postgresql-socket-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-socket-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-socket-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-socket))) (destructuring-bind (host name user password) connection-spec (let ((database (database-connect (list host "template1" user password) @@ -487,32 +345,6 @@ doesn't depend on UFFI." :key #'car :test #'string-equal) t)) -(defmethod database-list (connection-spec (type (eql :postgresql-socket))) - (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 :auto nil))) - (progn - (database-disconnect database) - (setf (slot-value database 'clsql-sys::state) :closed)))))) - -(defmethod database-describe-table ((database postgresql-socket-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)) - ;; Database capabilities @@ -525,5 +357,8 @@ doesn't depend on UFFI." (defmethod db-type-default-case ((db-type (eql :postgresql-socket))) :lower) +(defmethod database-underlying-type ((database postgresql-socket-database)) + :postgresql) + (when (clsql-sys:database-type-library-loaded :postgresql-socket) (clsql-sys:initialize-database-type :database-type :postgresql-socket))