From a45efdc4b94ed2ce0d70c8bd1f4c0b0b71a827db Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Thu, 20 May 2004 08:55:12 +0000
Subject: [PATCH] r9409: fix :cstring compilation on cmucl/sbcl

---
 ChangeLog                 |  1 +
 db-oracle/oracle-api.lisp |  2 +-
 db-oracle/oracle-sql.lisp | 11 ++++++-----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f14ea77..c3435af 100644
--- 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 ff24e2d..4f222bf 100644
--- 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 0a704d2..87aede6 100644
--- 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)
-- 
2.34.1