X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=interfaces%2Fpostgresql-socket%2Fpostgresql-socket-sql.cl;h=f1a6ca470243afa71fed759d00fddcf6d13cf465;hb=ac3bbb908fc84d1ede5fdc3c7d5ace882d669be4;hp=703b3dd9b947d0b4406eec2260171b3ee7f43ad7;hpb=f1930020ce73039b8627af801722c28afff5d31d;p=clsql.git

diff --git a/interfaces/postgresql-socket/postgresql-socket-sql.cl b/interfaces/postgresql-socket/postgresql-socket-sql.cl
index 703b3dd..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.7 2002/03/27 08:09:25 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,49 +57,58 @@
       ((#.pgsql-ftype#bytea
 	#.pgsql-ftype#int2
 	#.pgsql-ftype#int4)
-       :int)
+       :int32)
       (#.pgsql-ftype#int8
-       :longlong)
+       :int64)
       ((#.pgsql-ftype#float4
 	#.pgsql-ftype#float8)
        :double)
       (otherwise
        t))))
 
+(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 num-fields)
+(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 num-fields
+    (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 :long :double :longlong t)
-		  (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 canonicalize-types (types cursor)
-  (let* ((fields (postgresql-cursor-fields cursor))
-	 (num-fields (length fields)))
-    (cond
-      ((listp types)
-       (canonicalize-type-list types num-fields))
-      ((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 convert-to-clsql-warning (database condition)
   (warn 'clsql-database-warning :database database
@@ -108,16 +137,19 @@ doesn't depend on UFFI."
 	 ;; 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)
@@ -125,8 +157,8 @@ doesn't depend on UFFI."
     (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
@@ -149,6 +181,7 @@ doesn't depend on UFFI."
 	(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
@@ -271,3 +304,6 @@ doesn't depend on UFFI."
 	  (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))