(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.
;;; unless NULLS-OK is set.
(defmacro def-oci-routine ((c-oci-symbol lisp-oci-fn) c-return &rest c-parms)
- (let ((ll (mapcar (lambda (x) (declare (ignore x)) (gensym)) c-parms)))
- `(let ((%lisp-oci-fn (uffi:def-function
- (,c-oci-symbol ,(intern (concatenate 'string "%" (symbol-name lisp-oci-fn))))
- ,c-parms
- :returning ,c-return)))
- (defun ,lisp-oci-fn (,@ll &key database nulls-ok)
- (let ((result (funcall %lisp-oci-fn ,@ll)))
- (case result
- (#.+oci-success+
- +oci-success+)
- (#.+oci-error+
- (handle-oci-error :database database :nulls-ok nulls-ok))
- (#.+oci-no-data+
- (error 'sql-database-error :message "OCI No Data Found"))
- (#.+oci-success-with-info+
- (error 'sql-database-error :message "internal error: unexpected +oci-success-with-info"))
- (#.+oci-invalid-handle+
- (error 'sql-database-error :message "OCI Invalid Handle"))
- (#.+oci-need-data+
- (error 'sql-database-error :message "OCI Need Data"))
- (#.+oci-still-executing+
- (error 'sql-temporary-error :message "OCI Still Executing"))
- (#.+oci-continue+
- (error 'sql-database-error :message "OCI Continue"))
- (1804
- (error 'sql-database-error :message "Check ORACLE_HOME and NLS settings."))
- (t
- (error 'sql-database-error
- :message
- (format nil "OCI unknown error, code=~A" result)))))))))
-
+ (let ((ll (mapcar (lambda (x) (declare (ignore x)) (gensym)) c-parms))
+ (c-oci-fn (intern (concatenate 'string "%" (symbol-name lisp-oci-fn)))))
+ `(progn
+ (declaim (inline ,c-oci-fn ,lisp-oci-fn))
+ (uffi:def-function (,c-oci-symbol ,c-oci-fn)
+ ,c-parms
+ :returning ,c-return)
+ (defun ,lisp-oci-fn (,@ll &key database nulls-ok)
+ (let ((result (,c-oci-fn ,@ll)))
+ (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)
,c-parms
:returning ,c-return)))
(defun ,lisp-oci-fn (,@ll &key database nulls-ok)
+ (declare (ignore database nulls-ok))
(funcall %lisp-oci-fn ,@ll)))))
(mode ub4) ; ub4
(xtramem-sz size_t) ; size_t
(usermempp (* :pointer-void))) ; dvoid **
-
+
#-oci7
(def-oci-routine ("OCIEnvCreate" oci-env-create)
:int
(envhp :pointer-void) ; env
(errhp :pointer-void) ; err
(svchpp (* :pointer-void)) ; svc
- (username :cstring) ; username
+ (username (* :unsigned-char)) ; username
(uname-len ub4) ;
- (passwd :cstring) ; passwd
+ (passwd (* :unsigned-char)) ; passwd
(password-len ub4) ;
- (dsn :cstring) ; datasource
+ (dsn (* :unsigned-char)) ; datasource
(dsn-len ub4)) ;
(def-oci-routine ("OCILogoff" oci-logoff)
(p0 :pointer-void) ; svc
(p1 :pointer-void)) ; err
+(declaim (inline oci-error-get))
(uffi:def-function ("OCIErrorGet" oci-error-get)
((handlp :pointer-void)
(recordno ub4)
:int
(stmtp :pointer-void)
(errhp :pointer-void)
- (stmt :cstring)
+ (stmt (* :unsigned-char))
(stmt_len ub4)
(language ub4)
(mode ub4))
(position ub4)
(valuep :pointer-void)
(value_sz sb4)
- (dty ub2)
+ (dty ub2)
(indp (* sb2))
- (rlenp (* ub2))
- (rcodep (* ub2))
+ (rlenp (* ub2))
+ (rcodep (* ub2))
(mode ub4))
(def-oci-routine ("OCIStmtFetch" oci-stmt-fetch)
:returning :int)
-(uffi:def-function "OCIHandleAlloc"
+(uffi:def-function "OCIHandleAlloc"
((parenth :pointer-void) ; const dvoid *
(hndlpp (* :pointer-void)) ; dvoid **
(type ub4) ; ub4