X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=interfaces%2Fpostgresql-socket%2Fpostgresql-socket-sql.cl;h=777a0957a309b31d7acccd144fbd21e77d88b352;hb=6ba23404433eaf240f37e2905aed999a4d4bf342;hp=0c99be07dfba6408aacf1bb9fa93c6532383c4b2;hpb=17c4d99ca97dbdec882028929d645e16164b4b0b;p=clsql.git

diff --git a/interfaces/postgresql-socket/postgresql-socket-sql.cl b/interfaces/postgresql-socket/postgresql-socket-sql.cl
index 0c99be0..777a095 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.8 2002/03/27 12:09:39 kevin Exp $
+;;;; $Id: postgresql-socket-sql.cl,v 1.11 2002/04/27 20:58:11 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
@@ -28,6 +28,17 @@
 
 (in-package :clsql-postgresql-socket)
 
+;; interface foreign library loading routines
+
+(defmethod database-type-library-loaded ((database-type (eql :postgresql-socket)))
+  t)
+
+(defmethod clsql-sys:database-type-load-foreign ((database-type (eql :postgresql-socket)))
+  t)
+
+(clsql-sys:database-type-load-foreign :postgresql-socket)
+
+
 ;; Field type conversion
 
 (defun make-type-list-for-auto (cursor)
@@ -56,14 +67,16 @@
        t))))
 
 (defun canonicalize-types (types cursor)
-  (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))))
+  (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.
@@ -124,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)
@@ -141,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
@@ -165,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