r1683: *** empty log message ***

[clsql.git] / interfaces / postgresql / postgresql-sql.cl

diff --git a/interfaces/postgresql/postgresql-sql.cl b/interfaces/postgresql/postgresql-sql.cl
index a1dfdd7081f863c60625ac4adf7226ad68568161..24def53c2d16deb6eaedfd05f81a2ef32a1ee7a9 100644 (file)
--- 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.6 2002/03/24 22:25:51 kevin Exp $
+;;;; $Id: postgresql-sql.cl,v 1.11 2002/03/27 12:09:39 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
@@ -22,12 +22,44 @@
 (in-package :cl-user)
 
 (defpackage :clsql-postgresql
-    (:use :common-lisp :clsql-sys :postgresql)
+    (:use :common-lisp :clsql-sys :postgresql :clsql-uffi)
     (:export #:postgresql-database)
     (:documentation "This is the CLSQL interface to PostgreSQL."))
 
 (in-package :clsql-postgresql)
 
+;;; Field conversion functions
+
+(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)))
+
+(defun canonicalize-types (types num-fields res-ptr)
+  (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)
@@ -99,7 +131,7 @@
   (setf (database-conn-ptr database) nil)
   t)
 
-(defmethod database-query (query-expression (database postgresql-database) field-types)
+(defmethod database-query (query-expression (database postgresql-database) types)
   (let ((conn-ptr (database-conn-ptr database)))
     (declare (type pgsql-conn-def conn-ptr))
     (uffi:with-cstring (query-native query-expression)
@@ -115,14 +147,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-foreign-string
-                                (PQgetvalue result tuple-index i))
-                             nil))))
+              (let ((num-fields (PQnfields result)))
+                (setq types
+                  (canonicalize-types 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)
+                                 types i)
+                                nil)))))
               (t
                (error 'clsql-sql-error
                       :database database
@@ -164,13 +201,13 @@
 (defstruct postgresql-result-set
   (res-ptr (uffi:make-null-pointer 'pgsql-result) 
           :type pgsql-result-def)
-  (field-types nil) 
+  (types nil) 
   (num-tuples 0 :type integer)
   (num-fields 0 :type integer)
   (tuple-index 0 :type integer))
 
 (defmethod database-query-result-set (query-expression (database postgresql-database) 
-                                      &key full-set field-types)
+                                      &key full-set types)
   (let ((conn-ptr (database-conn-ptr database)))
     (declare (type pgsql-conn-def conn-ptr))
     (uffi:with-cstring (query-native query-expression)
@@ -184,22 +221,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)
-                       :field-types field-types)
-                       (PQnfields result)
-                       (PQntuples result))
-            (values (make-postgresql-result-set
-                     :res-ptr result
-                     :num-fields (PQnfields result)
-                     :num-tuples (PQntuples result)
-                     :field-types field-types)
-                    (PQnfields result))))
-          (t
-           (unwind-protect
+                       :types (canonicalize-types 
+                                     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
@@ -216,7 +253,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))
+       (types (postgresql-result-set-types result-set)))
     (declare (type pgsql-result-def result))
     (if (>= (postgresql-result-set-tuple-index result-set)
            (postgresql-result-set-num-tuples result-set))
@@ -227,8 +265,9 @@
           do
             (setf (car rest)
               (if (zerop (PQgetisnull result tuple-index i))
-                  (uffi:convert-from-foreign-string 
-                   (PQgetvalue result tuple-index i))
+                  (convert-raw-field
+                   (PQgetvalue result tuple-index i)
+                  types i)
                 nil))
           finally
             (incf (postgresql-result-set-tuple-index result-set))