aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-07-06 07:07:46 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-07-06 07:07:46 -0700
commit717aa92dd3f75dec04652940d5571ab34a2f79c3 (patch)
treee1b6d044ee68f5283420fb66c2598afad27de6c7 /activerecord/test
parent48fe38201d2b56aa762282c741f5ebbbd99f23a4 (diff)
parent75b340d1a4bcf2f1233fb65a15ff6b8059e2230e (diff)
downloadrails-717aa92dd3f75dec04652940d5571ab34a2f79c3.tar.gz
rails-717aa92dd3f75dec04652940d5571ab34a2f79c3.tar.bz2
rails-717aa92dd3f75dec04652940d5571ab34a2f79c3.zip
Merge pull request #6985 from sidonath/disable-query-cache-for-locks
Disable query cache for lock queries
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 08f655d7fa..0153e74604 100644
--- a/activerecord/test/cases/query_cache_test.rb
+++ b/activerecord/test/cases/query_cache_test.rb
@@ -164,6 +164,14 @@ class QueryCacheTest < ActiveRecord::TestCase
end
end
end
+
+ def test_cache_is_ignored_for_locked_relations
+ task = Task.find 1
+
+ Task.cache do
+ assert_queries(2) { task.lock!; task.lock! }
+ end
+ end
end
class QueryCacheExpiryTest < ActiveRecord::TestCase