diff options
| -rw-r--r-- | app/models/account.rb | 10 | ||||
| -rw-r--r-- | db/migrate/20170322021028_add_lowercase_index_to_accounts.rb | 9 | ||||
| -rw-r--r-- | db/schema.rb | 3 |
3 files changed, 16 insertions, 6 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index aa0af563c..c0cd2ff64 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -187,7 +187,7 @@ class Account < ApplicationRecord def find_remote!(username, domain) return if username.blank? - where(arel_table[:username].matches(username.gsub(/[%_]/, '\\\\\0'))).where(domain.nil? ? { domain: nil } : arel_table[:domain].matches(domain.gsub(/[%_]/, '\\\\\0'))).take! + where('lower(accounts.username) = ?', username.downcase).where(domain.nil? ? { domain: nil } : 'lower(accounts.domain) = ?', domain&.downcase).take! end def find_local(username) @@ -222,8 +222,8 @@ SQL end def search_for(terms, limit = 10) - textsearch = '(setweight(to_tsvector(\'simple\', accounts.display_name), \'A\') || setweight(to_tsvector(\'simple\', accounts.username), \'B\') || setweight(to_tsvector(\'simple\', coalesce(accounts.domain, \'\')), \'C\'))' - query = 'to_tsquery(\'simple\', \'\'\' \' || ? || \' \'\'\' || \':*\')' + textsearch = '(setweight(to_tsvector(\'simple\', accounts.display_name), \'A\') || setweight(to_tsvector(\'simple\', accounts.username), \'B\') || setweight(to_tsvector(\'simple\', coalesce(accounts.domain, \'\')), \'C\'))' + query = 'to_tsquery(\'simple\', \'\'\' \' || ? || \' \'\'\' || \':*\')' sql = <<SQL SELECT @@ -239,8 +239,8 @@ SQL end def advanced_search_for(terms, account, limit = 10) - textsearch = '(setweight(to_tsvector(\'simple\', accounts.display_name), \'A\') || setweight(to_tsvector(\'simple\', accounts.username), \'B\') || setweight(to_tsvector(\'simple\', coalesce(accounts.domain, \'\')), \'C\'))' - query = 'to_tsquery(\'simple\', \'\'\' \' || ? || \' \'\'\' || \':*\')' + textsearch = '(setweight(to_tsvector(\'simple\', accounts.display_name), \'A\') || setweight(to_tsvector(\'simple\', accounts.username), \'B\') || setweight(to_tsvector(\'simple\', coalesce(accounts.domain, \'\')), \'C\'))' + query = 'to_tsquery(\'simple\', \'\'\' \' || ? || \' \'\'\' || \':*\')' sql = <<SQL SELECT diff --git a/db/migrate/20170322021028_add_lowercase_index_to_accounts.rb b/db/migrate/20170322021028_add_lowercase_index_to_accounts.rb new file mode 100644 index 000000000..43032747a --- /dev/null +++ b/db/migrate/20170322021028_add_lowercase_index_to_accounts.rb @@ -0,0 +1,9 @@ +class AddLowercaseIndexToAccounts < ActiveRecord::Migration[5.0] + def up + execute 'CREATE INDEX index_accounts_on_username_and_domain_lower ON accounts (lower(username), lower(domain))' + end + + def down + remove_index :accounts, name: 'index_accounts_on_username_and_domain_lower' + end +end diff --git a/db/schema.rb b/db/schema.rb index 395034375..3ace2e32e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20170318214217) do +ActiveRecord::Schema.define(version: 20170322021028) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -45,6 +45,7 @@ ActiveRecord::Schema.define(version: 20170318214217) do t.boolean "locked", default: false, null: false t.string "header_remote_url", default: "", null: false t.index "(((setweight(to_tsvector('simple'::regconfig, (display_name)::text), 'A'::\"char\") || setweight(to_tsvector('simple'::regconfig, (username)::text), 'B'::\"char\")) || setweight(to_tsvector('simple'::regconfig, (COALESCE(domain, ''::character varying))::text), 'C'::\"char\")))", name: "search_index", using: :gin + t.index "lower((username)::text), lower((domain)::text)", name: "index_accounts_on_username_and_domain_lower", using: :btree t.index ["username", "domain"], name: "index_accounts_on_username_and_domain", unique: true, using: :btree end |