Changeset vendor,8 for vendor/src/odbc/odbc-main.lisp

Timestamp:

08/23/2008 11:23:53 AM (18 years ago)

Author:

raverkamp

revision id:

svn-v3-trunk1:1c22b0a8-4d0b-0410-a296-af6a2e6f35e3:plain-odbc%2Ftrunk:14

Message:

support for CFFI-0.10 and 0.9.2
dummy test for postgresql integrated
moved string handling to ffi-support
sql-server tests work, nothing else (driver<->clisp interaction problems?)

File:

• vendor/src/odbc/odbc-main.lisp (modified) (4 diffs)

vendor/src/odbc/odbc-main.lisp

@@ -204 +204 @@
     (nreverse res)))
 
-(defun bind-columns (query)
+(defun bind-columns (query columncount)
   (with-slots (hstmt 
                columns
                column-count) 
               query 
-    (let ((cc (result-columns-count hstmt)))
-      (when (zerop cc)
+      (when (zerop columncount)
         (error "can not bind columns, there is no result set"))
-      (setf column-count cc)
+      (setf column-count columncount)
       (setf columns (make-array column-count))
       (dotimes (pos column-count)
         ;; the columns are 0 based, at least here
         (let ((col (create-column hstmt pos)))
-          (setf (aref columns pos) col))))))
+          (setf (aref columns pos) col)))))
 
 (defun unbind-columns (query)
@@ -344 +343 @@
               (row-count (result-rows-count (hstmt query))))
           (loop
-            (when (zerop (result-columns-count (hstmt query))) (return))
-            (bind-columns query)
+            (let ((column-count (result-columns-count (hstmt query))))
+            (when (zerop column-count) (return))
+            (bind-columns query column-count)
             (let ((res (fetch-query-results query ))
                   (names (coerce (column-names query) 'list)))
@@ -351 +351 @@
               (unbind-columns query)
               (unless (%sql-more-results (hstmt query))
-                (return))))
+                (return)))))
           (let ((return-parameters (get-parameters query)))
             (values row-count (nreverse res-list) return-parameters))))
@@ -493 +493 @@
             (unless (= (column-count query) no-of-columns)
               (error "the number of columns has changed"))
-            (bind-columns query)))
+            (bind-columns query no-of-columns)))
         (values (fetch-query-results query)
                 (coerce (column-names query) 'list)))