aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/query_cache_test.rb
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2017-07-21 17:48:00 -0400
committerGitHub <noreply@github.com>2017-07-21 17:48:00 -0400
commit8ec5c878fdb0eb326c56deea4405364a98d279b5 (patch)
tree3a408a3d42d7f688472f56d419f502a09598f69a /activerecord/test/cases/query_cache_test.rb
parent81d7b9854fe017acc5861400ab7aa899e9edf010 (diff)
parent2ec207520389f4a6acb393be45bc73cc3815ad76 (diff)
downloadrails-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/query_cache_test.rb')
-rw-r--r--activerecord/test/cases/query_cache_test.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/activerecord/test/cases/query_cache_test.rb b/activerecord/test/cases/query_cache_test.rb
index 3a2bd62997..f843368a09 100644
--- a/activerecord/test/cases/query_cache_test.rb
+++ b/activerecord/test/cases/query_cache_test.rb
@@ -402,10 +402,8 @@ class QueryCacheTest < ActiveRecord::TestCase
# Warm the cache
Task.find(1)
- Task.connection.type_map.clear
-
# Preload the type cache again (so we don't have those queries issued during our assertions)
- Task.connection.send(:initialize_type_map, Task.connection.type_map)
+ Task.connection.send(:reload_type_map)
# Clear places where type information is cached
Task.reset_column_information