diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-07-08 20:35:56 +0000 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-07-08 20:35:56 +0000 |
commit | 2a12b56841bd6fd3998050e7677a1b2c08257479 (patch) | |
tree | 4fcd51578ac322228b2f6a44ce2344ab309992aa /activerecord/lib/active_record/connection_adapters/oracle_adapter.rb | |
parent | 71234daef1517cf190adfc5978e56882d2a57ea6 (diff) | |
download | rails-2a12b56841bd6fd3998050e7677a1b2c08257479.tar.gz rails-2a12b56841bd6fd3998050e7677a1b2c08257479.tar.bz2 rails-2a12b56841bd6fd3998050e7677a1b2c08257479.zip |
r4704@asus: jeremy | 2006-06-27 12:00:19 -0700
decimal
r4705@asus: jeremy | 2006-06-27 12:20:47 -0700
current_adapter? checks whether any of its arguments is the name of the current adapter class
r4834@asus: jeremy | 2006-07-08 13:08:24 -0700
Room to float.
r4835@asus: jeremy | 2006-07-08 13:09:18 -0700
Give lock test a few chances.
r4836@asus: jeremy | 2006-07-08 13:12:05 -0700
Numeric and decimal columns map to BigDecimal instead of Float. Those with scale 0 map to Integer. Closes #5454.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4596 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/oracle_adapter.rb')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/oracle_adapter.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/oracle_adapter.rb b/activerecord/lib/active_record/connection_adapters/oracle_adapter.rb index 5a1c693ac9..81e4932fce 100644 --- a/activerecord/lib/active_record/connection_adapters/oracle_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/oracle_adapter.rb @@ -93,9 +93,8 @@ begin def simplified_type(field_type) return :boolean if OracleAdapter.emulate_booleans && field_type == 'NUMBER(1)' case field_type - when /num/i : @scale == 0 ? :integer : :float - when /date|time/i : :datetime - else super + when /date|time/i then :datetime + else super end end @@ -161,6 +160,7 @@ begin :text => { :name => "CLOB" }, :integer => { :name => "NUMBER", :limit => 38 }, :float => { :name => "NUMBER" }, + :decimal => { :name => "DECIMAL" }, :datetime => { :name => "DATE" }, :timestamp => { :name => "DATE" }, :time => { :name => "DATE" }, |