techhub/mastodon
2
0
Fork 0
Code Activity

Fix N+1s because of association preloaders not actually getting called (#28339)

Browse Source
This commit is contained in:
Claire
2023-12-13 08:47:32 +01:00
committed by GitHub
parent 3f1ec16377
commit dcc24db793
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/concerns/account/search.rb
View File

@@ -124,7 +124,7 @@ module Account::Search
tsquery = generate_query_for_search(terms)
find_by_sql([BASIC_SEARCH_SQL, { limit: limit, offset: offset, tsquery: tsquery }]).tap do |records|
ActiveRecord::Associations::Preloader.new(records: records, associations: :account_stat)
ActiveRecord::Associations::Preloader.new(records: records, associations: [:account_stat, { user: :role }]).call
end
end
@@ -133,7 +133,7 @@ module Account::Search
sql_template = following ? ADVANCED_SEARCH_WITH_FOLLOWING : ADVANCED_SEARCH_WITHOUT_FOLLOWING
find_by_sql([sql_template, { id: account.id, limit: limit, offset: offset, tsquery: tsquery }]).tap do |records|
ActiveRecord::Associations::Preloader.new(records: records, associations: :account_stat)
ActiveRecord::Associations::Preloader.new(records: records, associations: [:account_stat, { user: :role }]).call
end
end