Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mastodon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pierre Boudes
mastodon
Commits
2edf6d81
Commit
2edf6d81
authored
5 years ago
by
ThibG
Committed by
Eugen Rochko
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Simplify SQL query when performing account search amongst followings (#12302)
parent
c656cc21
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/models/account.rb
+2
-2
2 additions, 2 deletions
app/models/account.rb
with
2 additions
and
2 deletions
app/models/account.rb
+
2
−
2
View file @
2edf6d81
...
...
@@ -436,7 +436,7 @@ class Account < ApplicationRecord
accounts.*,
(count(f.id) + 1) * ts_rank_cd(
#{
textsearch
}
,
#{
query
}
, 32) AS rank
FROM accounts
LEFT OUTER JOIN follows AS f ON (accounts.id = f.account_id AND f.target_account_id = ?)
OR (accounts.id = f.target_account_id AND f.account_id = ?)
LEFT OUTER JOIN follows AS f ON (accounts.id = f.account_id AND f.target_account_id = ?)
WHERE accounts.id IN (SELECT * FROM first_degree)
AND
#{
query
}
@@
#{
textsearch
}
AND accounts.suspended_at IS NULL
...
...
@@ -446,7 +446,7 @@ class Account < ApplicationRecord
LIMIT ? OFFSET ?
SQL
records
=
find_by_sql
([
sql
,
account
.
id
,
account
.
id
,
account
.
id
,
account
.
id
,
limit
,
offset
])
records
=
find_by_sql
([
sql
,
account
.
id
,
account
.
id
,
account
.
id
,
limit
,
offset
])
else
sql
=
<<-
SQL
.
squish
SELECT
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment