From: Kevin M. Rosenberg Date: Sat, 12 Nov 2005 17:46:41 +0000 (+0000) Subject: r10822: 12 Nov 2005 Kevin Rosenberg X-Git-Tag: v3.8.6~102 X-Git-Url: http://git.kpe.io/?p=clsql.git;a=commitdiff_plain;h=17255eb0ed45809a179853e9099d92d26d3717ac r10822: 12 Nov 2005 Kevin Rosenberg * Version 3.4.2 * clsql-uffi.asd: Patch from James Biel improving loading * db-oracle/oracle-{api,sql}.lisp: Patch from James Biel to support 64-bit lisps --- diff --git a/ChangeLog b/ChangeLog index fb6c073..8d54794 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +12 Nov 2005 Kevin Rosenberg + * Version 3.4.2 + * clsql-uffi.asd: Patch from James Biel improving loading + * db-oracle/oracle-{api,sql}.lisp: Patch from James Biel + to support 64-bit lisps + 12 Nov 2005 Kevin Rosenberg * Version 3.4.1 * sql/expressions.lisp: Escape numbers to SQL strings diff --git a/clsql-uffi.asd b/clsql-uffi.asd index 7541934..48372a1 100644 --- a/clsql-uffi.asd +++ b/clsql-uffi.asd @@ -67,7 +67,8 @@ (defmethod operation-done-p ((o compile-op) (c clsql-uffi-source-file)) (or (and (probe-file #p"/usr/lib/clsql/clsql_uffi.so") t) (let ((lib (make-pathname :defaults (component-pathname c) - :type (uffi:default-foreign-library-type)))) + :type (funcall (intern (symbol-name '#:default-foreign-library-type) + (find-package '#:uffi)))))) (and (probe-file lib) (probe-file (component-pathname c)) (> (file-write-date lib) (file-write-date (component-pathname c))))))) @@ -85,6 +86,6 @@ ((:module :uffi :components ((:file "clsql-uffi-package") - (:clsql-uffi-source-file "uffi" :depends-on ("clsql-uffi-package")) - (:file "clsql-uffi-loader" :depends-on ("clsql-uffi-package" "uffi")) + (:clsql-uffi-source-file "clsql_uffi" :depends-on ("clsql-uffi-package")) + (:file "clsql-uffi-loader" :depends-on ("clsql-uffi-package" "clsql_uffi")) (:file "clsql-uffi" :depends-on ("clsql-uffi-loader")))))) diff --git a/db-oracle/oracle-api.lisp b/db-oracle/oracle-api.lisp index 1e21b81..8f45da7 100644 --- a/db-oracle/oracle-api.lisp +++ b/db-oracle/oracle-api.lisp @@ -16,6 +16,15 @@ (in-package #:clsql-oracle) +;; +;; OCI integer types +;; + +(uffi:def-foreign-type ub2 :unsigned-short) +(uffi:def-foreign-type sb2 :short) +(uffi:def-foreign-type ub4 :unsigned-int) +(uffi:def-foreign-type sb4 :int) +(uffi:def-foreign-type size_t :unsigned-long) ;; ;; Opaque pointer types @@ -88,7 +97,7 @@ (def-oci-routine ("OCIInitialize" oci-initialize) :int - (mode :unsigned-long) ; ub4 + (mode ub4) ; ub4 (ctxp :pointer-void) ; dvoid * (malocfp :pointer-void) ; dvoid *(*) (ralocfp :pointer-void) ; dvoid *(*) @@ -98,55 +107,55 @@ (def-oci-routine ("OCIEnvInit" oci-env-init) :int (envpp :pointer-void) ; OCIEnv ** - (mode :unsigned-long) ; ub4 - (xtramem-sz :unsigned-long) ; size_t + (mode ub4) ; ub4 + (xtramem-sz size_t) ; size_t (usermempp (* :pointer-void))) ; dvoid ** #-oci7 (def-oci-routine ("OCIEnvCreate" oci-env-create) :int (envhpp (* :pointer-void)) - (mode :unsigned-int) + (mode ub4) (ctxp :pointer-void) (malocfp :pointer-void) (ralocfp :pointer-void) (mfreefp :pointer-void) - (xtramemsz :unsigned-long) + (xtramemsz size_t) (usrmempp (* :pointer-void))) (def-oci-routine ("OCIHandleAlloc" oci-handle-alloc) :int - (parenth :pointer-void) ; const dvoid * + (parenth :pointer-void) ; const dvoid * (hndlpp (* :pointer-void)) ; dvoid ** - (type :unsigned-long) ; ub4 - (xtramem_sz :unsigned-long) ; size_t + (type ub4) ; ub4 + (xtramem_sz size_t) ; size_t (usrmempp (* :pointer-void))) ; dvoid ** (def-oci-routine ("OCIServerAttach" oci-server-attach) :int (srvhp :pointer-void) ; oci-server (errhp :pointer-void) ; oci-error - (dblink :cstring) ; :in - (dblink-len :unsigned-long) ; int - (mode :unsigned-long)) ; int + (dblink :cstring) ; :in + (dblink-len sb4) ; sb4 + (mode ub4)) ; ub4 (def-oci-routine ("OCIHandleFree" oci-handle-free) :int (p0 :pointer-void) ;; handle - (p1 :unsigned-long)) ;;type + (p1 ub4)) ;;type (def-oci-routine ("OCILogon" oci-logon) :int (envhp :pointer-void) ; env (errhp :pointer-void) ; err - (svchpp (* :pointer-void)) ; svc + (svchpp (* :pointer-void)) ; svc (username :cstring) ; username - (uname-len :unsigned-long) ; + (uname-len ub4) ; (passwd :cstring) ; passwd - (password-len :unsigned-long) ; + (password-len ub4) ; (dsn :cstring) ; datasource - (dsn-len :unsigned-long)) ; + (dsn-len ub4)) ; (def-oci-routine ("OCILogoff" oci-logoff) :int @@ -154,94 +163,94 @@ (p1 :pointer-void)) ; err (uffi:def-function ("OCIErrorGet" oci-error-get) - ((handlp :pointer-void) - (recordno :unsigned-long) - (sqlstate :cstring) - (errcodep (* :long)) + ((handlp :pointer-void) + (recordno ub4) + (sqlstate :cstring) + (errcodep (* sb4)) (bufp (* :unsigned-char)) - (bufsize :unsigned-long) - (type :unsigned-long)) + (bufsize ub4) + (type ub4)) :returning :void) (def-oci-routine ("OCIStmtPrepare" oci-stmt-prepare) :int (stmtp :pointer-void) (errhp :pointer-void) - (stmt :cstring) - (stmt_len :unsigned-long) - (language :unsigned-long) - (mode :unsigned-long)) + (stmt :cstring) + (stmt_len ub4) + (language ub4) + (mode ub4)) (def-oci-routine ("OCIStmtExecute" oci-stmt-execute) :int (svchp :pointer-void) - (stmtp1 :pointer-void) + (stmtp1 :pointer-void) (errhp :pointer-void) - (iters :unsigned-long) - (rowoff :unsigned-long) - (snap_in :pointer-void) - (snap_out :pointer-void) - (mode :unsigned-long)) + (iters ub4) + (rowoff ub4) + (snap_in :pointer-void) + (snap_out :pointer-void) + (mode ub4)) (def-raw-oci-routine ("OCIParamGet" oci-param-get) :int (hndlp :pointer-void) - (htype :unsigned-long) + (htype ub4) (errhp :pointer-void) - (parmdpp (* :pointer-void)) - (pos :unsigned-long)) + (parmdpp (* :pointer-void)) + (pos ub4)) (def-oci-routine ("OCIAttrGet" oci-attr-get) :int - (trgthndlp :pointer-void) - (trghndltyp :unsigned-int) - (attributep :pointer-void) - (sizep (* :unsigned-int)) - (attrtype :unsigned-int) + (trgthndlp :pointer-void) + (trghndltyp ub4) + (attributep :pointer-void) + (sizep (* ub4)) + (attrtype ub4) (errhp :pointer-void)) (def-oci-routine ("OCIAttrSet" oci-attr-set) :int - (trgthndlp :pointer-void) - (trgthndltyp :int :in) - (attributep :pointer-void) - (size :int) - (attrtype :int) - (errhp oci-error)) + (trgthndlp :pointer-void) + (trgthndltyp ub4 :in) + (attributep :pointer-void) + (size ub4) + (attrtype ub4) + (errhp oci-error)) (def-oci-routine ("OCIDefineByPos" oci-define-by-pos) :int (stmtp :pointer-void) (defnpp (* :pointer-void)) (errhp :pointer-void) - (position :unsigned-long) - (valuep :pointer-void) - (value_sz :long) - (dty :unsigned-short) - (indp (* :short)) - (rlenp (* :unsigned-short)) - (rcodep (* :unsigned-short)) - (mode :unsigned-long)) + (position ub4) + (valuep :pointer-void) + (value_sz sb4) + (dty ub2) + (indp (* sb2)) + (rlenp (* ub2)) + (rcodep (* ub2)) + (mode ub4)) (def-oci-routine ("OCIStmtFetch" oci-stmt-fetch) :int (stmthp :pointer-void) (errhp :pointer-void) - (p2 :unsigned-long) - (p3 :unsigned-short) - (p4 :unsigned-long)) + (p2 ub4) + (p3 ub2) + (p4 ub4)) (def-oci-routine ("OCITransStart" oci-trans-start) :int - (svchp :pointer-void) + (svchp :pointer-void) (errhp :pointer-void) (p2 :unsigned-short) (p3 :unsigned-short)) (def-oci-routine ("OCITransCommit" oci-trans-commit) :int - (svchp :pointer-void) + (svchp :pointer-void) (errhp :pointer-void) (p2 :unsigned-short)) @@ -266,7 +275,7 @@ ;;; for setting up global environment. (uffi:def-function "OCIInitialize" - ((mode :unsigned-long) ; ub4 + ((mode ub4) ; ub4 (ctxp :pointer-void) ; dvoid * (malocfp :pointer-void) ; dvoid *(*) (ralocfp :pointer-void) ; dvoid *(*) @@ -274,9 +283,9 @@ :returning :int) (uffi:def-function "OCIEnvInit" - ((envpp :pointer-void) ; OCIEnv ** - (mode :unsigned-long) ; ub4 - (xtramem-sz :unsigned-long) ; size_t + ((envpp :pointer-void) ; OCIEnv ** + (mode ub4) ; ub4 + (xtramem-sz size_t) ; size_t (usermempp (* :pointer-void))) :returning :int) @@ -284,8 +293,8 @@ (uffi:def-function "OCIHandleAlloc" ((parenth :pointer-void) ; const dvoid * (hndlpp (* :pointer-void)) ; dvoid ** - (type :unsigned-long) ; ub4 - (xtramem_sz :unsigned-long) ; size_t + (type ub4) ; ub4 + (xtramem_sz size_t) ; size_t (usrmempp (* :pointer-void))) :returning :int) diff --git a/db-oracle/oracle-sql.lisp b/db-oracle/oracle-sql.lisp index e5f66e5..eb0d3b7 100644 --- a/db-oracle/oracle-sql.lisp +++ b/db-oracle/oracle-sql.lisp @@ -129,12 +129,12 @@ the length of that format.") (cond (database (with-slots (errhp) database - (let ((errcode (uffi:allocate-foreign-object :long)) + (let ((errcode (uffi:allocate-foreign-object 'sb4)) (errbuf (uffi:allocate-foreign-string #.+errbuf-len+))) ;; ensure errbuf empty string (setf (uffi:deref-array errbuf '(:array :unsigned-char) 0) (uffi:ensure-char-storable (code-char 0))) - (setf (uffi:deref-pointer errcode :long) 0) + (setf (uffi:deref-pointer errcode 'sb4) 0) (uffi:with-cstring (sqlstate nil) (oci-error-get (deref-vp errhp) 1 @@ -142,7 +142,7 @@ the length of that format.") errcode (uffi:char-array-to-pointer errbuf) +errbuf-len+ +oci-htype-error+)) - (let ((subcode (uffi:deref-pointer errcode :long)) + (let ((subcode (uffi:deref-pointer errcode 'sb4)) (errstr (uffi:convert-from-foreign-string errbuf))) (uffi:free-foreign-object errcode) (uffi:free-foreign-object errbuf) @@ -436,7 +436,7 @@ the length of that format.") (values)) (#.+oci-error+ (handle-oci-error :database (qc-db qc) :nulls-ok t)))) - (uffi:with-foreign-object (rowcount :long) + (uffi:with-foreign-object (rowcount 'ub4) (oci-attr-get (deref-vp (qc-stmthp qc)) +oci-htype-stmt+ rowcount @@ -444,12 +444,12 @@ the length of that format.") +oci-attr-row-count+ (deref-vp errhp)) (setf (qc-n-from-oci qc) - (- (uffi:deref-pointer rowcount :long) + (- (uffi:deref-pointer rowcount 'ub4) (qc-total-n-from-oci qc))) (when (< (qc-n-from-oci qc) +n-buf-rows+) (setf (qc-oci-end-seen-p qc) t)) (setf (qc-total-n-from-oci qc) - (uffi:deref-pointer rowcount :long))))) + (uffi:deref-pointer rowcount 'ub4))))) (values))) ;; the guts of the SQL function @@ -597,7 +597,6 @@ the length of that format.") ;; the Oracle 9i OCI documentation. -- JJB 20040713 (uffi:def-type byte-pointer (* :byte)) -(uffi:def-type ulong-pointer (* :unsigned-long)) (uffi:def-type void-pointer-pointer (* :void-pointer)) (defun make-query-cursor-cds (database stmthp result-types field-names) @@ -610,9 +609,9 @@ the length of that format.") (precision :short) (scale :byte) (colname '(* :unsigned-char)) - (colnamelen :unsigned-long) - (colsize :unsigned-short) - (colsizesize :unsigned-long) + (colnamelen 'ub4) + (colsize 'ub2) + (colsizesize 'ub4) (defnp ':pointer-void)) (let ((buffer nil) (sizeof nil)) @@ -693,7 +692,7 @@ the length of that format.") (deref-vp errhp)) (setq colname-string (uffi:convert-from-foreign-string (uffi:deref-pointer colname '(* :unsigned-char)) - :length (uffi:deref-pointer colnamelen :unsigned-long)))) + :length (uffi:deref-pointer colnamelen 'ub4)))) (push (make-cd :name colname-string :sizeof sizeof :buffer buffer diff --git a/debian/changelog b/debian/changelog index c9301c7..c566d78 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-sql (3.4.2-1) unstable; urgency=low + + * New upstream + + -- Kevin M. Rosenberg Sat, 12 Nov 2005 10:44:37 -0700 + cl-sql (3.4.1-1) unstable; urgency=low * New upstream