github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-02-03 18:55:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

Improve handling of LoadErrors with the oracle adapter. Closes #6780 [kubo]

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5956 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Michael Koziarski
2007-01-16 01:31:25 +00:00
parent 6d37c638e7
commit 8437be3380
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
View File

@@ -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

5
activerecord/lib/active_record/connection_adapters/oracle_adapter.rb
View File

@@ -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