Make assignment of contains Or stick in query builder

* make assignment of contains Or stick in query builder
* test for contains or flag fix
* take out unused variable
* extra tests on contains Or flag

Author: TabOg

include/helib/partialMatch.h

@@ -444,7 +444,7 @@ class QueryBuilder
     for (long i = 0; i < long(expr.size()); ++i) { // Each tau
       mus[i] = 0;                                  // Set mu to zero.
       Matrix<long> M(columns, 1);                  // Create temp tau matrix
-      containsOR = (expr[i].size() > 1) ? true : false;
+      containsOR = (expr[i].size() > 1) ? true : containsOR;
       for (long j = 0; j < long(expr[i].size()); ++j) // Each column index
         M(expr[i][j], 0) = 1;                         // Mark those columns as 1
       taus.push_back(std::move(M));

tests/TestPartialMatch.cpp

@@ -705,6 +705,25 @@ TEST(TestPartialMatch, databaseLookupQueryAPIGeneratesPostFix)
   EXPECT_EQ("0 1 2 3 && || &&", res->eval());
 }
 
+TEST(TestPartialMatch, containsOrFlagInBuild)
+{
+  const helib::QueryExpr& name = helib::makeQueryExpr(0);
+  const helib::QueryExpr& age = helib::makeQueryExpr(1);
+  const helib::QueryExpr& height = helib::makeQueryExpr(2);
+  long columns = 4;
+  helib::QueryBuilder res1((name || age) && height);
+  helib::Query_t query = res1.build(columns);
+  EXPECT_EQ(query.containsOR, true);
+
+  helib::QueryBuilder res2(height && (name || age));
+  query = res2.build(columns);
+  EXPECT_EQ(query.containsOR, true);
+
+  helib::QueryBuilder res3(height && name && age);
+  query = res3.build(columns);
+  EXPECT_EQ(query.containsOR, false);
+}
+
 TEST(TestPartialMatch, databaseLookupQueryAPIGeneratesMusAndTaus)
 {
   const helib::QueryExpr& name = helib::makeQueryExpr(0);