forked from fedi/mastodon
Make tag search case insensitive again (#4184)
This commit is contained in:
parent
c29c20ab3c
commit
c2753fdfb4
|
@ -23,7 +23,7 @@ class Tag < ApplicationRecord
|
||||||
class << self
|
class << self
|
||||||
def search_for(term, limit = 5)
|
def search_for(term, limit = 5)
|
||||||
pattern = sanitize_sql_like(term) + '%'
|
pattern = sanitize_sql_like(term) + '%'
|
||||||
Tag.where('name like ?', pattern).order(:name).limit(limit)
|
Tag.where('lower(name) like lower(?)', pattern).order(:name).limit(limit)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
class MakeTagSearchCaseInsensitive < ActiveRecord::Migration[5.1]
|
||||||
|
def up
|
||||||
|
remove_index :tags, name: :hashtag_search_index
|
||||||
|
execute 'CREATE INDEX hashtag_search_index ON tags (lower(name) text_pattern_ops);'
|
||||||
|
end
|
||||||
|
|
||||||
|
def down
|
||||||
|
remove_index :tags, name: :hashtag_search_index
|
||||||
|
execute 'CREATE INDEX hashtag_search_index ON tags (name text_pattern_ops);'
|
||||||
|
end
|
||||||
|
end
|
|
@ -10,7 +10,7 @@
|
||||||
#
|
#
|
||||||
# It's strongly recommended that you check this file into your version control system.
|
# It's strongly recommended that you check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema.define(version: 20170711225116) do
|
ActiveRecord::Schema.define(version: 20170713112503) do
|
||||||
|
|
||||||
# These are extensions that must be enabled in order to support this database
|
# These are extensions that must be enabled in order to support this database
|
||||||
enable_extension "plpgsql"
|
enable_extension "plpgsql"
|
||||||
|
@ -332,7 +332,7 @@ ActiveRecord::Schema.define(version: 20170711225116) do
|
||||||
t.string "name", default: "", null: false
|
t.string "name", default: "", null: false
|
||||||
t.datetime "created_at", null: false
|
t.datetime "created_at", null: false
|
||||||
t.datetime "updated_at", null: false
|
t.datetime "updated_at", null: false
|
||||||
t.index "name text_pattern_ops", name: "hashtag_search_index"
|
t.index "lower((name)::text) text_pattern_ops", name: "hashtag_search_index"
|
||||||
t.index ["name"], name: "index_tags_on_name", unique: true
|
t.index ["name"], name: "index_tags_on_name", unique: true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -27,6 +27,15 @@ RSpec.describe Tag, type: :model do
|
||||||
expect(results).to eq [tag]
|
expect(results).to eq [tag]
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'finds tag records in case insensitive' do
|
||||||
|
tag = Fabricate(:tag, name: "MATCH")
|
||||||
|
_miss_tag = Fabricate(:tag, name: "miss")
|
||||||
|
|
||||||
|
results = Tag.search_for("match")
|
||||||
|
|
||||||
|
expect(results).to eq [tag]
|
||||||
|
end
|
||||||
|
|
||||||
it 'finds the exact matching tag as the first item' do
|
it 'finds the exact matching tag as the first item' do
|
||||||
similar_tag = Fabricate(:tag, name: "matchlater")
|
similar_tag = Fabricate(:tag, name: "matchlater")
|
||||||
tag = Fabricate(:tag, name: "match")
|
tag = Fabricate(:tag, name: "match")
|
||||||
|
|
Loading…
Reference in a new issue