X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=interfaces%2Fpostgresql-socket%2Fpostgresql-socket-sql.cl;h=703b3dd9b947d0b4406eec2260171b3ee7f43ad7;hb=f1930020ce73039b8627af801722c28afff5d31d;hp=b98836f93758826948993560f18e445d86c09311;hpb=e596bda48686fd7df4fe7cb2740cd2144a22fb79;p=clsql.git

diff --git a/interfaces/postgresql-socket/postgresql-socket-sql.cl b/interfaces/postgresql-socket/postgresql-socket-sql.cl
index b98836f..703b3dd 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.4 2002/03/24 22:25:51 kevin Exp $
+;;;; $Id: postgresql-socket-sql.cl,v 1.7 2002/03/27 08:09:25 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,59 @@
 
 (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#int8
+       :longlong)
+      ((#.pgsql-ftype#float4
+	#.pgsql-ftype#float8)
+       :double)
+      (otherwise
+       t))))
+
+
+(defun canonicalize-type-list (types num-fields)
+  "Ensure a field type list meets expectations.
+Duplicated from clsql-uffi package so that this interface
+doesn't depend on UFFI."
+  (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 :longlong t)
+		  (nth i types))
+		 (t
+		  t))
+	       new-types)))
+    (nreverse new-types)))
+
+(defun canonicalize-types (types cursor)
+  (let* ((fields (postgresql-cursor-fields cursor))
+	 (num-fields (length fields)))
+    (cond
+      ((listp types)
+       (canonicalize-type-list types num-fields))
+      ((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 +162,7 @@
   (close-postgresql-connection (database-connection database))
   t)
 
-(defmethod database-query (expression (database postgresql-socket-database) field-types)
+(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 +175,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
@@ -172,10 +225,10 @@
 (defstruct postgresql-socket-result-set
   (done nil)
   (cursor nil)
-  (field-types nil))
+  (types nil))
 
 (defmethod database-query-result-set (expression (database postgresql-socket-database) 
-				      &key full-set field-types
+				      &key full-set types
      )
   (declare (ignore full-set))
   (let ((connection (database-connection database)))
@@ -193,7 +246,7 @@
 	(values (make-postgresql-socket-result-set
 		 :done nil 
 		 :cursor cursor
-		 :field-types field-types)
+		 :types (canonicalize-types types cursor))
 		(length (postgresql-cursor-fields cursor)))))))
 
 (defmethod database-dump-result-set (result-set
@@ -210,7 +263,10 @@
 				    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 (postgresql-socket-result-set-done result-set) t)