# HG changeset patch # User bsw # Date 1566827377 -7200 # Node ID faaf9ec3e09c774b3c05fb7650c5ccbb64bbc434 # Parent 4badb51649f7e01254330699c7df10f03677de74 Fixed usage of text search index diff -r 4badb51649f7 -r faaf9ec3e09c model/issue.lua --- a/model/issue.lua Mon Aug 26 15:27:05 2019 +0200 +++ b/model/issue.lua Mon Aug 26 15:49:37 2019 +0200 @@ -219,7 +219,7 @@ return self:new_selector() :join('"initiative"', nil, '"initiative"."issue_id" = "issue"."id"') :join('"draft"', nil, '"draft"."initiative_id" = "initiative"."id"') - :add_where{ '"initiative"."text_search_data" @@ "text_search_query"(?) OR "draft"."text_search_data" @@ "text_search_query"(?)', search_string, search_string } + :add_where{ 'to_tsvector("initiative") @@ "plainto_tsquery"(?) OR to_tsvector("draft") @@ "plainto_tsquery"(?)', search_string, search_string } :add_group_by('"issue"."id"') end diff -r 4badb51649f7 -r faaf9ec3e09c model/member.lua --- a/model/member.lua Mon Aug 26 15:27:05 2019 +0200 +++ b/model/member.lua Mon Aug 26 15:49:37 2019 +0200 @@ -570,7 +570,7 @@ function Member:get_search_selector(search_string) return self:new_selector() :add_field( {'"highlight"("member"."name", ?)', search_string }, "name_highlighted") - :add_where{ '"member"."text_search_data" @@ "text_search_query"(?)', search_string } + :add_where{ 'to_tsvector("member") @@ "plainto_tsquery"(?)', search_string } :add_where("activated NOTNULL AND active") end