aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG.md
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2019-02-25 23:40:20 +0900
committerRyuta Kamizono <kamipo@gmail.com>2019-02-26 00:30:26 +0900
commit66b4ddd3353e14b27214e156c949ba41e2ce5ba4 (patch)
tree10034e7ef5dc6b698689f84ce8f65f91dfcc0f5f /activerecord/CHANGELOG.md
parentf4bef91a312954535c37f727c1bdbffaed64c2c1 (diff)
downloadrails-66b4ddd3353e14b27214e156c949ba41e2ce5ba4.tar.gz
rails-66b4ddd3353e14b27214e156c949ba41e2ce5ba4.tar.bz2
rails-66b4ddd3353e14b27214e156c949ba41e2ce5ba4.zip
Fix prepared statements caching to be enabled even when query caching is enabled
Related cbcdecd, 2a56b2d. This is a regression caused by cbcdecd. If query caching is enabled, prepared statement handles are never re-used, since we missed that a query is preprocessed when query caching is enabled, but doesn't keep the `preparable` flag. We should care about that case.
Diffstat (limited to 'activerecord/CHANGELOG.md')
-rw-r--r--activerecord/CHANGELOG.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 57f831bac3..7e153a6642 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,7 @@
+* Fix prepared statements caching to be enabled even when query caching is enabled.
+
+ *Ryuta Kamizono*
+
* Ensure `update_all` series cares about optimistic locking.
*Ryuta Kamizono*