WhereFilter::append

Author: mmjvox

include/WhereFilter.h

@@ -32,6 +32,8 @@ class WhereFilter{
     bool empty() const;
 
     std::string toString() const;
+
+    void append(std::vector<DbVariant> variants);
 };
 
 }

src/PostgreLazy.cpp

@@ -148,16 +148,19 @@ std::string PostgreLazy::bulk_insert_query() const
 
 std::string PostgreLazy::insert_update_query() const
 {
+    // TODO:
   return {};
 }
 
 std::string PostgreLazy::insert_ignore_query() const
 {
+    // TODO:
   return {};
 }
 
 std::string PostgreLazy::bulk_update_query() const
 {
+    // TODO:
   return {};
 }
 

src/SqliteLazy.cpp

@@ -142,16 +142,19 @@ std::string SqliteLazy::bulk_insert_query() const
 
 std::string SqliteLazy::insert_update_query() const
 {
+    // TODO:
   return {};
 }
 
 std::string SqliteLazy::insert_ignore_query() const
 {
+    // TODO:
   return {};
 }
 
 std::string SqliteLazy::bulk_update_query() const
 {
+    // TODO:
   return {};
 }
 

src/WhereFilter.cpp

@@ -121,6 +121,11 @@ std::string WhereFilter::toString() const
     return retStr.append(" ");
 }
 
+void WhereFilter::append(std::vector<DbVariant> variants)
+{
+    mNestedDbVariant.push_back(variants);
+}
+
 std::string WhereFilter::toString(WhereFilter wf) const
 {
     std::string retStr;

tests/where.cpp

@@ -168,11 +168,25 @@ LazyOrm::WhereFilter whereFilter = {"a wwwww ccc"};
 return whereFilter.toString();
 }
 
+std::string where5() {
+    std::vector<LazyOrm::DbVariant> a1 = {"name","like","asqar"};
+    std::vector<LazyOrm::DbVariant> a2 = {"name","like","khar"};
+
+    LazyOrm::WhereFilter likes;
+    likes.append(a1);
+    likes.append({"OR"});
+    likes.append(a2);
+    likes.append({"OR"});
+    likes.append({"name","like","akbar"});
+
+    return likes.toString();
+}
 
 TEST_CASE( "Factorials are computed", "[Lazy_WHERE]" ) {
 
-    std::cout << where2() << std::endl;
+    std::cout << where5() << std::endl;
 
-    REQUIRE( Catch::trim(where1()) == R"(WHERE (((`AGE` in '[4,5,6,7,8]') OR (`AGE` in '[1,2,3,4,5]')) AND ((`AGE` in '[40,50,60,70,80]') OR (`AGE` in '[10,20,30,40,50]'))) AND ((`name` like 'asqar') OR (`name` like 'mamad')) NOT ((`name` like 'asqar') OR (`name` like 'mamad')) AND NOT ((`name` like 'asqar') OR (`name` like 'mamad')) OR NOT ((`name` like 'asqar') OR (`name` like 'mamad')))" );
-    REQUIRE( Catch::trim(where2()) == R"(WHERE (((`name` like 'asqar') OR (`name` like 'mamad')) AND ((`name` like 'asqar') OR (`name` like 'mamad')) AND SSS (((`AGE` in '[4,5,6,7,8]') OR (`AGE` in '[1,2,3,4,5]')) AND ((`AGE` in '[40,50,60,70,80]') OR (`AGE` in '[10,20,30,40,50]')))))" );
+    //REQUIRE( Catch::trim(where1()) == R"(WHERE (((`AGE` in '[4,5,6,7,8]') OR (`AGE` in '[1,2,3,4,5]')) AND ((`AGE` in '[40,50,60,70,80]') OR (`AGE` in '[10,20,30,40,50]'))) AND ((`name` like 'asqar') OR (`name` like 'mamad')) NOT ((`name` like 'asqar') OR (`name` like 'mamad')) AND NOT ((`name` like 'asqar') OR (`name` like 'mamad')) OR NOT ((`name` like 'asqar') OR (`name` like 'mamad')))" );
+    //REQUIRE( Catch::trim(where2()) == R"(WHERE (((`name` like 'asqar') OR (`name` like 'mamad')) AND ((`name` like 'asqar') OR (`name` like 'mamad')) AND SSS (((`AGE` in '[4,5,6,7,8]') OR (`AGE` in '[1,2,3,4,5]')) AND ((`AGE` in '[40,50,60,70,80]') OR (`AGE` in '[10,20,30,40,50]')))))" );
+    //REQUIRE( Catch::trim(where5()) == R"(WHERE ((`name` like 'asqar') OR (`name` like 'khar') OR (`name` like 'akbar')))" );
 }