github / searchkick

Download as
Browse Code ยป

Commit 4efa577e4fa349e2b3ff68bfee42932a7fd6faf5

Authored by Andrew Kane
1 parent 4f1c9882
Exists in master and in 17 other branches allow_missing, conversions_period, conversions_v2, eager_load, find_in_batches, index_name, lazy_index_name, less_deps, nested, reindex_refactor, relation, relation_search, scope_attributes, search_as_you_type, synonyms_ci, test_language, wildcard

Fixed anchored regular expressions and added warnings for certain regular expressions

Showing 3 changed files with 36 additions and 3 deletions   Show diff stats
  1 +## 4.0.3 [unreleased]
  2 +
  3 +- Added warnings for certain regular expressions
  4 +- Fixed anchored regular expressions
  5 +
1 ## 4.0.2 6 ## 4.0.2
2 7
3 - Added block form of `scroll` 8 - Added block form of `scroll`
lib/searchkick/query.rb
  Diff comments   View file @4efa577
@@ -985,7 +985,20 @@ module Searchkick @@ -985,7 +985,20 @@ module Searchkick
985 elsif value.nil? 985 elsif value.nil?
986 {bool: {must_not: {exists: {field: field}}}} 986 {bool: {must_not: {exists: {field: field}}}}
987 elsif value.is_a?(Regexp) 987 elsif value.is_a?(Regexp)
988 - {regexp: {field => {value: value.source, flags: "NONE"}}} 988 + if value.casefold?
  989 + warn "[searchkick] Case-insensitive flag does not work with Elasticsearch"
  990 + end
  991 +
  992 + source = value.source
  993 + unless source.start_with?("\\A") && source.end_with?("\\z")
  994 + # https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-regexp-query.html
  995 + warn "[searchkick] Regular expressions are always anchored in Elasticsearch"
  996 + end
  997 +
  998 + # remove \A and \z
  999 + source = source.sub(/\\A/, "").sub(/\\z\z/, "")
  1000 +
  1001 + {regexp: {field => {value: source, flags: "NONE"}}}
989 else 1002 else
990 {term: {field => value}} 1003 {term: {field => value}}
991 end 1004 end
test/where_test.rb
  Diff comments   View file @4efa577
@@ -78,7 +78,7 @@ class WhereTest < Minitest::Test @@ -78,7 +78,7 @@ class WhereTest < Minitest::Test
78 78
79 def test_regexp 79 def test_regexp
80 store_names ["Product A"] 80 store_names ["Product A"]
81 - assert_search "*", ["Product A"], where: {name: /Pro.+/} 81 + assert_search "*", ["Product A"], where: {name: /\APro.+\z/}
82 end 82 end
83 83
84 def test_alternate_regexp 84 def test_alternate_regexp
@@ -88,7 +88,22 @@ class WhereTest < Minitest::Test @@ -88,7 +88,22 @@ class WhereTest < Minitest::Test
88 88
89 def test_special_regexp 89 def test_special_regexp
90 store_names ["Product <A>", "Item <B>"] 90 store_names ["Product <A>", "Item <B>"]
91 - assert_search "*", ["Product <A>"], where: {name: /Pro.+<.+/} 91 + assert_search "*", ["Product <A>"], where: {name: /\APro.+<.+\z/}
  92 + end
  93 +
  94 + # regular expressions are always anchored in ES
  95 + def test_regexp_not_anchored
  96 + store_names ["abcde"]
  97 + assert_search "*", [], where: {name: /abcd/}
  98 + assert_search "*", ["abcde"], where: {name: /abcde/}
  99 + assert_search "*", ["abcde"], where: {name: /\Aabcde\z/}
  100 + end
  101 +
  102 + def test_regexp_case
  103 + store_names ["abcde"]
  104 + assert_search "*", [], where: {name: /\AABCDE\z/}
  105 + # flags don't work
  106 + assert_search "*", [], where: {name: /\AABCDE\z/i}
92 end 107 end
93 108
94 def test_prefix 109 def test_prefix