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/test/cases | |
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/test/cases')
-rw-r--r-- | activerecord/test/cases/collection_cache_key_test.rb | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/activerecord/test/cases/collection_cache_key_test.rb b/activerecord/test/cases/collection_cache_key_test.rb index 844b2b2162..483383257b 100644 --- a/activerecord/test/cases/collection_cache_key_test.rb +++ b/activerecord/test/cases/collection_cache_key_test.rb @@ -42,6 +42,20 @@ module ActiveRecord assert_equal last_developer_timestamp.to_s(ActiveRecord::Base.cache_timestamp_format), $3 end + test "cache_key for relation with custom select and limit" do + developers = Developer.where(salary: 100000).order(updated_at: :desc).limit(5) + developers_with_select = developers.select("developers.*") + last_developer_timestamp = developers.first.updated_at + + assert_match(/\Adevelopers\/query-(\h+)-(\d+)-(\d+)\z/, developers_with_select.cache_key) + + /\Adevelopers\/query-(\h+)-(\d+)-(\d+)\z/ =~ developers_with_select.cache_key + + assert_equal ActiveSupport::Digest.hexdigest(developers_with_select.to_sql), $1 + assert_equal developers.count.to_s, $2 + assert_equal last_developer_timestamp.to_s(ActiveRecord::Base.cache_timestamp_format), $3 + end + test "cache_key for loaded relation" do developers = Developer.where(salary: 100000).order(updated_at: :desc).limit(5).load last_developer_timestamp = developers.first.updated_at |