Fixed empty array in where clause - closes #113

Andrew Kane
1 parent 14fee2c9
Showing 2 changed files with 15 additions and 1 deletions Show diff stats
lib/searchkick/search.rb
test/sql_test.rb
@@ -185,7 +185,11 @@ module Searchkick
       term_filters =
         proc do |field, value|
           if value.is_a?(Array) # in query
-            {or: value.map{|v| term_filters.call(field, v) }}
+            if value.any?
+              {or: value.map{|v| term_filters.call(field, v) }}
+            else
+              {terms: {field => value}} # match nothing
+            end
           elsif value.nil?
             {missing: {"field" => field, existence: true, null_value: true}}
           else
@@ -95,6 +95,16 @@ class TestSql &lt; Minitest::Unit::TestCase
     assert_search "product", ["Product A"], where: {id: product.id.to_s}
   end
+  def test_where_empty
+    store_names ["Product A"]
+    assert_search "product", ["Product A"], where: {}
+  end
+
+  def test_where_empty_array
+    store_names ["Product A"]
+    assert_search "product", [], where: {store_id: []}
+  end
+
   def test_near
     store [
       {name: "San Francisco", latitude: 37.7833, longitude: -122.4167},
	@@ -95,6 +95,16 @@ class TestSql < Minitest::Unit::TestCase		@@ -95,6 +95,16 @@ class TestSql < Minitest::Unit::TestCase
95	assert_search "product", ["Product A"], where: {id: product.id.to_s}	95	assert_search "product", ["Product A"], where: {id: product.id.to_s}
96	end	96	end
97		97
		98	+ def test_where_empty
		99	+ store_names ["Product A"]
		100	+ assert_search "product", ["Product A"], where: {}
		101	+ end
		102	+
		103	+ def test_where_empty_array
		104	+ store_names ["Product A"]
		105	+ assert_search "product", [], where: {store_id: []}
		106	+ end
		107	+
98	def test_near	108	def test_near
99	store [	109	store [
100	{name: "San Francisco", latitude: 37.7833, longitude: -122.4167},	110	{name: "San Francisco", latitude: 37.7833, longitude: -122.4167},