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

diff --git a/interfaces/postgresql/postgresql-sql.cl b/interfaces/postgresql/postgresql-sql.cl
index 805f2c3..a1dfdd7 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.6 2002/03/24 22:25:51 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
@@ -120,7 +120,7 @@
                      (loop for i from 0 below (PQnfields result)
                          collect
                            (if (zerop (PQgetisnull result tuple-index i))
-                               (uffi:convert-from-cstring
+                               (uffi:convert-from-foreign-string
                                 (PQgetvalue result tuple-index i))
                              nil))))
               (t
@@ -164,7 +164,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))
@@ -188,13 +188,15 @@
                (values (make-postgresql-result-set
                         :res-ptr result
                         :num-fields (PQnfields result)
-                        :num-tuples (PQntuples 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))
+		      :num-tuples (PQntuples result)
+		      :field-types field-types)
 		     (PQnfields result))))
           (t
            (unwind-protect
@@ -225,7 +227,7 @@
           do
             (setf (car rest)
               (if (zerop (PQgetisnull result tuple-index i))
-                  (uffi:convert-from-cstring 
+                  (uffi:convert-from-foreign-string 
                    (PQgetvalue result tuple-index i))
                 nil))
           finally