r10841: 16 Nov 2005 Kevin Rosenberg <kevin@rosenberg.net>

[clsql.git] / db-oracle / oracle-loader.lisp

diff --git a/db-oracle/oracle-loader.lisp b/db-oracle/oracle-loader.lisp
index 6d91e8dc1847faeb1ec10ea88d9ad01b3cd32250..9a970d36fa28e8f172bbee86e6221e23e02f8ae5 100644 (file)
--- a/db-oracle/oracle-loader.lisp
+++ b/db-oracle/oracle-loader.lisp
@@ -16,22 +16,20 @@
 
 (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"
+         (when *oracle-home*
+           (loop for dir-name in '("lib" "bin")
+                 nconc (loop for lib-name in '("libclntsh" "oci")
+                             collect (make-pathname :defaults lib-name
+                                                    :directory (append (pathname-directory *oracle-home*)
+                                                                       (list dir-name))))))))
 
 (defvar *oracle-supporting-libraries* '("c")
   "Used only by CMU. List of library flags needed to be passed to ld to
@@ -45,14 +43,10 @@ set to the right path before compiling or loading the system.")
   *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.")))
+  (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)