r9409: fix :cstring compilation on cmucl/sbcl

diff --git a/ChangeLog b/ChangeLog
index f14ea779a2a6ed0f82c56e26802ef1bc8096fb0e..c3435af8d023dbcf10ba56ecf23bcf6a7f61d003 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
        in find-all when only one table to avoid selecting a duplicate row.
        Fix error in FIND-ALL when using :order-by such as (([foo] :asc))
        as previous logic was adding two fields (foo asc) to SELECT query.
+       Make :result-types :auto be the default for object selections.
        * db-oracle/*.lisp: Much improvements, now passes 90% of test suite
        
 19 May 2004 Marcus Pearce (m.t.pearce@city.ac.uk) 

diff --git a/db-oracle/oracle-api.lisp b/db-oracle/oracle-api.lisp
index ff24e2d02d502e677b9b6fd50c352b57eb454ff4..4f222bf94677f35b7f711bcb39987cdba19238c7 100644 (file)
--- a/db-oracle/oracle-api.lisp
+++ b/db-oracle/oracle-api.lisp
@@ -126,7 +126,7 @@
     :int
   (srvhp        :pointer-void)                  ; oci-server
   (errhp        :pointer-void)                  ; oci-error
-  (dblink       :cstring)               ; :in
+  (dblink       :cstring)        ; :in
   (dblink-len   :unsigned-long)          ; int
   (mode         :unsigned-long))         ; int
 

diff --git a/db-oracle/oracle-sql.lisp b/db-oracle/oracle-sql.lisp
index 0a704d25ba77d689892fe44838c33da40604f2f4..87aede6af98f24cc42108f3dd93cca1214496082 100644 (file)
--- a/db-oracle/oracle-sql.lisp
+++ b/db-oracle/oracle-sql.lisp
@@ -638,7 +638,7 @@ the length of that format.")
                             (deref-vp errhp))
               (let ((colsize-including-null (1+ (uffi:deref-pointer colsize :unsigned-long))))
                 (setf buffer (acquire-foreign-resource
-                              :char (* +n-buf-rows+ colsize-including-null)))
+                              :unsigned-char (* +n-buf-rows+ colsize-including-null)))
                 (setf sizeof colsize-including-null))))
            (let ((retcodes (acquire-foreign-resource :short +n-buf-rows+))
                  (indicators (acquire-foreign-resource :short +n-buf-rows+))
@@ -740,10 +740,11 @@ the length of that format.")
                          +oci-htype-error+ 0 +null-void-pointer-pointer+)
         (oci-handle-alloc (deref-vp envhp) srvhp
                          +oci-htype-server+ 0 +null-void-pointer-pointer+)
-       (oci-server-attach (deref-vp srvhp)
-                          (deref-vp errhp)
-                          (uffi:make-null-pointer :unsigned-char)
-                          0 +oci-default+)
+       (uffi:with-cstring (dblink nil)
+         (oci-server-attach (deref-vp srvhp)
+                            (deref-vp errhp)
+                            dblink
+                            0 +oci-default+))
         (oci-handle-alloc (deref-vp envhp) svchp
                          +oci-htype-svcctx+ 0 +null-void-pointer-pointer+)
         (oci-attr-set (deref-vp svchp)