From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Thu, 8 Sep 2005 15:06:11 +0000 (+0000)
Subject: r10698: Automated commit for Debian build of clsql upstream-version-3.2.3
X-Git-Tag: v3.8.6~126
X-Git-Url: http://git.kpe.io/?p=clsql.git;a=commitdiff_plain;h=5f77ad867ac063e13531cb2c7c5625f68e770903

r10698: Automated commit for Debian build of clsql upstream-version-3.2.3
---

diff --git a/ChangeLog b/ChangeLog
index 09516e6..1d60a9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+08 Sep 2005  Kevin Rosenberg <kevin@rosenberg.net>
+	* Version 3.2.3
+	* db-oracle/oracle-sql.lisp: Correction for v3.2.2 changes by
+	Edi Weitz
+
 08 Sep 2005  Kevin Rosenberg <kevin@rosenberg.net>
 	* Version 3.2.2
 	* db-oracle/oracle-sql.lisp: Add check for zero increment as
diff --git a/db-oracle/oracle-sql.lisp b/db-oracle/oracle-sql.lisp
index f73b4fb..e5f66e5 100644
--- a/db-oracle/oracle-sql.lisp
+++ b/db-oracle/oracle-sql.lisp
@@ -129,7 +129,7 @@ the length of that format.")
   (cond
     (database
      (with-slots (errhp) database
-       (let ((errcode (uffi:allocate-foreign-string :long))
+       (let ((errcode (uffi:allocate-foreign-object :long))
 	     (errbuf (uffi:allocate-foreign-string #.+errbuf-len+)))
 	 ;; ensure errbuf empty string
 	 (setf (uffi:deref-array errbuf '(:array :unsigned-char) 0)
@@ -469,35 +469,36 @@ the length of that format.")
 
 (defun sql-stmt-exec (sql-stmt-string db result-types field-names)
   (with-slots (envhp svchp errhp) db
-    (let ((stmthp (uffi:allocate-foreign-object :pointer-void)))
+    (let ((stmthp (uffi:allocate-foreign-object :pointer-void))
+          select-p)
+      
       (uffi:with-foreign-object (stmttype :unsigned-short)
-
 	(unwind-protect
-	     (progn
-	       (oci-handle-alloc (deref-vp envhp)
-				 stmthp
-				 +oci-htype-stmt+ 0 +null-void-pointer-pointer+)
-	       (oci-stmt-prepare (deref-vp stmthp)
-				 (deref-vp errhp)
-				 (uffi:convert-to-cstring sql-stmt-string)
-				 (length sql-stmt-string)
-				 +oci-ntv-syntax+ +oci-default+ :database db)
-	       (oci-attr-get (deref-vp stmthp)
-			     +oci-htype-stmt+
-			     stmttype
-			     +unsigned-int-null-pointer+
-			     +oci-attr-stmt-type+
-			     (deref-vp errhp)
-			     :database db)
-
-	       (let* ((select-p (= (uffi:deref-pointer stmttype :unsigned-short) 1))
-		      (iters (if select-p 0 1)))
-
-		 (oci-stmt-execute (deref-vp svchp)
-				   (deref-vp stmthp)
-				   (deref-vp errhp)
-				   iters 0 +null-void-pointer+ +null-void-pointer+ +oci-default+
-				   :database db)))
+            (progn
+              (oci-handle-alloc (deref-vp envhp)
+                                stmthp
+                                +oci-htype-stmt+ 0 +null-void-pointer-pointer+)
+              (oci-stmt-prepare (deref-vp stmthp)
+                                (deref-vp errhp)
+                                (uffi:convert-to-cstring sql-stmt-string)
+                                (length sql-stmt-string)
+                                +oci-ntv-syntax+ +oci-default+ :database db)
+              (oci-attr-get (deref-vp stmthp)
+                            +oci-htype-stmt+
+                            stmttype
+                            +unsigned-int-null-pointer+
+                            +oci-attr-stmt-type+
+                            (deref-vp errhp)
+                            :database db)
+              
+              (setq select-p (= (uffi:deref-pointer stmttype :unsigned-short) 1))
+              (let ((iters (if select-p 0 1)))
+
+                (oci-stmt-execute (deref-vp svchp)
+                                  (deref-vp stmthp)
+                                  (deref-vp errhp)
+                                  iters 0 +null-void-pointer+ +null-void-pointer+ +oci-default+
+                                  :database db)))
 	  ;; free resources unless a query
 	  (unless select-p
 	    (oci-handle-free (deref-vp stmthp) +oci-htype-stmt+)
diff --git a/debian/changelog b/debian/changelog
index 1eaba2d..491ee01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-sql (3.2.3-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Thu,  8 Sep 2005 09:05:38 -0600
+
 cl-sql (3.2.2-1) unstable; urgency=low
 
   * New upstream