diff options
| author | Marcel Molina <marcel@vernix.org> | 2006-01-25 20:50:33 +0000 |
|---|---|---|
| committer | Marcel Molina <marcel@vernix.org> | 2006-01-25 20:50:33 +0000 |
| commit | 463d208277cc245651d31b7601e2351b1d09563c (patch) | |
| tree | 5ac2091a6d2ea02d524917c09f761fe7dbb78efc | |
| parent | 2dc16df10c830abb68e952ae93059f8dc7cabdb1 (diff) | |
| download | rails-463d208277cc245651d31b7601e2351b1d09563c.tar.gz rails-463d208277cc245651d31b7601e2351b1d09563c.tar.bz2 rails-463d208277cc245651d31b7601e2351b1d09563c.zip | |
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
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/oci_adapter.rb | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 56ebe5041c..166a37cb84 100644 --- a/activerecord/CHANGELOG +++ b/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.] diff --git a/activerecord/lib/active_record/connection_adapters/oci_adapter.rb b/activerecord/lib/active_record/connection_adapters/oci_adapter.rb index 01e3d4dff3..46937b034b 100644 --- a/activerecord/lib/active_record/connection_adapters/oci_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/oci_adapter.rb @@ -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 |