X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=interfaces%2Fpostgresql-socket%2Fpostgresql-socket-sql.cl;h=e81d9ea8cf2629166d64697bb3e7cd9fd80c43ca;hb=21a11d58a1d421db0c53a063178dd2bc02663a15;hp=2654a89dae8347be6e6b0ccf4bfa203f4b950962;hpb=8213ff48f5362c3d4792444c929f50bd128bd044;p=clsql.git

diff --git a/interfaces/postgresql-socket/postgresql-socket-sql.cl b/interfaces/postgresql-socket/postgresql-socket-sql.cl
index 2654a89..e81d9ea 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.1 2002/03/23 14:04:53 kevin Exp $
+;;;; $Id: postgresql-socket-sql.cl,v 1.6 2002/03/25 23:48:46 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
@@ -21,7 +21,6 @@
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
 (in-package :cl-user)
 
-
 (defpackage :clsql-postgresql-socket
     (:use :common-lisp :clsql-sys :postgresql-socket)
     (:export #:postgresql-socket-database)
@@ -29,6 +28,50 @@
 
 (in-package :clsql-postgresql-socket)
 
+;; Field type conversion
+
+(defun canonical-field-type (fields index)
+  "Extracts canonical field type from fields list"
+  (let ((oid (cadr (nth index fields))))
+    (case oid
+      ((#.pgsql-ftype#bytea
+	#.pgsql-ftype#int2
+	#.pgsql-ftype#int4)
+       :int)
+      ((#.pgsql-ftype#float4
+	#.pgsql-ftype#float8)
+       :double)
+      (otherwise
+       t))))
+
+(defun canonicalize-types (types cursor)
+  (let* ((fields (postgresql-cursor-fields cursor))
+	 (num-fields (length fields)))
+    (cond
+      ((listp types)
+       (let ((length-types (length types))
+	     (new-types '()))
+	 (loop for i from 0 below num-fields
+	       do
+	       (if (>= i length-types)
+		   (push t new-types) ;; types is shorted than num-fields
+		   (push
+		    (case (nth i types)
+		      ((:int :long :double t)
+		       (nth i types))
+		      (t
+		       t))
+		    new-types)))
+	 (nreverse new-types)))
+      ((eq types :auto)
+       (let ((new-types '()))
+	 (dotimes (i num-fields)
+	   (declare (fixnum i))
+	   (push (canonical-field-type fields i) new-types))
+	 (nreverse new-types)))
+      (t
+       nil))))
+
 (defun convert-to-clsql-warning (database condition)
   (warn 'clsql-database-warning :database database
 	:message (postgresql-condition-message condition)))
@@ -110,7 +153,7 @@
   (close-postgresql-connection (database-connection database))
   t)
 
-(defmethod database-query (expression (database postgresql-socket-database))
+(defmethod database-query (expression (database postgresql-socket-database) types)
   (let ((connection (database-connection database)))
     (with-postgresql-handlers (database expression)
       (start-query-execution connection expression)
@@ -123,7 +166,8 @@
 		 :expression expression
 		 :errno 'missing-result
 		 :error "Didn't receive result cursor for query."))
-	(loop for row = (read-cursor-row cursor)
+	(setq types (canonicalize-types types cursor))
+	(loop for row = (read-cursor-row cursor types)
 	      while row
 	      collect row
 	      finally
@@ -169,8 +213,14 @@
 		  :errno 'missing-result
 		  :error "Didn't receive completion for command.")))))))
 
-(defmethod database-query-result-set
-    (expression (database postgresql-socket-database) &optional full-set)
+(defstruct postgresql-socket-result-set
+  (done nil)
+  (cursor nil)
+  (types nil))
+
+(defmethod database-query-result-set (expression (database postgresql-socket-database) 
+				      &key full-set types
+     )
   (declare (ignore full-set))
   (let ((connection (database-connection database)))
     (with-postgresql-handlers (database expression)
@@ -184,23 +234,31 @@
 		 :expression expression
 		 :errno 'missing-result
 		 :error "Didn't receive result cursor for query."))
-	(values (cons nil cursor)
+	(values (make-postgresql-socket-result-set
+		 :done nil 
+		 :cursor cursor
+		 :types (canonicalize-types types cursor))
 		(length (postgresql-cursor-fields cursor)))))))
 
-(defmethod database-dump-result-set
-    (result-set (database postgresql-socket-database))
-  (if (car result-set)
+(defmethod database-dump-result-set (result-set
+				     (database postgresql-socket-database))
+  (if (postgresql-socket-result-set-done result-set)
       t
       (with-postgresql-handlers (database)
-	(loop while (skip-cursor-row (cdr result-set))
-	  finally (setf (car result-set) t)))))
+	(loop while (skip-cursor-row 
+		     (postgresql-socket-result-set-cursor result-set))
+	  finally (setf (postgresql-socket-result-set-done result-set) t)))))
 
-(defmethod database-store-next-row
-    (result-set (database postgresql-socket-database) list)
-  (let ((cursor (cdr result-set)))
+(defmethod database-store-next-row (result-set
+				    (database postgresql-socket-database)
+				    list)
+  (let ((cursor (postgresql-socket-result-set-cursor result-set)))
     (with-postgresql-handlers (database)
-      (if (copy-cursor-row cursor list)
+      (if (copy-cursor-row cursor 
+			   list
+			   (postgresql-socket-result-set-types
+			    result-set))
 	  t
 	  (prog1 nil
-	    (setf (car result-set) t)
+	    (setf (postgresql-socket-result-set-done result-set) t)
 	    (wait-for-query-results (database-connection database)))))))