diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2017-07-21 17:48:00 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-21 17:48:00 -0400 |
commit | 8ec5c878fdb0eb326c56deea4405364a98d279b5 (patch) | |
tree | 3a408a3d42d7f688472f56d419f502a09598f69a /activerecord/test/cases/connection_adapters | |
parent | 81d7b9854fe017acc5861400ab7aa899e9edf010 (diff) | |
parent | 2ec207520389f4a6acb393be45bc73cc3815ad76 (diff) | |
download | rails-8ec5c878fdb0eb326c56deea4405364a98d279b5.tar.gz rails-8ec5c878fdb0eb326c56deea4405364a98d279b5.tar.bz2 rails-8ec5c878fdb0eb326c56deea4405364a98d279b5.zip |
Merge pull request #29869 from kamipo/make_type_map_to_private
Make `type_map` to private because it is only used in the connection adapter
Diffstat (limited to 'activerecord/test/cases/connection_adapters')
-rw-r--r-- | activerecord/test/cases/connection_adapters/mysql_type_lookup_test.rb | 2 | ||||
-rw-r--r-- | activerecord/test/cases/connection_adapters/type_lookup_test.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/test/cases/connection_adapters/mysql_type_lookup_test.rb b/activerecord/test/cases/connection_adapters/mysql_type_lookup_test.rb index 521879cc2f..7c41050eaa 100644 --- a/activerecord/test/cases/connection_adapters/mysql_type_lookup_test.rb +++ b/activerecord/test/cases/connection_adapters/mysql_type_lookup_test.rb @@ -49,7 +49,7 @@ if current_adapter?(:Mysql2Adapter) private def assert_lookup_type(type, lookup) - cast_type = @connection.type_map.lookup(lookup) + cast_type = @connection.send(:type_map).lookup(lookup) assert_equal type, cast_type.type end diff --git a/activerecord/test/cases/connection_adapters/type_lookup_test.rb b/activerecord/test/cases/connection_adapters/type_lookup_test.rb index 1c4ca2e23d..917a04ebc3 100644 --- a/activerecord/test/cases/connection_adapters/type_lookup_test.rb +++ b/activerecord/test/cases/connection_adapters/type_lookup_test.rb @@ -82,7 +82,7 @@ unless current_adapter?(:PostgreSQLAdapter) # PostgreSQL does not use type strin end def test_bigint_limit - cast_type = @connection.type_map.lookup("bigint") + cast_type = @connection.send(:type_map).lookup("bigint") if current_adapter?(:OracleAdapter) assert_equal 19, cast_type.limit else @@ -100,7 +100,7 @@ unless current_adapter?(:PostgreSQLAdapter) # PostgreSQL does not use type strin { 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) + cast_type = @connection.send(:type_map).lookup(type) assert_equal expected_type, cast_type.type assert_equal 2, cast_type.cast(2.1) @@ -111,7 +111,7 @@ unless current_adapter?(:PostgreSQLAdapter) # PostgreSQL does not use type strin private def assert_lookup_type(type, lookup) - cast_type = @connection.type_map.lookup(lookup) + cast_type = @connection.send(:type_map).lookup(lookup) assert_equal type, cast_type.type end end |