From 5d669d8aa2e085f7a87d077dff973a3c673cf980 Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 31 Jan 2023 10:39:23 +1100 Subject: [PATCH] Revert "FEATURE: hidden site setting to disable search prefix matching (#20058)" (#20073) This reverts commit 64f7b97d083a99a99f6bf91c32f4a2ba6b781d86. Too many side effects for this setting, we have decided to remove it --- config/site_settings.yml | 3 --- lib/search.rb | 3 +-- spec/lib/search_spec.rb | 21 --------------------- 3 files changed, 1 insertion(+), 26 deletions(-) diff --git a/config/site_settings.yml b/config/site_settings.yml index 5fa7c4a256f..0ec95ded873 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -2192,9 +2192,6 @@ backups: client: true search: - enable_search_prefix_matching: - default: true - hidden: true use_pg_headlines_for_excerpt: default: false hidden: true diff --git a/lib/search.rb b/lib/search.rb index ab8c6a06aea..0429afe2bbd 100644 --- a/lib/search.rb +++ b/lib/search.rb @@ -1237,8 +1237,7 @@ class Search end def self.set_tsquery_weight_filter(term, weight_filter) - optional_star = SiteSetting.enable_search_prefix_matching ? "*" : "" - "'#{self.escape_string(term)}':#{optional_star}#{weight_filter}" + "'#{self.escape_string(term)}':*#{weight_filter}" end def self.escape_string(term) diff --git a/spec/lib/search_spec.rb b/spec/lib/search_spec.rb index be7c0c3ec78..4388a13ebde 100644 --- a/spec/lib/search_spec.rb +++ b/spec/lib/search_spec.rb @@ -2580,25 +2580,4 @@ RSpec.describe Search do expect(result.categories.length).to eq(0) end end - - context "when enable_search_prefix_matching is disabled" do - before do - SearchIndexer.enable - SiteSetting.enable_search_prefix_matching = false - end - - fab!(:post) do - Fabricate(:post, topic: topic, raw: "this body of the post contains abracadabra") - end - - it "omits prefix search results" do - SearchIndexer.index(post, force: true) - - result = Search.execute("abra") - expect(result.posts.length).to eq(0) - - result = Search.execute("abracadabra") - expect(result.posts.length).to eq(1) - end - end end