From 8437be33801d598b3b3389163cb3082fb04b0ec8 Mon Sep 17 00:00:00 2001 From: Michael Koziarski Date: Tue, 16 Jan 2007 01:31:25 +0000 Subject: Improve handling of LoadErrors with the oracle adapter. Closes #6780 [kubo] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5956 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- .../active_record/connection_adapters/abstract/schema_statements.rb | 2 +- activerecord/lib/active_record/connection_adapters/oracle_adapter.rb | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'activerecord/lib/active_record') diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb index 5ae5362a6d..a98b26f554 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb @@ -265,7 +265,7 @@ module ActiveRecord column_type_sql << "(#{precision})" end else - raise ArgumentError, "Error adding decimal column: precision cannot be empty if scale if specifed" if scale + raise ArgumentError, "Error adding decimal column: precision cannot be empty if scale if specified" if scale end column_type_sql else diff --git a/activerecord/lib/active_record/connection_adapters/oracle_adapter.rb b/activerecord/lib/active_record/connection_adapters/oracle_adapter.rb index 01408933f4..b44510fd7d 100644 --- a/activerecord/lib/active_record/connection_adapters/oracle_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/oracle_adapter.rb @@ -676,13 +676,14 @@ rescue LoadError # OCI8 driver is unavailable. module ActiveRecord # :nodoc: class Base + @@oracle_error_message = "Oracle/OCI libraries could not be loaded: #{$!.to_s}" def self.oracle_connection(config) # :nodoc: # Set up a reasonable error message - raise LoadError, "Oracle/OCI libraries could not be loaded." + raise LoadError, @@oracle_error_message end def self.oci_connection(config) # :nodoc: # Set up a reasonable error message - raise LoadError, "Oracle/OCI libraries could not be loaded." + raise LoadError, @@oracle_error_message end end end -- cgit v1.2.3