X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-postgresql%2Fpostgresql-sql.lisp;h=5758730e07f19486a79086b364456f3277a8a080;hb=064bb338ef1375940085db10ec5a202d32e6b68b;hp=76cab66a214f27e70cf4ec8d18cacb7609561945;hpb=c4da3cfcbb955395d8a556e1f89aadad696302b7;p=clsql.git

diff --git a/db-postgresql/postgresql-sql.lisp b/db-postgresql/postgresql-sql.lisp
index 76cab66..5758730 100644
--- a/db-postgresql/postgresql-sql.lisp
+++ b/db-postgresql/postgresql-sql.lisp
@@ -79,7 +79,10 @@
 
 (defclass postgresql-database (database)
   ((conn-ptr :accessor database-conn-ptr :initarg :conn-ptr
-	     :type pgsql-conn-def)))
+	     :type pgsql-conn-def)
+   (lock
+    :accessor database-lock
+    :initform (make-process-lock "conn"))))
 
 (defmethod database-type ((database postgresql-database))
   :postgresql)
@@ -133,6 +136,7 @@
 	(make-instance 'postgresql-database
 		       :name (database-name-from-spec connection-spec
 						      database-type)
+		       :database-type :postgresql
 		       :connection-spec connection-spec
 		       :conn-ptr connection)))))
 
@@ -479,45 +483,37 @@
   
 (defmethod database-create (connection-spec (type (eql :postgresql)))
   (destructuring-bind (host name user password) connection-spec
-    (declare (ignore password))
-    (let ((asdf::*verbose-out* (make-string-output-stream)))
-      (unwind-protect
-	   (let* ((status (asdf:run-shell-command
-			   "su -c ~A createdb -h~A ~A"
-			   user
-			   (if host host "localhost")
-			   name))
-		  (result (get-output-stream-string asdf::*verbose-out*)))
-	     
-	     (if (search "database creation failed: ERROR:" result)
-		 (error 'clsql-access-error
-			:connection-spec connection-spec
-			:database-type type
-			:error 
-			(format nil "database-create failed: ~s" result))
-		 t))
-	(close asdf::*verbose-out*)))))
+    (declare (ignore user password))
+    (multiple-value-bind (output status)
+	(clsql-base-sys:command-output "createdb -h~A ~A"
+				       (if host host "localhost")
+				       name)
+      (if (or (not (zerop status))
+	      (search "database creation failed: ERROR:" output))
+	  (error 'clsql-access-error
+		 :connection-spec connection-spec
+		 :database-type type
+		 :error 
+		 (format nil "database-create failed: ~A" 
+			 output))
+	t))))
 
 (defmethod database-destroy (connection-spec (type (eql :postgresql)))
   (destructuring-bind (host name user password) connection-spec
-    (declare (ignore password))
-    (let ((asdf::*verbose-out* (make-string-output-stream)))
-      (unwind-protect
-	   (let* ((status (asdf:run-shell-command
-			   "su -c ~A dropdb -h~A ~A"
-			   user 
-			   (if host host "localhost")
-			   name))
-		  (result (get-output-stream-string asdf::*verbose-out*)))
-	     
-	     (if (search "database removal failed: ERROR:" result)
-		 (error 'clsql-access-error
-			:connection-spec connection-spec
-			:database-type type
-			:error 
-			(format nil "database-destroy failed: ~s" result))
-		 t))
-	(close asdf::*verbose-out*)))))
+    (declare (ignore user password))
+    (multiple-value-bind (output status)
+	(clsql-base-sys:command-output "dropdb -h~A ~A"
+				       (if host host "localhost")
+				       name)
+      (if (or (not (zerop status))
+	      (search "database removal failed: ERROR:" output))
+	  (error 'clsql-access-error
+		 :connection-spec connection-spec
+		 :database-type type
+		 :error 
+		 (format nil "database-destory failed: ~A" 
+			 output))
+	t))))
 
 
 (defmethod database-probe (connection-spec (type (eql :postgresql)))
@@ -525,11 +521,57 @@
     (let ((database (database-connect (list host "template1" user password)
 				      type)))
       (unwind-protect
-	   (find name (database-query "select datname from pg_database" 
-				      database :auto)
-		 :key #'car :test #'string-equal)
+	  (when
+	      (find name (database-query "select datname from pg_database" 
+					 database :auto)
+		    :key #'car :test #'string-equal)
+	    t)
 	(database-disconnect database)))))
 
+(defmethod database-describe-table ((database postgresql-database) table)
+  (database-query 
+   (format nil "select a.attname, t.typname
+                               from pg_class c, pg_attribute a, pg_type t
+                               where c.relname = '~a'
+                                   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)))))))
+   database :auto))
+
+(defun %pg-database-connection (connection-spec)
+  (check-connection-spec connection-spec :postgresql
+			 (host db user password &optional port options tty))
+  (macrolet ((coerce-string (var)
+               `(unless (typep ,var 'simple-base-string)
+                 (setf ,var (coerce ,var 'simple-base-string)))))
+    (destructuring-bind (host db user password &optional port options tty)
+        connection-spec
+      (coerce-string db)
+      (coerce-string user)
+      (let ((connection (pqsetdblogin host port options tty db user password)))
+        (declare (type postgresql::pgsql-conn-ptr connection))
+        (unless (eq (pqstatus connection) :connection-ok)
+          ;; Connect failed
+          (error 'clsql-connect-error
+                 :database-type :postgresql
+                 :connection-spec connection-spec
+                 :errno (pqstatus connection)
+                 :error (pqerrormessage connection)))
+        connection))))
+
+(defmethod database-reconnect ((database postgresql-database))
+  (let ((lock (database-lock database)))
+    (with-process-lock (lock "Reconnecting")
+      (with-slots (connection-spec conn-ptr)
+	  database
+	(setf conn-ptr (%pg-database-connection connection-spec))
+	database))))
 
 (when (clsql-base-sys:database-type-library-loaded :postgresql)
   (clsql-base-sys:initialize-database-type :database-type :postgresql))