post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests 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
parent 7abc61887f
commit a12b7551cf
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

@ -122,7 +122,7 @@ module AccountSearch
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
@ -131,7 +131,7 @@ module AccountSearch
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