Changeset vendor,8 for vendor/src/odbc/ffi-support.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/ffi-support.lisp (modified) (1 diff)

vendor/src/odbc/ffi-support.lisp

@@ -4 +4 @@
 
 
-(defun get-string (ptr length) 
-  (cffi:foreign-string-to-lisp ptr length nil)
-  )
+(defmacro cffi-0.10-or-0.9 (form-0.10 form-0.9)
+  (if (BOUNDP 'cffi::*foreign-string-mappings*)
+      form-0.10
+    form-0.9))
 
-(defun get-string-nts (ptr)
-  (cffi:foreign-string-to-lisp ptr MOST-POSITIVE-FIXNUM t))
+(cffi-0.10-or-0.9
+ (defun get-string (ptr length) 
+   (cffi:foreign-string-to-lisp ptr :count length :encoding :iso-8859-1)
+   )
+ (defun get-string (ptr length)
+   (cffi:foreign-string-to-lisp ptr length nil)
+   )
+ )
+ 
+(cffi-0.10-or-0.9
+ (defun get-string-nts (ptr)
+   (cffi:foreign-string-to-lisp ptr :max-chars MOST-POSITIVE-FIXNUM :encoding :iso-8859-1))
+ (defun get-string-nts (ptr)
+   (cffi:foreign-string-to-lisp ptr MOST-POSITIVE-FIXNUM t)))
 
-(defun put-string (ptr vector)
-  (cffi:lisp-string-to-foreign vector ptr (1+ (length vector))))
+(cffi-0.10-or-0.9
+ (defun put-string (ptr vector)
+   (cffi:lisp-string-to-foreign vector ptr (1+ (length vector)) :encoding :iso-8859-1))
+ (defun put-string (ptr vector)
+   (cffi:lisp-string-to-foreign vector ptr (1+ (length vector)))))
 
 (defun %null-ptr () 
   (cffi:null-pointer))
+
+
+(cffi-0.10-or-0.9
+ (defmacro with-foreign-string-alloc ((ptr text) &body body)
+   `(cffi:with-foreign-string (,ptr ,text :encoding :iso-8859-1)
+                              ,@body))
+ 
+ (defmacro with-foreign-string-alloc ((ptr text) &body body)
+   `(cffi:with-foreign-string (,ptr ,text)
+                              ,@body)))
+                            
 
 (defun get-byte-vector (ptr length)