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

diff --git a/interfaces/postgresql-socket/postgresql-socket-sql.cl b/interfaces/postgresql-socket/postgresql-socket-sql.cl
index 7e79bd1..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.9 2002/03/29 08:28:14 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,7 +22,7 @@
 (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."))
 
@@ -33,10 +33,10 @@
 (defmethod database-type-library-loaded ((database-type (eql :postgresql-socket)))
   t)
 
-(defmethod clsql-sys:database-type-load-foreign ((database-type (eql :postgresql-socket)))
+(defmethod clsql-base-sys:database-type-load-foreign ((database-type (eql :postgresql-socket)))
   t)
 
-(clsql-sys:database-type-load-foreign :postgresql-socket)
+(clsql-base-sys:database-type-load-foreign :postgresql-socket)
 
 
 ;; Field type conversion
@@ -67,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.
@@ -135,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)
@@ -152,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
@@ -176,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
@@ -298,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))