X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=interfaces%2Fpostgresql%2Fpostgresql-sql.cl;h=db4128bf96c4eab0469eda865be9e716a44d029d;hb=33401393ccc0a9567da4104b3c2e7608956a8624;hp=805f2c32992d6fe11c47b1e4c71063a047ee677b;hpb=c1a4d6ce4083a3e5db3872c3ed6b46d15a59698c;p=clsql.git

diff --git a/interfaces/postgresql/postgresql-sql.cl b/interfaces/postgresql/postgresql-sql.cl
index 805f2c3..db4128b 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.4 2002/03/24 18:31:05 kevin Exp $
+;;;; $Id: postgresql-sql.cl,v 1.8 2002/03/25 14:13:41 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
@@ -28,6 +28,73 @@
 
 (in-package :clsql-postgresql)
 
+;;; Field conversion functions
+
+(defun canonicalize-field-types (types num-fields res-ptr)
+  (cond
+   ((if (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))
+	(let* ((type (PQftype res-ptr i)))
+	  (push
+	   (case type
+	     ((#.pgsql-ftype#bytea
+	       #.pgsql-ftype#int2
+	       #.pgsql-ftype#int4)
+	      :int)
+	     ((#.pgsql-ftype#float4
+	       #.pgsql-ftype#float8)
+	      :double)
+	     (otherwise
+	      t))
+	   new-types)))
+      (nreverse new-types)))
+   (t
+    nil)))
+
+
+(uffi:def-function "atoi"
+    ((str :cstring))
+  :returning :int)
+
+(uffi:def-function "atol"
+    ((str :cstring))
+  :returning :long)
+
+(uffi:def-function "atof"
+    ((str :cstring))
+  :returning :double)
+
+(defun convert-raw-field (char-ptr types index)
+  (let ((type (if (listp types)
+		  (nth index types)
+		  types)))
+    (case type
+      (:int
+       (atoi char-ptr))
+      (:long
+       (atol char-ptr))
+      (:double
+       (atof char-ptr))
+      (otherwise
+       (uffi:convert-from-foreign-string char-ptr)))))
+
 
 (defun tidy-error-message (message)
   (unless (stringp message)
@@ -115,14 +182,19 @@
               (#.pgsql-exec-status-type#empty-query
                nil)
               (#.pgsql-exec-status-type#tuples-ok
-               (loop for tuple-index from 0 below (PQntuples result)
-                   collect
-                     (loop for i from 0 below (PQnfields result)
-                         collect
-                           (if (zerop (PQgetisnull result tuple-index i))
-                               (uffi:convert-from-cstring
-                                (PQgetvalue result tuple-index i))
-                             nil))))
+	       (let ((num-fields (PQnfields result)))
+		 (setq field-types
+		   (canonicalize-field-types field-types num-fields
+					     result))
+		 (loop for tuple-index from 0 below (PQntuples result)
+		       collect
+		       (loop for i from 0 below num-fields
+			     collect
+			     (if (zerop (PQgetisnull result tuple-index i))
+				 (convert-raw-field
+				  (PQgetvalue result tuple-index i)
+				  field-types i)
+				 nil)))))
               (t
                (error 'clsql-sql-error
                       :database database
@@ -164,7 +236,7 @@
 (defstruct postgresql-result-set
   (res-ptr (uffi:make-null-pointer 'pgsql-result) 
 	   :type pgsql-result-def)
-  (field-types nil :type cons) 
+  (field-types nil) 
   (num-tuples 0 :type integer)
   (num-fields 0 :type integer)
   (tuple-index 0 :type integer))
@@ -184,20 +256,22 @@
         (case (PQresultStatus result)
           ((#.pgsql-exec-status-type#empty-query
             #.pgsql-exec-status-type#tuples-ok)
-           (if full-set
-               (values (make-postgresql-result-set
+	   (let ((result-set (make-postgresql-result-set
                         :res-ptr result
                         :num-fields (PQnfields result)
-                        :num-tuples (PQntuples result))
-                       (PQnfields result)
-                       (PQntuples result))
-	     (values (make-postgresql-result-set
-		      :res-ptr result
-		      :num-fields (PQnfields result)
-		      :num-tuples (PQntuples result))
-		     (PQnfields result))))
-          (t
-           (unwind-protect
+                        :num-tuples (PQntuples result)
+			:field-types (canonicalize-field-types 
+				      field-types
+				      (PQnfields result)
+				      result))))
+	     (if full-set
+		 (values result-set
+			 (PQnfields result)
+			 (PQntuples result))
+		 (values result-set
+			 (PQnfields result)))))
+	  (t
+	   (unwind-protect
                (error 'clsql-sql-error
                       :database database
                       :expression query-expression
@@ -214,7 +288,8 @@
 
 (defmethod database-store-next-row (result-set (database postgresql-database) 
                                     list)
-  (let ((result (postgresql-result-set-res-ptr result-set)))
+  (let ((result (postgresql-result-set-res-ptr result-set))
+	(field-types (postgresql-result-set-field-types result-set)))
     (declare (type pgsql-result-def result))
     (if (>= (postgresql-result-set-tuple-index result-set)
 	    (postgresql-result-set-num-tuples result-set))
@@ -225,8 +300,9 @@
           do
             (setf (car rest)
               (if (zerop (PQgetisnull result tuple-index i))
-                  (uffi:convert-from-cstring 
-                   (PQgetvalue result tuple-index i))
+                  (convert-raw-field
+                   (PQgetvalue result tuple-index i)
+		   field-types i)
                 nil))
           finally
             (incf (postgresql-result-set-tuple-index result-set))