Upstream sync

This commit is contained in:
Senad Uka
2020-02-05 13:40:37 +01:00
parent 2749c53aac
commit 530951ff45
22 changed files with 1016 additions and 885 deletions

View File

@@ -3,7 +3,7 @@
require 'active_support'
require 'squeel'
require_relative './text_to_tsquery'
require_relative './text_to_regex_query'
require_relative './text_to_sql_query'
module PgSearchable
extend ActiveSupport::Concern
@@ -48,7 +48,8 @@ module PgSearchable
def ts_search(value)
return if @ts_search_fields.blank? || value.blank?
TextToRegexQuery.new(value, @ts_search_fields, @default_field, @ts_search_fields_mappings).where_clause( includes(@ts_joins).references(:all))
includes(@ts_joins).references(:all).where(
TextToSqlQuery.new(value, @ts_search_fields, @default_field, @ts_search_fields_mappings).where_clause)
end
def should_update_cache_field?