update oracle/ffi backend. close debian bug

diff --git a/ChangeLog b/ChangeLog
index f11778aec2e86ed66e0b68dbc50fdc8aadb5e89f..92444ccf89a3042198fdea6e0cbed8b3ad1396dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+25 Feb 2008  Kevin Rosenberg <kevin@rosenberg.net>
+       * Version 4.0.4
+       * sql/expressions.lisp: Remove stray form (thanks to Samuel Ward)
+
 12 Dec 2007  Kevin Rosenberg <kevin@rosenberg.net>
        * sql/expressions.lisp: Bind *in-subselect* when outputting
        selections (patch from unknown source).

diff --git a/db-oracle/oracle-sql.lisp b/db-oracle/oracle-sql.lisp
index 87d1137ff910b29505c79c7fef7f83851224152d..b0f5457417af9918874c9a138a4d830604d05bce 100644 (file)
--- a/db-oracle/oracle-sql.lisp
+++ b/db-oracle/oracle-sql.lisp
@@ -366,9 +366,9 @@ 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-array (:array :short nil))
-(uffi:def-type int-array (:array :int nil))
-(uffi:def-type double-array (:array :double nil))
+(uffi:def-type short-array (* :short))
+(uffi:def-type int-array (* :int))
+(uffi:def-type double-array (* :double))
 (uffi:def-type int-pointer (* :int))
 (uffi:def-type double-pointer (* :double))
 

diff --git a/debian/changelog b/debian/changelog
index 4bb803e9c6528be3cf67411a0cdcd1dd55a682c1..e22423cc2c61d83557671ca2d12157f87fdd59af 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cl-sql (4.0.4-1) unstable; urgency=low
+
+  * Update Oracle FFI based on changes in CLSQL. Thanks to Paul
+  Metcalfe, Liam Healy, and Alan Salewski (closes:481029)
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sat, 07 Mar 2009 13:32:00 -0700
+
 cl-sql (4.0.3-1) unstable; urgency=low
 
   * New upstream

diff --git a/sql/expressions.lisp b/sql/expressions.lisp
index 6aaededd7c6b32aa1c58337c9257fc6e400d29a8..746ed001ee608232be7f24e6f78d9591b62ac4bc 100644 (file)
--- a/sql/expressions.lisp
+++ b/sql/expressions.lisp
@@ -114,7 +114,7 @@
     (write-string
      (etypecase name
        (string name)
-       (symbol (symbol-name name) database))
+       (symbol (symbol-name name)))
      *sql-stream*))
   t)