1 files changed, 16 insertions, 1 deletions
diff --git a/activerecord/test/cases/query_cache_test.rb b/activerecord/test/cases/query_cache_test.rb
index 406643d6fb..d5c01315c1 100644
--- a/activerecord/test/cases/query_cache_test.rb
+++ b/activerecord/test/cases/query_cache_test.rb
@@ -133,7 +133,6 @@ class QueryCacheTest < ActiveRecord::TestCase
 
   def test_cache_is_flat
     Task.cache do
-      Topic.columns # don't count this query
       assert_queries(1) { Topic.find(1); Topic.find(1); }
     end
 
@@ -175,6 +174,22 @@ class QueryCacheTest < ActiveRecord::TestCase
     ActiveRecord::Base.configurations = conf
   end
 
+  def test_cache_is_not_available_when_using_a_not_connected_connection
+    spec_name = Task.connection_specification_name
+    conf = ActiveRecord::Base.configurations['arunit'].merge('name' => 'test2')
+    ActiveRecord::Base.connection_handler.establish_connection(conf)
+    Task.connection_specification_name = "test2"
+    refute Task.connected?
+
+    Task.cache do
+      Task.connection # warmup postgresql connection setup queries
+      assert_queries(2) { Task.find(1); Task.find(1) }
+    end
+  ensure
+    ActiveRecord::Base.connection_handler.remove_connection(Task.connection_specification_name)
+    Task.connection_specification_name = spec_name
+  end
+
   def test_query_cache_doesnt_leak_cached_results_of_rolled_back_queries
     ActiveRecord::Base.connection.enable_query_cache!
     post = Post.first