X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-postgresql%2Fpostgresql-sql.lisp;h=5355972a63fc26fca77e33c9213f51df30c28ea3;hb=e5744a78271044484b3399d4fc1d55b3e8808784;hp=c268b82eb2d9463ab15c77d0b79c88f7dff7a706;hpb=e2c86e8c664d8b3ecfd215843a9a1fbf5fa83693;p=clsql.git

diff --git a/db-postgresql/postgresql-sql.lisp b/db-postgresql/postgresql-sql.lisp
index c268b82..5355972 100644
--- a/db-postgresql/postgresql-sql.lisp
+++ b/db-postgresql/postgresql-sql.lisp
@@ -93,6 +93,7 @@
     (declare (ignore password options tty))
     (concatenate 'string 
       (etypecase host
+	(null "localhost")
 	(pathname (namestring host))
 	(string host))
       (when port 
@@ -141,7 +142,7 @@
   (setf (database-conn-ptr database) nil)
   t)
 
-(defmethod database-query (query-expression (database postgresql-database) types)
+(defmethod database-query (query-expression (database postgresql-database) result-types)
   (let ((conn-ptr (database-conn-ptr database)))
     (declare (type pgsql-conn-def conn-ptr))
     (uffi:with-cstring (query-native query-expression)
@@ -158,8 +159,8 @@
                nil)
               (#.pgsql-exec-status-type#tuples-ok
 	       (let ((num-fields (PQnfields result)))
-		 (setq types
-		   (canonicalize-types types num-fields
+		 (setq result-types
+		   (canonicalize-types result-types num-fields
 					     result))
 		 (loop for tuple-index from 0 below (PQntuples result)
 		       collect
@@ -168,7 +169,7 @@
 			     (if (zerop (PQgetisnull result tuple-index i))
 				 (convert-raw-field
 				  (PQgetvalue result tuple-index i)
-				  types i)
+				  result-types i)
 				 nil)))))
               (t
                (error 'clsql-sql-error
@@ -216,8 +217,9 @@
   (num-fields 0 :type integer)
   (tuple-index 0 :type integer))
 
-(defmethod database-query-result-set (query-expression (database postgresql-database) 
-                                      &key full-set types)
+(defmethod database-query-result-set ((query-expression string)
+				      (database postgresql-database) 
+                                      &key full-set result-types)
   (let ((conn-ptr (database-conn-ptr database)))
     (declare (type pgsql-conn-def conn-ptr))
     (uffi:with-cstring (query-native query-expression)
@@ -236,7 +238,7 @@
                         :num-fields (PQnfields result)
                         :num-tuples (PQntuples result)
 			:types (canonicalize-types 
-				      types
+				      result-types
 				      (PQnfields result)
 				      result))))
 	     (if full-set
@@ -475,28 +477,53 @@
       (concatenate 'string "SELECT LAST_VALUE ('" sequence-name "')")
       database nil)))))
   
+(defmethod database-create (connection-spec (type (eql :postgresql)))
+  (destructuring-bind (host name user password) connection-spec
+    (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 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)))
+  (destructuring-bind (host name user password) connection-spec
+    (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)))))
 
-;; Functions depending upon high-level CommonSQL classes/functions
-#|
-(defmethod database-output-sql ((expr clsql-sys::sql-typecast-exp) 
-				(database postgresql-database))
-  (with-slots (clsql-sys::modifier clsql-sys::components)
-    expr
-    (if clsql-sys::modifier
-        (progn
-          (clsql-sys::output-sql clsql-sys::components database)
-          (write-char #\: clsql-sys::*sql-stream*)
-          (write-char #\: clsql-sys::*sql-stream*)
-          (write-string (symbol-name clsql-sys::modifier) 
-			clsql-sys::*sql-stream*)))))
-
-(defmethod database-output-sql-as-type ((type (eql 'integer)) val
-					(database postgresql-database))
-  (when val   ;; typecast it so it uses the indexes
-    (make-instance 'clsql-sys::sql-typecast-exp
-                   :modifier 'int8
-                   :components val)))
-|#
 
 (when (clsql-base-sys:database-type-library-loaded :postgresql)
   (clsql-base-sys:initialize-database-type :database-type :postgresql))