r1673: *** empty log message ***

[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 61dddb47492962f794330b0986bd43055c0478c2..703b3dd9b947d0b4406eec2260171b3ee7f43ad7 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.5 2002/03/25 23:22:07 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
@@ -38,31 +38,40 @@
        #.pgsql-ftype#int2
        #.pgsql-ftype#int4)
        :int)
+      (#.pgsql-ftype#int8
+       :longlong)
       ((#.pgsql-ftype#float4
        #.pgsql-ftype#float8)
        :double)
       (otherwise
        t))))
 
-(defun canonicalize-field-types (types cursor)
+
+(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)
-       (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)))
+       (canonicalize-type-list types num-fields))
       ((eq types :auto)
        (let ((new-types '()))
         (dotimes (i num-fields)
@@ -153,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)
@@ -166,8 +175,8 @@
                 :expression expression
                 :errno 'missing-result
                 :error "Didn't receive result cursor for query."))
-       (setq field-types (canonicalize-field-types field-types cursor))
-       (loop for row = (read-cursor-row cursor field-types)
+       (setq types (canonicalize-types types cursor))
+       (loop for row = (read-cursor-row cursor types)
              while row
              collect row
              finally
@@ -216,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)))
@@ -237,7 +246,7 @@
        (values (make-postgresql-socket-result-set
                 :done nil 
                 :cursor cursor
-                :field-types (canonicalize-field-types field-types cursor))
+                :types (canonicalize-types types cursor))
                (length (postgresql-cursor-fields cursor)))))))
 
 (defmethod database-dump-result-set (result-set
@@ -256,7 +265,7 @@
     (with-postgresql-handlers (database)
       (if (copy-cursor-row cursor 
                           list
-                          (postgresql-socket-result-set-field-types
+                          (postgresql-socket-result-set-types
                            result-set))
          t
          (prog1 nil