aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/query_cache_test.rb
diff options
context:
space:
mode:
authorDamir Zekic <damirz@gmail.com>2012-07-06 13:03:49 +0200
committerDamir Zekic <damirz@gmail.com>2012-07-06 15:01:55 +0200
commit75b340d1a4bcf2f1233fb65a15ff6b8059e2230e (patch)
treec415d4519556d20665b7f8409be2f0345a6b3e16 /activerecord/test/cases/query_cache_test.rb
parent8ce61a366474b20368f60eb1c7bf31c3b7297873 (diff)
downloadrails-75b340d1a4bcf2f1233fb65a15ff6b8059e2230e.tar.gz
rails-75b340d1a4bcf2f1233fb65a15ff6b8059e2230e.tar.bz2
rails-75b340d1a4bcf2f1233fb65a15ff6b8059e2230e.zip
Disable query cache for lock queries
Fixes #867
Diffstat (limited to 'activerecord/test/cases/query_cache_test.rb')
-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