diff options
author | Matthew Draper <matthew@trebex.net> | 2017-06-04 21:24:16 +0930 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-04 21:24:16 +0930 |
commit | e7e9e0722aea751886aeb7e501fadf115e95897e (patch) | |
tree | 8dc8535d7c864c8ad3ade9025a4aeeeaea96674e /activerecord/test/cases/adapters | |
parent | 50c4bd9ff60cb135b30a8bba2ba9b80f158bb0ef (diff) | |
parent | cd64345812567cf67fc7cca740ffc211b272e9f1 (diff) | |
download | rails-e7e9e0722aea751886aeb7e501fadf115e95897e.tar.gz rails-e7e9e0722aea751886aeb7e501fadf115e95897e.tar.bz2 rails-e7e9e0722aea751886aeb7e501fadf115e95897e.zip |
Merge pull request #29341 from y-yagi/explicitly_clear_type_map_before_run_test
Explicitly clear type map before run `test_only_reload_type_map_once_for_every_unknown_type`
Diffstat (limited to 'activerecord/test/cases/adapters')
-rw-r--r-- | activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb index bfc763e1ef..b55b766d20 100644 --- a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb +++ b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb @@ -325,15 +325,18 @@ module ActiveRecord end def test_only_reload_type_map_once_for_every_unknown_type + reset_connection + connection = ActiveRecord::Base.connection + silence_warnings do assert_queries 2, ignore_none: true do - @connection.select_all "SELECT NULL::anyelement" + connection.select_all "SELECT NULL::anyelement" end assert_queries 1, ignore_none: true do - @connection.select_all "SELECT NULL::anyelement" + connection.select_all "SELECT NULL::anyelement" end assert_queries 2, ignore_none: true do - @connection.select_all "SELECT NULL::anyarray" + connection.select_all "SELECT NULL::anyarray" end end ensure @@ -341,10 +344,13 @@ module ActiveRecord end def test_only_warn_on_first_encounter_of_unknown_oid + reset_connection + connection = ActiveRecord::Base.connection + warning = capture(:stderr) { - @connection.select_all "SELECT NULL::anyelement" - @connection.select_all "SELECT NULL::anyelement" - @connection.select_all "SELECT NULL::anyelement" + connection.select_all "SELECT NULL::anyelement" + connection.select_all "SELECT NULL::anyelement" + connection.select_all "SELECT NULL::anyelement" } assert_match(/\Aunknown OID \d+: failed to recognize type of 'anyelement'\. It will be treated as String\.\n\z/, warning) ensure |