X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=interfaces%2Fpostgresql-socket%2Fpostgresql-socket-sql.cl;h=f1a6ca470243afa71fed759d00fddcf6d13cf465;hb=42a951e9f7152e7c145958f4dfed41d4e865c9fd;hp=61dddb47492962f794330b0986bd43055c0478c2;hpb=68a2a2bd6a380a61dce06a0510dab3441400d795;p=clsql.git diff --git a/interfaces/postgresql-socket/postgresql-socket-sql.cl b/interfaces/postgresql-socket/postgresql-socket-sql.cl index 61dddb4..f1a6ca4 100644 --- a/interfaces/postgresql-socket/postgresql-socket-sql.cl +++ b/interfaces/postgresql-socket/postgresql-socket-sql.cl @@ -8,7 +8,7 @@ ;;;; Original code by Pierre R. Mai ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: postgresql-socket-sql.cl,v 1.5 2002/03/25 23:22:07 kevin Exp $ +;;;; $Id: postgresql-socket-sql.cl,v 1.13 2002/05/27 17:19:30 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai @@ -22,14 +22,34 @@ (in-package :cl-user) (defpackage :clsql-postgresql-socket - (:use :common-lisp :clsql-sys :postgresql-socket) + (:use :common-lisp :clsql-base-sys :postgresql-socket) (:export #:postgresql-socket-database) (:documentation "This is the CLSQL socket interface to PostgreSQL.")) (in-package :clsql-postgresql-socket) +;; interface foreign library loading routines + +(defmethod database-type-library-loaded ((database-type (eql :postgresql-socket))) + t) + +(defmethod clsql-base-sys:database-type-load-foreign ((database-type (eql :postgresql-socket))) + t) + +(clsql-base-sys:database-type-load-foreign :postgresql-socket) + + ;; Field type conversion +(defun make-type-list-for-auto (cursor) + (let* ((fields (postgresql-cursor-fields cursor)) + (num-fields (length fields)) + (new-types '())) + (dotimes (i num-fields) + (declare (fixnum i)) + (push (canonical-field-type fields i) new-types)) + (nreverse new-types))) + (defun canonical-field-type (fields index) "Extracts canonical field type from fields list" (let ((oid (cadr (nth index fields)))) @@ -37,40 +57,58 @@ ((#.pgsql-ftype#bytea #.pgsql-ftype#int2 #.pgsql-ftype#int4) - :int) + :int32) + (#.pgsql-ftype#int8 + :int64) ((#.pgsql-ftype#float4 #.pgsql-ftype#float8) :double) (otherwise t)))) -(defun canonicalize-field-types (types cursor) - (let* ((fields (postgresql-cursor-fields cursor)) - (num-fields (length fields))) - (cond - ((listp types) - (let ((length-types (length types)) - (new-types '())) - (loop for i from 0 below num-fields - do - (if (>= i length-types) - (push t new-types) ;; types is shorted than num-fields - (push - (case (nth i types) - ((:int :long :double t) - (nth i types)) - (t - t)) - new-types))) - (nreverse new-types))) - ((eq types :auto) - (let ((new-types '())) - (dotimes (i num-fields) - (declare (fixnum i)) - (push (canonical-field-type fields i) new-types)) - (nreverse new-types))) - (t - nil)))) +(defun canonicalize-types (types cursor) + (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))))) + +(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 '())) + (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))) + (nreverse new-types))) + (defun convert-to-clsql-warning (database condition) (warn 'clsql-database-warning :database database @@ -99,16 +137,19 @@ ;; KMR - removed double @@ ,@body)))) -(defmethod database-initialize-database-type - ((database-type (eql :postgresql-socket))) +(defmethod database-initialize-database-type ((database-type + (eql :postgresql-socket))) t) (defclass postgresql-socket-database (database) ((connection :accessor database-connection :initarg :connection :type postgresql-connection))) -(defmethod database-name-from-spec - (connection-spec (database-type (eql :postgresql-socket))) +(defmethod database-type ((database postgresql-socket-database)) + :postgresql-socket) + +(defmethod database-name-from-spec (connection-spec + (database-type (eql :postgresql-socket))) (check-connection-spec connection-spec database-type (host db user password &optional port options tty)) (destructuring-bind (host db user password &optional port options tty) @@ -116,8 +157,8 @@ (declare (ignore password options tty)) (concatenate 'string host (if port ":") (if port 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)) (destructuring-bind (host db user password &optional @@ -140,6 +181,7 @@ (make-instance 'postgresql-socket-database :name (database-name-from-spec connection-spec database-type) + :connection-spec connection-spec :connection connection)) (postgresql-error (c) ;; Connect failed @@ -153,7 +195,7 @@ (close-postgresql-connection (database-connection database)) t) -(defmethod database-query (expression (database postgresql-socket-database) field-types) +(defmethod database-query (expression (database postgresql-socket-database) types) (let ((connection (database-connection database))) (with-postgresql-handlers (database expression) (start-query-execution connection expression) @@ -166,8 +208,8 @@ :expression expression :errno 'missing-result :error "Didn't receive result cursor for query.")) - (setq field-types (canonicalize-field-types field-types cursor)) - (loop for row = (read-cursor-row cursor field-types) + (setq types (canonicalize-types types cursor)) + (loop for row = (read-cursor-row cursor types) while row collect row finally @@ -216,10 +258,10 @@ (defstruct postgresql-socket-result-set (done nil) (cursor nil) - (field-types nil)) + (types nil)) (defmethod database-query-result-set (expression (database postgresql-socket-database) - &key full-set field-types + &key full-set types ) (declare (ignore full-set)) (let ((connection (database-connection database))) @@ -237,7 +279,7 @@ (values (make-postgresql-socket-result-set :done nil :cursor cursor - :field-types (canonicalize-field-types field-types cursor)) + :types (canonicalize-types types cursor)) (length (postgresql-cursor-fields cursor))))))) (defmethod database-dump-result-set (result-set @@ -256,9 +298,12 @@ (with-postgresql-handlers (database) (if (copy-cursor-row cursor list - (postgresql-socket-result-set-field-types + (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))))))) + +(when (clsql-base-sys:database-type-library-loaded :postgresql-socket) + (clsql-base-sys:initialize-database-type :database-type :postgresql-socket))