X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-postgresql-socket3%2Fsql.lisp;h=e2515005cb5cda828bd910484cb89d7d94e8dba2;hb=1e8d22b3fdace44a45b6b0702da5587e136e2398;hp=6fdef8e1c6b8ea7c404a722f371975cbb9f9acb1;hpb=539444af449f3769b75f71b32f10204c40d011f4;p=clsql.git

diff --git a/db-postgresql-socket3/sql.lisp b/db-postgresql-socket3/sql.lisp
index 6fdef8e..e251500 100644
--- a/db-postgresql-socket3/sql.lisp
+++ b/db-postgresql-socket3/sql.lisp
@@ -155,6 +155,10 @@
   (cl-postgres:close-database (database-connection database))
   t)
 
+(defmethod clsql-sys::release-to-conn-pool :before ((conn postgresql-socket3-database))
+  ;; This resets the connection to "New" state
+  (database-execute-command "DISCARD ALL;" conn))
+
 (defvar *include-field-names* nil)
 
 
@@ -184,27 +188,73 @@
 		 nil
 		 (funcall (cl-postgres::field-interpreter cl-postgres::field)
 			  stream cl-postgres::size)))))
-    (values
-      (loop :while (cl-postgres:next-row)
-	    :collect (loop :for field :across fields
-			   :collect (cl-postgres:next-field field)))
-      (when *include-field-names*
-	(loop :for field :across fields
-	      :collect (cl-postgres:field-name field))))))
+    (let ((results (loop :while (cl-postgres:next-row)
+			 :collect (loop :for field :across fields
+					:collect (cl-postgres:next-field field))))
+	  (col-names (when *include-field-names*
+		       (loop :for field :across fields
+			     :collect (cl-postgres:field-name field)))))
+      ;;multiple return values were not working here
+      (list results col-names))))
 
 (defmethod database-query ((expression string) (database postgresql-socket3-database) result-types field-names)
   (let ((connection (database-connection database))
 	(cl-postgres:*sql-readtable* *sqlreader*))
     (with-postgresql-handlers (database expression)
       (let ((*include-field-names* field-names))
-	(cl-postgres:exec-query connection expression #'clsql-default-row-reader))
+	(apply #'values (cl-postgres:exec-query connection expression #'clsql-default-row-reader)))
       )))
 
+(defmethod query ((obj command-object) &key (database *default-database*)
+                  (result-types :auto) (flatp nil) (field-names t))
+  (clsql-sys::record-sql-command (expression obj) database)
+  (multiple-value-bind (rows names)
+      (database-query obj database result-types field-names)
+    (let ((result (if (and flatp (= 1 (length (car rows))))
+                      (mapcar #'car rows)
+		      rows)))
+      (clsql-sys::record-sql-result result database)
+      (if field-names
+          (values result names)
+	  result))))
+
+(defmethod database-query ((obj command-object) (database postgresql-socket3-database) result-types field-names)
+  (let ((connection (database-connection database))
+	(cl-postgres:*sql-readtable* *sqlreader*))
+    (with-postgresql-handlers (database obj)
+      (let ((*include-field-names* field-names))
+	(unless (has-been-prepared obj)
+	  (cl-postgres:prepare-query connection (prepared-name obj) (expression obj))
+	  (setf (has-been-prepared obj) T))
+	(apply #'values (cl-postgres:exec-prepared
+			 connection
+			 (prepared-name obj)
+			 (parameters obj)
+			 #'clsql-default-row-reader))))))
+
 (defmethod database-execute-command
     ((expression string) (database postgresql-socket3-database))
   (let ((connection (database-connection database)))
     (with-postgresql-handlers (database expression)
-      (cl-postgres:exec-query connection expression))))
+      ;; return row count?
+      (second (multiple-value-list (cl-postgres:exec-query connection expression))))))
+
+(defmethod execute-command ((obj command-object)
+                            &key (database *default-database*))
+  (clsql-sys::record-sql-command (expression obj) database)
+  (let ((res (database-execute-command obj database)))
+    (clsql-sys::record-sql-result res database)
+    ;; return row count?
+    res))
+
+(defmethod database-execute-command
+    ((obj command-object) (database postgresql-socket3-database))
+  (let ((connection (database-connection database)))
+    (with-postgresql-handlers (database obj)
+      (unless (has-been-prepared obj)
+	(cl-postgres:prepare-query connection (prepared-name obj) (expression obj))
+	(setf (has-been-prepared obj) T))
+      (second (multiple-value-list (cl-postgres:exec-prepared connection (prepared-name obj) (parameters obj)))))))
 
 ;;;; Cursoring interface
 
@@ -273,3 +323,14 @@
 
 (when (clsql-sys:database-type-library-loaded :postgresql-socket3)
   (clsql-sys:initialize-database-type :database-type :postgresql-socket3))
+
+
+;; Type munging functions
+
+(defmethod read-sql-value (val (type (eql 'boolean)) (database postgresql-socket3-database) db-type)
+  (declare (ignore database db-type))
+  val)
+
+(defmethod read-sql-value (val (type (eql 'generalized-boolean)) (database postgresql-socket3-database) db-type)
+  (declare (ignore database db-type))
+  val)
\ No newline at end of file