X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-postgresql-socket%2Fpostgresql-socket-sql.lisp;h=aaa5fcbfc22b7701e57ae9b2904ca8b9af78a116;hp=7a56931070229f6262b08f28c0d36dc06c2d90c3;hb=e567409d9fff3f7231c2a0bb69b345e19de2b246;hpb=215ec41559dda52d46539d48a0aa390811c2423c diff --git a/db-postgresql-socket/postgresql-socket-sql.lisp b/db-postgresql-socket/postgresql-socket-sql.lisp index 7a56931..aaa5fcb 100644 --- a/db-postgresql-socket/postgresql-socket-sql.lisp +++ b/db-postgresql-socket/postgresql-socket-sql.lisp @@ -4,7 +4,7 @@ ;;;; ;;;; Name: postgresql-socket-sql.sql ;;;; Purpose: High-level PostgreSQL interface using socket -;;;; Authors: Kevin M. Rosenberg based on original code by Pierre R. Mai +;;;; Authors: Kevin M. Rosenberg based on original code by Pierre R. Mai ;;;; Created: Feb 2002 ;;;; ;;;; $Id$ @@ -36,8 +36,8 @@ (defun make-type-list-for-auto (cursor) (let* ((fields (postgresql-cursor-fields cursor)) - (num-fields (length fields)) - (new-types '())) + (num-fields (length fields)) + (new-types '())) (dotimes (i num-fields) (declare (fixnum i)) (push (canonical-field-type fields i) new-types)) @@ -48,13 +48,13 @@ (let ((oid (cadr (nth index fields)))) (case oid ((#.pgsql-ftype#bytea - #.pgsql-ftype#int2 - #.pgsql-ftype#int4) + #.pgsql-ftype#int2 + #.pgsql-ftype#int4) :int32) (#.pgsql-ftype#int8 :int64) ((#.pgsql-ftype#float4 - #.pgsql-ftype#float8) + #.pgsql-ftype#float8) :double) (otherwise t)))) @@ -63,43 +63,43 @@ (if (null types) nil (let ((auto-list (make-type-list-for-auto cursor))) - (cond - ((listp types) - (canonicalize-type-list types auto-list)) - ((eq types :auto) - auto-list) - (t - nil))))) + (cond + ((listp types) + (canonicalize-type-list types auto-list)) + ((eq types :auto) + auto-list) + (t + nil))))) (defun canonicalize-type-list (types auto-list) "Ensure a field type list meets expectations. Duplicated from clsql-uffi package so that this interface doesn't depend on UFFI." (let ((length-types (length types)) - (new-types '())) + (new-types '())) (loop for i from 0 below (length auto-list) - do - (if (>= i length-types) - (push t new-types) ;; types is shorted than num-fields - (push - (case (nth i types) - (:int - (case (nth i auto-list) - (:int32 - :int32) - (:int64 - :int64) - (t - t))) - (:double - (case (nth i auto-list) - (:double - :double) - (t - t))) - (t - t)) - new-types))) + do + (if (>= i length-types) + (push t new-types) ;; types is shorted than num-fields + (push + (case (nth i types) + (:int + (case (nth i auto-list) + (:int32 + :int32) + (:int64 + :int64) + (t + t))) + (:double + (case (nth i auto-list) + (:double + :double) + (t + t))) + (t + t)) + new-types))) (nreverse new-types))) @@ -107,104 +107,104 @@ doesn't depend on UFFI." (ecase *backend-warning-behavior* (:warn (warn 'sql-database-warning :database database - :message (postgresql-condition-message condition))) + :message (postgresql-condition-message condition))) (:error (error 'sql-database-error :database database - :message (format nil "Warning upgraded to error: ~A" - (postgresql-condition-message condition)))) + :message (format nil "Warning upgraded to error: ~A" + (postgresql-condition-message condition)))) ((:ignore nil) ;; do nothing ))) (defun convert-to-clsql-error (database expression condition) (error 'sql-database-data-error - :database database - :expression expression - :error-id (type-of condition) - :message (postgresql-condition-message condition))) + :database database + :expression expression + :error-id (type-of condition) + :message (postgresql-condition-message condition))) (defmacro with-postgresql-handlers ((database &optional expression) &body body) (let ((database-var (gensym)) - (expression-var (gensym))) + (expression-var (gensym))) `(let ((,database-var ,database) - (,expression-var ,expression)) + (,expression-var ,expression)) (handler-bind ((postgresql-warning - (lambda (c) - (convert-to-clsql-warning ,database-var c))) - (postgresql-error - (lambda (c) - (convert-to-clsql-error - ,database-var ,expression-var c)))) - ,@body)))) + (lambda (c) + (convert-to-clsql-warning ,database-var c))) + (postgresql-error + (lambda (c) + (convert-to-clsql-error + ,database-var ,expression-var c)))) + ,@body)))) (defmethod database-initialize-database-type ((database-type - (eql :postgresql-socket))) + (eql :postgresql-socket))) t) (defclass postgresql-socket-database (generic-postgresql-database) ((connection :accessor database-connection :initarg :connection - :type postgresql-connection))) + :type postgresql-connection))) (defmethod database-type ((database postgresql-socket-database)) :postgresql-socket) (defmethod database-name-from-spec (connection-spec - (database-type (eql :postgresql-socket))) + (database-type (eql :postgresql-socket))) (check-connection-spec connection-spec database-type - (host db user password &optional port options tty)) + (host db user password &optional port options tty)) (destructuring-bind (host db user password &optional port options tty) connection-spec (declare (ignore password options tty)) - (concatenate 'string + (concatenate 'string (etypecase host - (null - "localhost") - (pathname (namestring host)) - (string host)) - (when port - (concatenate 'string - ":" - (etypecase port - (integer (write-to-string port)) - (string port)))) + (null + "localhost") + (pathname (namestring host)) + (string host)) + (when port + (concatenate 'string + ":" + (etypecase port + (integer (write-to-string port)) + (string port)))) "/" db "/" user))) -(defmethod database-connect (connection-spec - (database-type (eql :postgresql-socket))) +(defmethod database-connect (connection-spec + (database-type (eql :postgresql-socket))) (check-connection-spec connection-spec database-type - (host db user password &optional port options tty)) + (host db user password &optional port options tty)) (destructuring-bind (host db user password &optional - (port +postgresql-server-default-port+) - (options "") (tty "")) + (port +postgresql-server-default-port+) + (options "") (tty "")) connection-spec (handler-case - (handler-bind ((postgresql-warning - (lambda (c) - (warn 'sql-warning - :format-control "~A" - :format-arguments - (list (princ-to-string c)))))) - (open-postgresql-connection :host host :port port - :options options :tty tty - :database db :user user - :password password)) + (handler-bind ((postgresql-warning + (lambda (c) + (warn 'sql-warning + :format-control "~A" + :format-arguments + (list (princ-to-string c)))))) + (open-postgresql-connection :host host :port port + :options options :tty tty + :database db :user user + :password password)) (postgresql-error (c) - ;; Connect failed - (error 'sql-connection-error - :database-type database-type - :connection-spec connection-spec - :error-id (type-of c) - :message (postgresql-condition-message c))) + ;; Connect failed + (error 'sql-connection-error + :database-type database-type + :connection-spec connection-spec + :error-id (type-of c) + :message (postgresql-condition-message c))) (:no-error (connection) - ;; Success, make instance - (make-instance 'postgresql-socket-database - :name (database-name-from-spec connection-spec - database-type) - :database-type :postgresql-socket - :connection-spec connection-spec - :connection connection))))) + ;; Success, make instance + (make-instance 'postgresql-socket-database + :name (database-name-from-spec connection-spec + database-type) + :database-type :postgresql-socket + :connection-spec connection-spec + :connection connection))))) (defmethod database-disconnect ((database postgresql-socket-database)) (close-postgresql-connection (database-connection database)) @@ -215,15 +215,15 @@ doesn't depend on UFFI." (with-postgresql-handlers (database expression) (start-query-execution connection expression) (multiple-value-bind (status cursor) - (wait-for-query-results connection) - (unless (eq status :cursor) - (close-postgresql-connection connection) - (error 'sql-database-data-error - :database database - :expression expression - :error-id "missing-result" - :message "Didn't receive result cursor for query.")) - (setq result-types (canonicalize-types result-types cursor)) + (wait-for-query-results connection) + (unless (eq status :cursor) + (close-postgresql-connection connection) + (error 'sql-database-data-error + :database database + :expression expression + :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) while row @@ -237,7 +237,7 @@ doesn't depend on UFFI." :error-id "multiple-results" :message "Received multiple results for query."))) (when field-names - (mapcar #'car (postgresql-cursor-fields cursor)))))))) + (mapcar #'car (postgresql-cursor-fields cursor)))))))) (defmethod database-execute-command (expression (database postgresql-socket-database)) @@ -245,33 +245,33 @@ doesn't depend on UFFI." (with-postgresql-handlers (database expression) (start-query-execution connection expression) (multiple-value-bind (status result) - (wait-for-query-results connection) - (when (eq status :cursor) - (loop - (multiple-value-bind (row stuff) - (skip-cursor-row result) - (unless row - (setq status :completed result stuff) - (return))))) - (cond - ((null status) - t) - ((eq status :completed) - (unless (null (wait-for-query-results connection)) - (close-postgresql-connection connection) - (error 'sql-database-data-error - :database database - :expression expression - :error-id "multiple-results" - :message "Received multiple results for command.")) - result) - (t - (close-postgresql-connection connection) - (error 'sql-database-data-error - :database database - :expression expression - :errno "missing-result" - :message "Didn't receive completion for command."))))))) + (wait-for-query-results connection) + (when (eq status :cursor) + (loop + (multiple-value-bind (row stuff) + (skip-cursor-row result) + (unless row + (setq status :completed result stuff) + (return))))) + (cond + ((null status) + t) + ((eq status :completed) + (unless (null (wait-for-query-results connection)) + (close-postgresql-connection connection) + (error 'sql-database-data-error + :database database + :expression expression + :error-id "multiple-results" + :message "Received multiple results for command.")) + result) + (t + (close-postgresql-connection connection) + (error 'sql-database-data-error + :database database + :expression expression + :errno "missing-result" + :message "Didn't receive completion for command."))))))) (defstruct postgresql-socket-result-set (done nil) @@ -279,65 +279,65 @@ doesn't depend on UFFI." (types nil)) (defmethod database-query-result-set ((expression string) - (database postgresql-socket-database) - &key full-set result-types) + (database postgresql-socket-database) + &key full-set result-types) (declare (ignore full-set)) (let ((connection (database-connection database))) (with-postgresql-handlers (database expression) (start-query-execution connection expression) (multiple-value-bind (status cursor) - (wait-for-query-results connection) - (unless (eq status :cursor) - (close-postgresql-connection connection) - (error 'sql-database-data-error - :database database - :expression expression - :error-id "missing-result" - :message "Didn't receive result cursor for query.")) - (values (make-postgresql-socket-result-set - :done nil - :cursor cursor - :types (canonicalize-types result-types cursor)) - (length (postgresql-cursor-fields cursor))))))) + (wait-for-query-results connection) + (unless (eq status :cursor) + (close-postgresql-connection connection) + (error 'sql-database-data-error + :database database + :expression expression + :error-id "missing-result" + :message "Didn't receive result cursor for query.")) + (values (make-postgresql-socket-result-set + :done nil + :cursor cursor + :types (canonicalize-types result-types cursor)) + (length (postgresql-cursor-fields cursor))))))) (defmethod database-dump-result-set (result-set - (database postgresql-socket-database)) + (database postgresql-socket-database)) (if (postgresql-socket-result-set-done result-set) t (with-postgresql-handlers (database) - (loop while (skip-cursor-row - (postgresql-socket-result-set-cursor result-set)) - finally (setf (postgresql-socket-result-set-done result-set) t))))) + (loop while (skip-cursor-row + (postgresql-socket-result-set-cursor result-set)) + finally (setf (postgresql-socket-result-set-done result-set) t))))) (defmethod database-store-next-row (result-set - (database postgresql-socket-database) - list) + (database postgresql-socket-database) + list) (let ((cursor (postgresql-socket-result-set-cursor result-set))) (with-postgresql-handlers (database) - (if (copy-cursor-row cursor - list - (postgresql-socket-result-set-types - result-set)) - t - (prog1 nil - (setf (postgresql-socket-result-set-done result-set) t) - (wait-for-query-results (database-connection database))))))) + (if (copy-cursor-row cursor + list + (postgresql-socket-result-set-types + result-set)) + t + (prog1 nil + (setf (postgresql-socket-result-set-done result-set) t) + (wait-for-query-results (database-connection database))))))) (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) - type))) + type))) (unwind-protect - (execute-command (format nil "create database ~A" name)) - (database-disconnect database))))) + (execute-command (format nil "create database ~A" name)) + (database-disconnect database))))) (defmethod database-destroy (connection-spec (type (eql :postgresql-socket))) (destructuring-bind (host name user password) connection-spec (let ((database (database-connect (list host "template1" user password) - type))) + type))) (unwind-protect - (execute-command (format nil "drop database ~A" name)) - (database-disconnect database))))) + (execute-command (format nil "drop database ~A" name)) + (database-disconnect database))))) (defmethod database-probe (connection-spec (type (eql :postgresql-socket)))