X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=interfaces%2Fpostgresql%2Fpostgresql-sql.cl;h=275ac39b360ac1358ac0f2e0effaceb7a56a2ae9;hb=5829838b970346a58f75683ecba005007414edb9;hp=2f3399243f80acb0263a28a2d77f489c328eed5c;hpb=f1930020ce73039b8627af801722c28afff5d31d;p=clsql.git

diff --git a/interfaces/postgresql/postgresql-sql.cl b/interfaces/postgresql/postgresql-sql.cl
index 2f33992..275ac39 100644
--- a/interfaces/postgresql/postgresql-sql.cl
+++ b/interfaces/postgresql/postgresql-sql.cl
@@ -8,7 +8,7 @@
 ;;;;                Original code by Pierre R. Mai 
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: postgresql-sql.cl,v 1.10 2002/03/27 08:09:25 kevin Exp $
+;;;; $Id: postgresql-sql.cl,v 1.12 2002/03/29 09:37:24 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
@@ -30,33 +30,38 @@
 
 ;;; Field conversion functions
 
-(defun canonicalize-types (types num-fields res-ptr)
-  (cond
-   ((listp types)
-    (canonicalize-type-list types num-fields))
-   ((eq types :auto)
-    (let ((new-types '()))
-      (dotimes (i num-fields)
-	(declare (fixnum i))
-	(let* ((type (PQftype res-ptr i)))
-	  (push
-	   (case type
-	     ((#.pgsql-ftype#bytea
-	       #.pgsql-ftype#int2
-	       #.pgsql-ftype#int4)
-	      :int)
-	     (#.pgsql-ftype#int8
-	      :longlong)
-	     ((#.pgsql-ftype#float4
-	       #.pgsql-ftype#float8)
-	      :double)
-	     (otherwise
-	      t))
-	   new-types)))
+(defun make-type-list-for-auto (num-fields res-ptr)
+  (let ((new-types '()))
+    (dotimes (i num-fields)
+      (declare (fixnum i))
+      (let* ((type (PQftype res-ptr i)))
+	(push
+	 (case type
+	   ((#.pgsql-ftype#bytea
+	     #.pgsql-ftype#int2
+	     #.pgsql-ftype#int4)
+	    :int32)
+	   (#.pgsql-ftype#int8
+	    :int64)
+	   ((#.pgsql-ftype#float4
+	     #.pgsql-ftype#float8)
+	    :double)
+	   (otherwise
+	    t))
+	 new-types)))
       (nreverse new-types)))
-   (t
-    nil)))
 
+(defun canonicalize-types (types num-fields res-ptr)
+  (if (null types)
+      nil
+      (let ((auto-list (make-type-list-for-auto num-fields res-ptr)))
+	(cond
+	  ((listp types)
+	   (canonicalize-type-list types auto-list))
+	  ((eq types :auto)
+	   auto-list)
+	  (t
+	   nil)))))
 
 (defun tidy-error-message (message)
   (unless (stringp message)