- It's not possible to pass a key-value-array to where- and having-conditions

Author: rkrx

src/Builder/Internal/ConditionBuilder.php

@@ -16,13 +16,31 @@ public static function build(Database $db, $query, array $conditions, $token) {
 			return $query;
 		}
 		$query .= "{$token}\n";
-		$arr = array();
+		$arr = [];
 		foreach($conditions as $condition) {
 			list($expression, $arguments) = $condition;
-			$expr = $db->quoteExpression($expression, $arguments);
-			$arr[] = "\t({$expr})";
+			if(is_array($expression)) {
+				foreach($expression as $key => $value) {
+					$arr = self::buildCondition($arr, "`{$key}`=?", [$value], $db);
+				}
+			} else {
+				$arr = self::buildCondition($arr, $expression, $arguments, $db);
+			}
 		}
 		$query .= join("\n\tAND\n", $arr);
-		return $query."\n";
+		return "{$query}\n";
+	}
+
+	/**
+	 * @param array $conditions
+	 * @param mixed $expression
+	 * @param mixed $arguments
+	 * @param Database $db
+	 * @return array
+	 */
+	private static function buildCondition(array $conditions, $expression, $arguments, Database $db) {
+		$expr = $db->quoteExpression($expression, $arguments);
+		$conditions[] = "\t({$expr})";
+		return $conditions;
 	}
 }

tests/Builder/DeleteTest.php

@@ -38,6 +38,14 @@ public function testWhere() {
 		$this->assertEquals("DELETE FROM\n\ttravis_test.test1\nWHERE\n\t(field1='1')\n\tAND\n\t(field2 != field1)\n", $sql);
 	}
 
+	public function testWhereViaArray() {
+		$sql = TestDelete::create()
+		->from('travis#test1')
+		->where(['field1' => 1, 'field2' => 'aaa'])
+		->asString();
+		$this->assertEquals("DELETE FROM\n\ttravis_test.test1\nWHERE\n\t(`field1`='1')\n\tAND\n\t(`field2`='aaa')\n", $sql);
+	}
+
 	public function testDBExpr() {
 		$sql = TestDelete::create()
 		->from('travis#test1')

tests/Builder/SelectTest.php

@@ -63,6 +63,13 @@ public function testWhere() {
 		->where('a < ?', 1000)
 		->asString();
 		$this->assertEquals("SELECT\n\ta\nFROM\n\ttest t\nWHERE\n\t(a < '1000')\n", $str);
+
+		$str = TestSelect::create()
+		->field('a')
+		->from('t', 'test')
+		->where(['field1' => 1, 'field2' => 'aaa'])
+		->asString();
+		$this->assertEquals("SELECT\n\ta\nFROM\n\ttest t\nWHERE\n\t(`field1`='1')\n\tAND\n\t(`field2`='aaa')\n", $str);
 	}
 
 	public function testHaving() {
@@ -72,6 +79,13 @@ public function testHaving() {
 		->having('a+1<2')
 		->asString();
 		$this->assertEquals("SELECT\n\ta\nFROM\n\ttest t\nHAVING\n\t(a+1<2)\n", $str);
+
+		$str = TestSelect::create()
+		->field('a')
+		->from('t', 'test')
+		->having(['field1' => 1, 'field2' => 'aaa'])
+		->asString();
+		$this->assertEquals("SELECT\n\ta\nFROM\n\ttest t\nHAVING\n\t(`field1`='1')\n\tAND\n\t(`field2`='aaa')\n", $str);
 	}
 
 	public function testDBExpr() {

tests/Builder/UpdateTest.php

@@ -92,6 +92,13 @@ public function testWhere() {
 		->where('field1=?', 2)
 		->asString();
 		$this->assertEquals("UPDATE\n\ttest1\nSET\n\t`field1`='1'\nWHERE\n\t(field1='2')\n", $sql);
+
+		$sql = TestUpdate::create()
+		->table('test1')
+		->set('field1', 1)
+		->where(['field1' => 1, 'field2' => 'aaa'])
+		->asString();
+		$this->assertEquals("UPDATE\n\ttest1\nSET\n\t`field1`='1'\nWHERE\n\t(`field1`='1')\n\tAND\n\t(`field2`='aaa')\n", $sql);
 	}
 
 	public function testOrder() {