mirror of
https://github.com/github/rails.git
synced 2026-04-04 03:00:58 -04:00
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
This commit is contained in:
@@ -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.]
|
||||
|
||||
@@ -598,4 +598,12 @@ begin
|
||||
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user