Ensure escaped like works correctly

Andrew Kane
1 parent 0a9bfdd2
Showing 3 changed files with 8 additions and 1 deletions Show diff stats
CHANGELOG.md
lib/searchkick/query.rb
test/where_test.rb
 ## 4.0.3 [unreleased]
  
+- Added `like` operator
+- Added `exists` operator
 - Added warnings for certain regular expressions
 - Fixed anchored regular expressions
  
@@ -936,7 +936,7 @@ module Searchkick
                   }
                 }
               when :like
-                regex = Regexp.escape(op_value).gsub("%", ".*").gsub("_", ".")
+                regex = Regexp.escape(op_value).gsub(/(?<!\\)%/, ".*").gsub(/(?<!\\)_/, ".").gsub("\\%", "%").gsub("\\_", "_")
                 filters << {regexp: {field => {value: regex}}}
               when :prefix
                 filters << {prefix: {field => op_value}}
@@ -138,6 +138,11 @@ class WhereTest &lt; Minitest::Test
     assert_search "product", ["Product ABC"], where: {name: {like: "Product_ABC"}}
   end
  
+  def test_like_escape
+    store_names ["Product 100%", "Product B"]
+    assert_search "product", ["Product 100%"], where: {name: {like: "% 100\\%"}}
+  end
+
   # def test_script
   #   store [
   #     {name: "Product A", store_id: 1},
1	1	## 4.0.3 [unreleased]
2	2
	3	+- Added `like` operator
	4	+- Added `exists` operator
3	5	- Added warnings for certain regular expressions
4	6	- Fixed anchored regular expressions
5	7
...	...
...	...	@@ -936,7 +936,7 @@ module Searchkick
936	936	}
937	937	}
938	938	when :like
939		- regex = Regexp.escape(op_value).gsub("%", ".*").gsub("_", ".")
	939	+ regex = Regexp.escape(op_value).gsub(/(?<!\\)%/, ".*").gsub(/(?<!\\)_/, ".").gsub("\\%", "%").gsub("\\_", "_")
940	940	filters << {regexp: {field => {value: regex}}}
941	941	when :prefix
942	942	filters << {prefix: {field => op_value}}
...	...
...	...	@@ -138,6 +138,11 @@ class WhereTest < Minitest::Test
138	138	assert_search "product", ["Product ABC"], where: {name: {like: "Product_ABC"}}
139	139	end
140	140
	141	+ def test_like_escape
	142	+ store_names ["Product 100%", "Product B"]
	143	+ assert_search "product", ["Product 100%"], where: {name: {like: "% 100\\%"}}
	144	+ end
	145	+
141	146	# def test_script
142	147	# store [
143	148	# {name: "Product A", store_id: 1},
...	...