Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix full-text search query quotation, improve tag search performance with an index,

Browse source 
add ability to open status by URL from search (fix #53)
This commit is contained in:
Eugen Rochko 2017-03-22 17:36:34 +01:00
parent c89ccbab09
commit 5aa3df017b
14 changed files with 106 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/models/account.rb
View file

@ -222,8 +222,9 @@ SQL
end
def search_for(terms, limit = 10)
terms = Arel.sql(connection.quote(terms.gsub(/['?\\:]/, ' ')))
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\', \'\'\' \' || ? || \' \'\'\' || \':*\')'
query = 'to_tsquery(\'simple\', \'\'\' \' || ' + terms + ' || \' \'\'\' || \':*\')'
sql = <<SQL
SELECT
@ -235,12 +236,13 @@ SQL
LIMIT ?
SQL
Account.find_by_sql([sql, terms, terms, limit])
Account.find_by_sql([sql, limit])
end
def advanced_search_for(terms, account, limit = 10)
terms = Arel.sql(connection.quote(terms.gsub(/['?\\:]/, ' ')))
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\', \'\'\' \' || ? || \' \'\'\' || \':*\')'
query = 'to_tsquery(\'simple\', \'\'\' \' || ' + terms + ' || \' \'\'\' || \':*\')'
sql = <<SQL
SELECT
@ -254,7 +256,7 @@ SQL
LIMIT ?
SQL
Account.find_by_sql([sql, terms, account.id, account.id, terms, limit])
Account.find_by_sql([sql, account.id, account.id, limit])
end
def following_map(target_account_ids, account_id)

5
app/models/tag.rb
View file

@ -13,8 +13,9 @@ class Tag < ApplicationRecord
class << self
def search_for(terms, limit = 5)
terms = Arel.sql(connection.quote(terms.gsub(/['?\\:]/, ' ')))
textsearch = 'to_tsvector(\'simple\', tags.name)'
query = 'to_tsquery(\'simple\', \'\'\' \' || ? || \' \'\'\' || \':*\')'
query = 'to_tsquery(\'simple\', \'\'\' \' || ' + terms + ' || \' \'\'\' || \':*\')'
sql = <<SQL
SELECT
@ -26,7 +27,7 @@ class Tag < ApplicationRecord
LIMIT ?
SQL
Tag.find_by_sql([sql, terms, terms, limit])
Tag.find_by_sql([sql, limit])
end
end
end