(in-package #:clsql-oracle)
-(defparameter *clsql-oracle-library-path*
- (uffi:find-foreign-library
- "oracle"
- `(,(make-pathname :directory (pathname-directory *load-truename*))
- "/usr/lib/clsql/"
- "/sw/lib/clsql/"
- "/home/kevin/debian/src/clsql/db-oracle/")
- :drive-letters '("C")))
+(defparameter *oracle-home*
+ (let ((oracle-home (getenv "ORACLE_HOME")))
+ (when oracle-home
+ (parse-namestring (concatenate 'string oracle-home "/"))))
+ "Pathname of ORACLE_HOME as set in user environment.")
-(defvar *oracle-library-candidate-drive-letters* '("C" "D" "E"))
+(defparameter *oracle-client-library-path*
+ (uffi:find-foreign-library
+ '("libclntsh" "oci")
+ `(,@(when *load-truename*
+ (list (make-pathname
+ :directory (pathname-directory *load-truename*))))
+ ,@(when *oracle-home*
+ (list
+ (make-pathname :defaults *oracle-home*
+ :directory
+ (append (pathname-directory *oracle-home*)
+ (list "lib")))
+ (make-pathname :defaults *oracle-home*
+ :directory
+ (append (pathname-directory *oracle-home*)
+ (list "bin")))))
+ "/usr/lib/oracle/10.1.0.2/client/lib/")
+ :drive-letters '("C")))
(defvar *oracle-supporting-libraries* '("c")
"Used only by CMU. List of library flags needed to be passed to ld to
(defmethod clsql-sys:database-type-library-loaded ((database-type (eql :oracle)))
*oracle-library-loaded*)
-
-(defmethod clsql-sys:database-type-load-foreign ((database-type (eql :oracle)))
- (uffi:load-foreign-library *clsql-oracle-library-path*
- :module "clsql-oracle"
- :supporting-libraries *oracle-supporting-libraries*)
- (setq *oracle-library-loaded* t))
+(defmethod clsql-sys:database-type-load-foreign ((database-type (eql :oracle)))
+ (if (pathnamep *oracle-client-library-path*)
+ (progn
+ (uffi:load-foreign-library *oracle-client-library-path*
+ :module "clsql-oracle"
+ :supporting-libraries
+ *oracle-supporting-libraries*)
+ (setq *oracle-library-loaded* t))
+ (warn "Unable to load oracle client library.")))
(clsql-sys:database-type-load-foreign :oracle)