r1661: field types

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

diff --git a/interfaces/postgresql-socket/postgresql-socket-sql.cl b/interfaces/postgresql-socket/postgresql-socket-sql.cl
index 2eb6e7c8fa477ec2ab7bafd2dba7f377a81b4b51..e81d9ea8cf2629166d64697bb3e7cd9fd80c43ca 100644 (file)
--- 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.3 2002/03/24 18:39:32 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) 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 +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
@@ -172,10 +216,10 @@
 (defstruct postgresql-socket-result-set
   (done nil)
   (cursor nil)
-  (field-types nil :type cons))
+  (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 +237,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 +254,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)