aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorKoichi ITO <koic.ito@gmail.com>2017-02-02 16:41:08 +0900
committerKoichi ITO <koic.ito@gmail.com>2017-02-02 17:42:24 +0900
commit15bb36f71f7d02bd93760ab9faa458ab58f58c12 (patch)
tree15e4ec9731e6e8458d4697dcb520d957f6a97f26 /activerecord
parent65bf1c60053e727835e06392d27a2fb49665484c (diff)
downloadrails-15bb36f71f7d02bd93760ab9faa458ab58f58c12.tar.gz
rails-15bb36f71f7d02bd93760ab9faa458ab58f58c12.tar.bz2
rails-15bb36f71f7d02bd93760ab9faa458ab58f58c12.zip
Fix a test of AR::Type::TypeMap#lookup when using Oracle
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/connection_adapters/type_lookup_test.rb20
1 files changed, 14 insertions, 6 deletions
diff --git a/activerecord/test/cases/connection_adapters/type_lookup_test.rb b/activerecord/test/cases/connection_adapters/type_lookup_test.rb
index e2e5445a4e..a348c2d783 100644
--- a/activerecord/test/cases/connection_adapters/type_lookup_test.rb
+++ b/activerecord/test/cases/connection_adapters/type_lookup_test.rb
@@ -89,12 +89,20 @@ unless current_adapter?(:PostgreSQLAdapter) # PostgreSQL does not use type strin
end
def test_decimal_without_scale
- types = %w{decimal(2) decimal(2,0) numeric(2) numeric(2,0) number(2) number(2,0)}
- types.each do |type|
- cast_type = @connection.type_map.lookup(type)
-
- assert_equal :decimal, cast_type.type
- assert_equal 2, cast_type.cast(2.1)
+ if current_adapter?(:OracleAdapter)
+ {
+ decimal: %w{decimal(2) decimal(2,0) numeric(2) numeric(2,0)},
+ integer: %w{number(2) number(2,0)}
+ }
+ else
+ { decimal: %w{decimal(2) decimal(2,0) numeric(2) numeric(2,0) number(2) number(2,0)} }
+ end.each do |expected_type, types|
+ types.each do |type|
+ cast_type = @connection.type_map.lookup(type)
+
+ assert_equal expected_type, cast_type.type
+ assert_equal 2, cast_type.cast(2.1)
+ end
end
end