WhereClause can be referenced with %l or %?

MeekroDBParsedQuery (output of parse()) can also be referenced with %l or %?

Author: SergeyTsalkov

.gitignore

@@ -1,3 +1,5 @@
 /test.php
 simpletest/test_setup.php
-.phpdoc
+.phpdoc
+/vendor/
+/composer.lock

db.class.php

@@ -899,14 +899,21 @@ function parse($query) {
       }
 
       if ($val instanceof WhereClause) {
-        if ($Part['type'] != 'l') {
-          throw new MeekroDBException("WhereClause must be used with l arg, you used {$Part['type']} instead!");
+        if ($Part['type'] != 'l' && $Part['type'] != '?') {
+          throw new MeekroDBException("WhereClause must be used with l or ?, you used {$Part['type']} instead!");
         }
 
         list($clause_sql, $clause_args) = $val->textAndArgs();
         $ParsedSubQuery = $this->parse($clause_sql, ...$clause_args);
         $ParsedQuery->add($ParsedSubQuery);
       }
+      else if ($val instanceof MeekroDBParsedQuery) {
+        if ($Part['type'] != 'l' && $Part['type'] != '?') {
+          throw new MeekroDBException("a ParsedQuery must be used with l or ?, you used {$Part['type']} instead!");
+        }
+
+        $ParsedQuery->add($val);
+      }
       else {
         $ParsedSubQuery = $fn($val);
         if (! ($ParsedSubQuery instanceof MeekroDBParsedQuery)) {
@@ -1273,7 +1280,11 @@ function add() {
 
     if ($sql instanceof WhereClause) {
       $this->clauses[] = $sql;
-    } else {
+    }
+    else if ($sql instanceof MeekroDBParsedQuery) {
+      $this->clauses[] = array('sql' => '%?', 'args' => [$sql]);
+    }
+    else {
       $this->clauses[] = array('sql' => $sql, 'args' => $args);
     }
   }

simpletest/WhereClauseTest.php

@@ -5,7 +5,7 @@ function test_1_basic_where() {
     $where->add('username=%s', 'Bart');
     $where->add('password=%s', 'hello');
 
-    $result = DB::query("SELECT * FROM accounts WHERE %l", $where);
+    $result = DB::query("SELECT * FROM accounts WHERE %?", $where);
     $this->assert(count($result) === 1);
     $this->assert($result[0]['age'] === '15');
   }
@@ -68,14 +68,27 @@ function test_6_negate_two() {
     $this->assert(count($result) === 7);
   }
 
+  // * WhereClause works with OR
+  // * you can add() a parse() output to a WhereClause
   function test_7_or() {
     $where = new WhereClause('or');
     $where->add('username=%s', 'Bart');
-    $where->add('username=%s', 'Abe');
-
+    $where->add(DB::parse('username=%s', 'Abe'));
     $result = DB::query("SELECT * FROM accounts WHERE %l", $where);
     $this->assert(count($result) === 2);
   }
+
+  // * parse() output can be used as part of a query with %l or %?
+  function test_8_multipart() {
+    $part = DB::parse('WHERE username=%s', 'Bart');
+    $rows = DB::query("SELECT * FROM accounts %l", $part);
+    $this->assert(count($rows) === 1);
+    $this->assert($rows[0]['id'] === '2');
+
+    $rows = DB::query("SELECT * FROM accounts %?", $part);
+    $this->assert(count($rows) === 1);
+    $this->assert($rows[0]['id'] === '2');
+  }
 
 
 }