r10936: 08 May 2006 Kevin Rosenberg <kevin@rosenberg.net>

        * Version: 3.6.0 (requires UFFI v1.5.11 or greater)
        * db-oracle/metaclasses.lisp: Patch from James Bielman for
        checking slot constraints.
        * db-oracle/oracle-{api,sql}.lisp: Avoid dead pointers on loading
        saved openmcl images (based on patch from James Bielman)

diff --git a/ChangeLog b/ChangeLog
index 7496e5db6f78d434c119297c96166f2cc83b1111..d5b481115428486122adc1d9bd968ee8ac5e9ec1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 08 May 2006  Kevin Rosenberg <kevin@rosenberg.net>
 08 May 2006  Kevin Rosenberg <kevin@rosenberg.net>

-       * sql/metaclasses.lisp: Patch from James Bielman for
+       * Version: 3.6.0 (requires UFFI v1.5.11 or greater)
+       * db-oracle/metaclasses.lisp: Patch from James Bielman for

        checking slot constraints.
        checking slot constraints.

+       * db-oracle/oracle-{api,sql}.lisp: Avoid dead pointers on loading
+       saved openmcl images (based on patch from James Bielman)

 
 06 May 2006  Kevin Rosenberg <kevin@rosenberg.net>
        * doc/ref-fdml.xml: Documentation patch from Marcus Pearce for limit keyword
 
 06 May 2006  Kevin Rosenberg <kevin@rosenberg.net>
        * doc/ref-fdml.xml: Documentation patch from Marcus Pearce for limit keyword

diff --git a/db-oracle/oracle-api.lisp b/db-oracle/oracle-api.lisp
index 377c3f3a9c943cee23bdfdaa9a56a1399e92615d..3b0a7ee431c8f9c0b9ac2dae38850427af720971 100644 (file)
--- a/db-oracle/oracle-api.lisp
+++ b/db-oracle/oracle-api.lisp
@@ -37,9 +37,10 @@
 (uffi:def-foreign-type oci-svc-ctx :pointer-void)
 (uffi:def-foreign-type oci-stmt :pointer-void)
 
 (uffi:def-foreign-type oci-svc-ctx :pointer-void)
 (uffi:def-foreign-type oci-stmt :pointer-void)
 

-
-(defvar +null-void-pointer+ (uffi:make-null-pointer :void))
-(defvar +null-void-pointer-pointer+ (uffi:make-null-pointer :pointer-void))
+(uffi:def-pointer-var +null-void-pointer+
+  (uffi:make-null-pointer :void))
+(uffi:def-pointer-var +null-void-pointer-pointer+
+  (uffi:make-null-pointer :pointer-void))

 
 ;;; Check an OCI return code for erroricity and signal a reasonably
 ;;; informative condition if so.
 
 ;;; Check an OCI return code for erroricity and signal a reasonably
 ;;; informative condition if so.


@@ -65,7 +66,7 @@
           (if (= result #.+oci-success+)
               +oci-success+
               (handle-oci-result result database nulls-ok)))))))
           (if (= result #.+oci-success+)
               +oci-success+
               (handle-oci-result result database nulls-ok)))))))

-  
+

 
 (defmacro def-raw-oci-routine
   ((c-oci-symbol lisp-oci-fn) c-return &rest c-parms)
 
 (defmacro def-raw-oci-routine
   ((c-oci-symbol lisp-oci-fn) c-return &rest c-parms)


@@ -92,7 +93,7 @@
   (mode ub4)                                   ; ub4
   (xtramem-sz size_t)            ; size_t
   (usermempp (* :pointer-void)))                    ; dvoid **
   (mode ub4)                                   ; ub4
   (xtramem-sz size_t)            ; size_t
   (usermempp (* :pointer-void)))                    ; dvoid **

-  
+

 #-oci7
 (def-oci-routine ("OCIEnvCreate" oci-env-create)
     :int
 #-oci7
 (def-oci-routine ("OCIEnvCreate" oci-env-create)
     :int


@@ -209,10 +210,10 @@
   (position   ub4)
   (valuep     :pointer-void)
   (value_sz   sb4)
   (position   ub4)
   (valuep     :pointer-void)
   (value_sz   sb4)

-  (dty        ub2)         
+  (dty        ub2)

   (indp       (* sb2))
   (indp       (* sb2))

-  (rlenp      (* ub2))          
-  (rcodep     (* ub2))          
+  (rlenp      (* ub2))
+  (rcodep     (* ub2))

   (mode       ub4))
 
 (def-oci-routine ("OCIStmtFetch" oci-stmt-fetch)
   (mode       ub4))
 
 (def-oci-routine ("OCIStmtFetch" oci-stmt-fetch)


@@ -273,7 +274,7 @@
   :returning :int)
 
 
   :returning :int)
 
 

-(uffi:def-function "OCIHandleAlloc" 
+(uffi:def-function "OCIHandleAlloc"

     ((parenth      :pointer-void)              ; const dvoid *
      (hndlpp       (* :pointer-void))          ; dvoid **
      (type         ub4)                                ; ub4
     ((parenth      :pointer-void)              ; const dvoid *
      (hndlpp       (* :pointer-void))          ; dvoid **
      (type         ub4)                                ; ub4

diff --git a/db-oracle/oracle-sql.lisp b/db-oracle/oracle-sql.lisp
index aa7c6d79e0ad70f3b604a57356b47c8144e46839..fc3188f8b33a4e510c916e0b87ac8baa27f61317 100644 (file)
--- a/db-oracle/oracle-sql.lisp
+++ b/db-oracle/oracle-sql.lisp
@@ -37,11 +37,11 @@ likely that we'll have to worry about the CMUCL limit."))
 (defmacro deref-vp (foreign-object)
   `(the vp-type (uffi:deref-pointer (the vpp-type ,foreign-object) :pointer-void)))
 
 (defmacro deref-vp (foreign-object)
   `(the vp-type (uffi:deref-pointer (the vpp-type ,foreign-object) :pointer-void)))
 

-(defvar +unsigned-char-null-pointer+
+(uffi:def-pointer-var +unsigned-char-null-pointer+

   (uffi:make-null-pointer :unsigned-char))
   (uffi:make-null-pointer :unsigned-char))

-(defvar +unsigned-short-null-pointer+
+(uffi:def-pointer-var +unsigned-short-null-pointer+

   (uffi:make-null-pointer :unsigned-short))
   (uffi:make-null-pointer :unsigned-short))

-(defvar +unsigned-int-null-pointer+
+(uffi:def-pointer-var +unsigned-int-null-pointer+

   (uffi:make-null-pointer :unsigned-int))
 
 ;; constants - from OCI?
   (uffi:make-null-pointer :unsigned-int))
 
 ;; constants - from OCI?

diff --git a/debian/changelog b/debian/changelog
index ce66a8cb859f330617369d597dd189df981a464f..b034fc81bfe8edb82983a4cb277d61f3207bb2bf 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-sql (3.6.0-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Tue,  9 May 2006 09:41:58 -0600
+

 cl-sql (3.5.7-1) unstable; urgency=low
 
   * New upstream
 cl-sql (3.5.7-1) unstable; urgency=low
 
   * New upstream

diff --git a/debian/control b/debian/control
index a178dcf03df0e3108569f5bbe5ffc3306f7b7c7e..ca3d7c259a14c493a3a1af0e955cf1279453d666 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Description: SQL Interface for Common Lisp
 
 Package: cl-sql-uffi
 Architecture: any
 
 Package: cl-sql-uffi
 Architecture: any

-Depends: cl-uffi, cl-sql (>= ${Source-Version}), ${shlibs:Depends}
+Depends: cl-uffi (>= 1.5.11), cl-sql (>= ${Source-Version}), ${shlibs:Depends}

 Recommends: cl-sql-backend
 Description: Common UFFI functions for CLSQL database backends
  This package provides an interface to several UFFI functions used by multiple
 Recommends: cl-sql-backend
 Description: Common UFFI functions for CLSQL database backends
  This package provides an interface to several UFFI functions used by multiple