X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-postgresql-socket%2Fpostgresql-socket-sql.lisp;h=50c6899afc0f8c6a4a36fefc0597fdb911967663;hb=a3e1cd20eec3903790c6e8f126345558904488f4;hp=2ceb6798bcd83e27d4be61ae761ead66ed08d387;hpb=064bb338ef1375940085db10ec5a202d32e6b68b;p=clsql.git

diff --git a/db-postgresql-socket/postgresql-socket-sql.lisp b/db-postgresql-socket/postgresql-socket-sql.lisp
index 2ceb679..50c6899 100644
--- a/db-postgresql-socket/postgresql-socket-sql.lisp
+++ b/db-postgresql-socket/postgresql-socket-sql.lisp
@@ -446,17 +446,25 @@ doesn't depend on UFFI."
 	  (execute-command (format nil "drop database ~A" name))
 	(database-disconnect database)))))
 
+
 (defmethod database-probe (connection-spec (type (eql :postgresql-socket)))
+  (when (find (second connection-spec) (database-list connection-spec type)
+	      :key #'car :test #'string-equal)
+    t))
+
+(defmethod database-list (connection-spec (type (eql :postgresql-socket)))
   (destructuring-bind (host name user password) connection-spec
+    (declare (ignore name))
     (let ((database (database-connect (list host "template1" user password)
 				      type)))
       (unwind-protect
-	  (when
-	      (find name (database-query "select datname from pg_database" 
-					 database :auto)
-		    :key #'car :test #'string-equal)
-	    t)
-	(database-disconnect database)))))
+	   (progn
+	     (setf (slot-value database 'clsql-base-sys::state) :open)
+	     (mapcar #'car (database-query "select datname from pg_database" 
+					   database :auto)))
+	(progn
+	  (database-disconnect database)
+	  (setf (slot-value database 'clsql-base-sys::state) :closed))))))
 
 (defmethod database-describe-table ((database postgresql-socket-database) 
 				    table)
@@ -467,12 +475,7 @@ doesn't depend on UFFI."
                                    and a.attnum > 0
                                    and a.attrelid = c.oid
                                    and a.atttypid = t.oid"
-           (sql-escape (string-downcase 
-			(etypecase table
-			  (string table)
-			  (clsql-base-sys::sql-create-table
-			   (symbol-name 
-			    (slot-value table 'clsql-base-sys::name)))))))
+           (sql-escape (string-downcase table)))
    database :auto))
 
 (when (clsql-base-sys:database-type-library-loaded :postgresql-socket)