From: Kevin M. Rosenberg Date: Thu, 20 May 2004 12:31:47 +0000 (+0000) Subject: r9416: 20 May 2004 Kevin Rosenberg (kevin@rosenberg.net) X-Git-Tag: v3.8.6~422 X-Git-Url: http://git.kpe.io/?p=clsql.git;a=commitdiff_plain;h=142e85f6cb0b1305d1f200b27b6ebec8ac7d511a r9416: 20 May 2004 Kevin Rosenberg (kevin@rosenberg.net) * Version 2.10.19 * sql/conditions.lisp: Fix cerror --- diff --git a/ChangeLog b/ChangeLog index 5d045f5..4739cd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +20 May 2004 Kevin Rosenberg (kevin@rosenberg.net) + * Version 2.10.19 + * sql/conditions.lisp: Fix cerror + 19 May 2004 Kevin Rosenberg (kevin@rosenberg.net) * Version 2.10.18 released: New condition hierarchy to be compatible with CommonSQL -- not backward compatible with previous CLSQL. diff --git a/db-oracle/oracle-api.lisp b/db-oracle/oracle-api.lisp index 4f222bf..1ac8ea8 100644 --- a/db-oracle/oracle-api.lisp +++ b/db-oracle/oracle-api.lisp @@ -360,4 +360,3 @@ (let ((envhp (oci-get-handle :type :env))) (oci-env-init envhp 0 0 +null-void-pointer+) envhp)) -) diff --git a/db-oracle/oracle-sql.lisp b/db-oracle/oracle-sql.lisp index 87aede6..508bc9d 100644 --- a/db-oracle/oracle-sql.lisp +++ b/db-oracle/oracle-sql.lisp @@ -323,7 +323,7 @@ the length of that format.") ;; STREAM which has no more data, and QC is not a STREAM, we signal ;; DBI-ERROR instead. -(uffi:def-type short-pointer '(* :short)) +(uffi:def-type short-array '(:array :short)) (uffi:def-type int-pointer '(* :int)) (uffi:def-type double-pointer '(* :double)) @@ -380,17 +380,15 @@ the length of that format.") (value (let* ((arb (foreign-resource-buffer (cd-indicators cd))) (indicator (uffi:deref-array arb '(:array :short) irow))) - (declare (type short-pointer arb)) + (declare (type short-array arb)) (unless (= indicator -1) (ecase (cd-oci-data-type cd) (#.SQLT-STR (deref-oci-string b irow (cd-sizeof cd))) (#.SQLT-FLT - (uffi:with-cast-pointer (bd b :double) - (uffi:deref-array bd '(:array :double) irow))) + (uffi:deref-array bd '(:array :double) irow)) (#.SQLT-INT - (uffi:with-cast-pointer (bi b :int) - (uffi:deref-array bi '(:array :int) irow))) + (uffi:deref-array bi '(:array :int) irow)) (#.SQLT-DATE (deref-oci-string b irow (cd-sizeof cd)))))))) (when (and (eq :string (cd-result-type cd)) @@ -758,7 +756,8 @@ the length of that format.") (uffi:with-foreign-object (buf '(:array :unsigned-char #.+errbuf-len+)) (oci-server-version (deref-vp svchp) (deref-vp errhp) - buf +errbuf-len+ +oci-htype-svcctx+) + (uffi:char-array-to-pointer buf) + +errbuf-len+ +oci-htype-svcctx+) (setf server-version (uffi:convert-from-foreign-string buf))) (setq db (make-instance 'oracle-database :name (database-name-from-spec connection-spec diff --git a/debian/changelog b/debian/changelog index 89fba73..55de641 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-sql (2.10.19-1) unstable; urgency=low + + * New upstream + + -- Kevin M. Rosenberg Thu, 20 May 2004 04:54:53 -0600 + cl-sql (2.10.18-1) unstable; urgency=low * New upstream