diff options
author | Akihiko Odaki <nekomanma@pixiv.co.jp> | 2020-08-28 19:29:59 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-28 12:29:59 +0200 |
commit | e26e7a1cb5992375eecedbc10ab9bcef4e603a88 (patch) | |
tree | a74ed55b41413c0d20757a76baa4fb20fa9d565d /app/controllers/api/v1/timelines | |
parent | 552e886b648faa2a2229d86c7fd9abc8bb5ff99c (diff) |
Replace incorrect use of distinct with group (#14675)
Some uses of ActiveRecord::QueryMethods#distinct pass field names but they are incorrect for the current version of Rails. ActiveRecord::QueryMethods#group provides the expected behavior and benefits performance. See commit 6da24aad4cafdef8d8a2c92bac2002a5fc2fe9c8.
Diffstat (limited to 'app/controllers/api/v1/timelines')
-rw-r--r-- | app/controllers/api/v1/timelines/public_controller.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/controllers/api/v1/timelines/public_controller.rb b/app/controllers/api/v1/timelines/public_controller.rb index c6e7854d9..6ca903c16 100644 --- a/app/controllers/api/v1/timelines/public_controller.rb +++ b/app/controllers/api/v1/timelines/public_controller.rb @@ -30,9 +30,7 @@ class Api::V1::Timelines::PublicController < Api::BaseController ) if truthy_param?(:only_media) - # `SELECT DISTINCT id, updated_at` is too slow, so pluck ids at first, and then select id, updated_at with ids. - status_ids = statuses.joins(:media_attachments).distinct(:id).pluck(:id) - statuses.where(id: status_ids) + statuses.joins(:media_attachments).group(:id) else statuses end |