Skip to content
Browse files

If the OCI library is not available, raise an exception indicating as…

… much. Closes #3593.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3486 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 2dc16df commit 463d208277cc245651d31b7601e2351b1d09563c Marcel Molina committed
Showing with 10 additions and 0 deletions.
  1. +2 −0 activerecord/CHANGELOG
  2. +8 −0 activerecord/lib/active_record/connection_adapters/oci_adapter.rb
View
2 activerecord/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* If the OCI library is not available, raise an exception indicating as much. #3593 [schoenm@earthlink.net]
+
* Add explicit :order in finder tests as postgresql orders results differently by default. #3577. [Rick Olson]
* Make dynamic finders honor additional passed in :conditions. #3569 [Oleg Pudeyev <pudeyo@rpi.edu>, Marcel Molina Jr.]
View
8 activerecord/lib/active_record/connection_adapters/oci_adapter.rb
@@ -598,4 +598,12 @@ def exec(sql, *bindvars)
rescue LoadError
# OCI8 driver is unavailable.
+ module ActiveRecord # :nodoc:
+ class Base # :nodoc:
+ def self.oci_connection(config) # :nodoc:
+ # Set up a reasonable error message
+ raise LoadError, "Oracle/OCI libraries could not be loaded."
+ end
+ end
+ end
end

0 comments on commit 463d208

Please sign in to comment.
Something went wrong with that request. Please try again.