aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/collection_cache_key.rb
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2017-09-14 10:11:01 +0900
committerRyuta Kamizono <kamipo@gmail.com>2017-09-14 10:17:28 +0900
commitbdc2ba0ec9e1920965841da6e1a392d1ba2816e4 (patch)
treee14fdf318435d2128c749ee7d9bfa31e9c8c625f /activerecord/lib/active_record/collection_cache_key.rb
parentf904700ba4579a36670749d0cfe23cc117d0e389 (diff)
downloadrails-bdc2ba0ec9e1920965841da6e1a392d1ba2816e4.tar.gz
rails-bdc2ba0ec9e1920965841da6e1a392d1ba2816e4.tar.bz2
rails-bdc2ba0ec9e1920965841da6e1a392d1ba2816e4.zip
Don't use `collection.table_name` in `collection_cache_key`
Because `collection.table_name` doesn't respect table alias. Use `collection.arel_attribute` instead.
Diffstat (limited to 'activerecord/lib/active_record/collection_cache_key.rb')
-rw-r--r--activerecord/lib/active_record/collection_cache_key.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/collection_cache_key.rb b/activerecord/lib/active_record/collection_cache_key.rb
index b1937a3c68..f3e6516414 100644
--- a/activerecord/lib/active_record/collection_cache_key.rb
+++ b/activerecord/lib/active_record/collection_cache_key.rb
@@ -13,7 +13,7 @@ module ActiveRecord
end
else
column_type = type_for_attribute(timestamp_column.to_s)
- column = "#{connection.quote_table_name(collection.table_name)}.#{connection.quote_column_name(timestamp_column)}"
+ column = connection.column_name_from_arel_node(collection.arel_attribute(timestamp_column))
select_values = "COUNT(*) AS #{connection.quote_column_name("size")}, MAX(%s) AS timestamp"
if collection.has_limit_or_offset?