diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2018-10-16 09:51:32 +0900 |
|---|---|---|
| committer | Ryuta Kamizono <kamipo@gmail.com> | 2018-10-16 09:54:21 +0900 |
| commit | b7c29fc962588b28d2955dfcb14e5f655e181164 (patch) | |
| tree | 07a872e764fc767f080e20b966e873ec5444ea5a /activerecord/lib | |
| parent | 134dab46e4e94d7e6e37cec43dca8183fe72aea6 (diff) | |
| parent | b1aeae0494c904db224b728330084ea173f38cf5 (diff) | |
| download | rails-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/lib')
| -rw-r--r-- | activerecord/lib/active_record/collection_cache_key.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/collection_cache_key.rb b/activerecord/lib/active_record/collection_cache_key.rb index 61581b0451..4b6db8a96c 100644 --- a/activerecord/lib/active_record/collection_cache_key.rb +++ b/activerecord/lib/active_record/collection_cache_key.rb @@ -20,9 +20,9 @@ module ActiveRecord select_values = "COUNT(*) AS #{connection.quote_column_name("size")}, MAX(%s) AS timestamp" if collection.has_limit_or_offset? - query = collection.select(column) + query = collection.select("#{column} AS collection_cache_key_timestamp") subquery_alias = "subquery_for_cache_key" - subquery_column = "#{subquery_alias}.#{timestamp_column}" + subquery_column = "#{subquery_alias}.collection_cache_key_timestamp" subquery = query.arel.as(subquery_alias) arel = Arel::SelectManager.new(subquery).project(select_values % subquery_column) else |