Merge branch 'picocandy-misspellings_false_with_fields_operator'

Andrew Kane
2 parents 91244626 56341623
Showing 2 changed files with 27 additions and 5 deletions Show diff stats
lib/searchkick/query.rb
test/sql_test.rb
@@ -96,11 +96,6 @@ module Searchkick
               }
               if field == "_all" || field.end_with?(".analyzed")
-                shared_options[:cutoff_frequency] = 0.001 unless operator == "and"
-                qs.concat [
-                  shared_options.merge(boost: 10 * factor, analyzer: "searchkick_search"),
-                  shared_options.merge(boost: 10 * factor, analyzer: "searchkick_search2")
-                ]
                 misspellings = options.key?(:misspellings) ? options[:misspellings] : options[:mispellings] # why not?
                 if misspellings != false
                   edit_distance = (misspellings.is_a?(Hash) && (misspellings[:edit_distance] || misspellings[:distance])) || 1
@@ -110,6 +105,11 @@ module Searchkick
                     shared_options.merge(fuzziness: edit_distance, max_expansions: 3, analyzer: "searchkick_search2").merge(transpositions)
                   ]
                 end
+                shared_options[:cutoff_frequency] = 0.001 unless operator == "and" || misspellings == false
+                qs.concat [
+                  shared_options.merge(boost: 10 * factor, analyzer: "searchkick_search"),
+                  shared_options.merge(boost: 10 * factor, analyzer: "searchkick_search2")
+                ]
               elsif field.end_with?(".exact")
                 f = field.split(".")[0..-2].join(".")
                 queries << {match: {f => shared_options.merge(analyzer: "keyword")}}
@@ -244,6 +244,28 @@ class TestSql &lt; Minitest::Test
     assert_search "aaaa", ["aabb"], misspellings: {distance: 2}
   end
+  def test_misspellings_fields_operator
+    store [
+      {name: "red", color: "red"},
+      {name: "blue", color: "blue"},
+      {name: "cyan", color: "blue green"},
+      {name: "magenta", color: "red blue"},
+      {name: "green", color: "green"}
+    ]
+    assert_search "red blue", ["red", "blue", "cyan", "magenta"], operator: "or", fields: ["color"], misspellings: false
+  end
+
+  def test_fields_operator
+    store [
+      {name: "red", color: "red"},
+      {name: "blue", color: "blue"},
+      {name: "cyan", color: "blue green"},
+      {name: "magenta", color: "red blue"},
+      {name: "green", color: "green"}
+    ]
+    assert_search "red blue", ["red", "blue", "cyan", "magenta"], operator: "or", fields: ["color"]
+  end
+
   def test_fields
     store [
       {name: "red", color: "light blue"},
	@@ -244,6 +244,28 @@ class TestSql < Minitest::Test		@@ -244,6 +244,28 @@ class TestSql < Minitest::Test
244	assert_search "aaaa", ["aabb"], misspellings: {distance: 2}	244	assert_search "aaaa", ["aabb"], misspellings: {distance: 2}
245	end	245	end
246		246
		247	+ def test_misspellings_fields_operator
		248	+ store [
		249	+ {name: "red", color: "red"},
		250	+ {name: "blue", color: "blue"},
		251	+ {name: "cyan", color: "blue green"},
		252	+ {name: "magenta", color: "red blue"},
		253	+ {name: "green", color: "green"}
		254	+ ]
		255	+ assert_search "red blue", ["red", "blue", "cyan", "magenta"], operator: "or", fields: ["color"], misspellings: false
		256	+ end
		257	+
		258	+ def test_fields_operator
		259	+ store [
		260	+ {name: "red", color: "red"},
		261	+ {name: "blue", color: "blue"},
		262	+ {name: "cyan", color: "blue green"},
		263	+ {name: "magenta", color: "red blue"},
		264	+ {name: "green", color: "green"}
		265	+ ]
		266	+ assert_search "red blue", ["red", "blue", "cyan", "magenta"], operator: "or", fields: ["color"]
		267	+ end
		268	+
247	def test_fields	269	def test_fields
248	store [	270	store [
249	{name: "red", color: "light blue"},	271	{name: "red", color: "light blue"},