aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG.md
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2018-10-16 09:51:32 +0900
committerRyuta Kamizono <kamipo@gmail.com>2018-10-16 09:54:21 +0900
commitb7c29fc962588b28d2955dfcb14e5f655e181164 (patch)
tree07a872e764fc767f080e20b966e873ec5444ea5a /activerecord/CHANGELOG.md
parent134dab46e4e94d7e6e37cec43dca8183fe72aea6 (diff)
parentb1aeae0494c904db224b728330084ea173f38cf5 (diff)
downloadrails-b7c29fc962588b28d2955dfcb14e5f655e181164.tar.gz
rails-b7c29fc962588b28d2955dfcb14e5f655e181164.tar.bz2
rails-b7c29fc962588b28d2955dfcb14e5f655e181164.zip
Merge pull request #33075 from fedxgibson/pg_ambigous_column_cache_key_limit_custom_select
Fix Collection cache key with limit and custom select
Diffstat (limited to 'activerecord/CHANGELOG.md')
-rw-r--r--activerecord/CHANGELOG.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 00f4ee1aaa..97b7ad93d1 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,9 @@
+* Fix collection cache key with limit and custom select to avoid ambiguous timestamp column error.
+
+ Fixes #33056.
+
+ *Federico Martinez*
+
* Add basic API for connection switching to support multiple databases.
1) Adds a `connects_to` method for models to connect to multiple databases. Example: