(in-package #:clsql-oracle)
-(defparameter *oracle-lib-path*
+(defparameter *oracle-home*
(let ((oracle-home (getenv "ORACLE_HOME")))
(when oracle-home
- (make-pathname :directory
- (append
- (pathname-directory
- (parse-namestring (concatenate 'string oracle-home "/")))
- (list "lib"))))))
-
-(defparameter *oracle-client-library-path*
- (uffi:find-foreign-library
- "libclntsh"
- `(,@(when *load-truename* (list (make-pathname :directory (pathname-directory *load-truename*))))
- ,@(when *oracle-lib-path* (list *oracle-lib-path*))
- "/usr/lib/oracle/10.1.0.2/client/lib/")
- :drive-letters '("C")))
+ (parse-namestring (concatenate 'string oracle-home "/"))))
+ "Pathname of ORACLE_HOME as set in user environment.")
+
+(defparameter *oracle-client-library-filenames*
+ (list "libclntsh" "oci"))
(defvar *oracle-supporting-libraries* '("c")
"Used only by CMU. List of library flags needed to be passed to ld to
*oracle-library-loaded*)
(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.")))
+ (when *oracle-home*
+ (dolist (dir-name '("lib" "bin"))
+ (dolist (lib-name '("libclntsh" "oci"))
+ (clsql:push-library-path
+ (make-pathname :name lib-name
+ :directory (append (pathname-directory *oracle-home*)
+ (list dir-name)))))))
+
+ (clsql-uffi:find-and-load-foreign-library *oracle-client-library-filenames*
+ :module "clsql-oracle"
+ :supporting-libraries *oracle-supporting-libraries*)
+ (setq *oracle-library-loaded* t))
(clsql-sys:database-type-load-foreign :oracle)