r1701: *** 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 ce4641960b753dd5101ea5ee44f5dd2322535554..275ac39b360ac1358ac0f2e0effaceb7a56a2ae9 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.9 2002/03/25 23:48:46 kevin Exp $
+;;;; $Id: postgresql-sql.cl,v 1.12 2002/03/29 09:37:24 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,7 +22,7 @@
 (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."))
 
@@ -30,71 +30,38 @@
 
 ;;; Field conversion functions
 
-(defun canonicalize-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)))
+(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)))
-   (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 canonicalize-types (types num-fields res-ptr)
+  (if (null types)
+      nil
+      (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)