aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-03-13 16:28:08 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-03-13 16:28:08 -0300
commitb4d4d93d6cf3bb7ced4a923fbe89a835a04c83a6 (patch)
tree895b020a708060603b3884a1403fa598ab0cfce1 /activerecord/test
parent229dd87717d3e0d8a1d32a8acf32a3d90217782f (diff)
parent433b19d7e82263fb78c481576ed0f475a62fde06 (diff)
downloadrails-b4d4d93d6cf3bb7ced4a923fbe89a835a04c83a6.tar.gz
rails-b4d4d93d6cf3bb7ced4a923fbe89a835a04c83a6.tar.bz2
rails-b4d4d93d6cf3bb7ced4a923fbe89a835a04c83a6.zip
Merge pull request #14372 from arthurnn/fix_query_cache_binds
Make select_all on query cache accept a Relation without binds.
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/query_cache_test.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/activerecord/test/cases/query_cache_test.rb b/activerecord/test/cases/query_cache_test.rb
index da8ae672fe..9d89d6a1e8 100644
--- a/activerecord/test/cases/query_cache_test.rb
+++ b/activerecord/test/cases/query_cache_test.rb
@@ -118,6 +118,14 @@ class QueryCacheTest < ActiveRecord::TestCase
assert ActiveRecord::Base.connection.query_cache.empty?, 'cache should be empty'
end
+ def test_cache_passing_a_relation
+ post = Post.first
+ Post.cache do
+ query = post.categories.select(:post_id)
+ assert Post.connection.select_all(query).is_a?(ActiveRecord::Result)
+ end
+ end
+
def test_find_queries
assert_queries(2) { Task.find(1); Task.find(1) }
end