Search account domain in lowercase (#13016)
* Search account domain in lowercase * fix rubocop error * fix spec/models/account_spec.rb
This commit is contained in:
parent
37dc12dd53
commit
61a7390b66
5 changed files with 55 additions and 16 deletions
|
@ -48,7 +48,7 @@ module AccountFinderConcern
|
|||
end
|
||||
|
||||
def with_usernames
|
||||
Account.where.not(username: '')
|
||||
Account.where.not(Account.arel_table[:username].lower.eq '')
|
||||
end
|
||||
|
||||
def matching_username
|
||||
|
@ -56,11 +56,7 @@ module AccountFinderConcern
|
|||
end
|
||||
|
||||
def matching_domain
|
||||
if domain.nil?
|
||||
Account.where(domain: nil)
|
||||
else
|
||||
Account.where(Account.arel_table[:domain].lower.eq domain.to_s.downcase)
|
||||
end
|
||||
Account.where(Account.arel_table[:domain].lower.eq(domain.nil? ? nil : domain.to_s.downcase))
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue