Reset minimum_should_match in Bool.__and__

Fixes #890

Author: honzakral

elasticsearch_dsl/query.py

@@ -148,6 +148,11 @@ def __and__(self, other):
             q.must_not += other.must_not
             q.filter += other.filter
             q.should = []
+
+            # reset minimum_should_match as it will get calculated below
+            if 'minimum_should_match' in q._params:
+                del q._params['minimum_should_match']
+
             for qx in (self, other):
                 # TODO: percentages will fail here
                 min_should_match = qx._min_should_match

test_elasticsearch_dsl/test_query.py

@@ -163,6 +163,13 @@ def test_bool_and_bool():
     q2 = query.Bool(should=[qt3])
     assert q1 & q2 == query.Bool(must=[qt1, qt3], should=[qt1, qt2], minimum_should_match=0)
 
+def test_bool_and_bool_with_min_should_match():
+    qt1, qt2 = query.Match(f=1), query.Match(f=2)
+    q1 = query.Q('bool', minimum_should_match=1, should=[qt1])
+    q2 = query.Q('bool', minimum_should_match=1, should=[qt2])
+
+    assert query.Q('bool', must=[qt1, qt2]) == q1 & q2
+
 def test_inverted_query_becomes_bool_with_must_not():
     q = query.Match(f=42)