diff options
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/oracle_adapter.rb | 5 |
2 files changed, 4 insertions, 3 deletions
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 |