Fieldnames (keys) of Key-Value-style where and having now can contain dots and will handles correctly in most cases. In case the key already contains a backtick or a paranthesis the key will not be untouched.

Author: rkrx

src/Builder/Internal/ConditionBuilder.php

@@ -1,6 +1,7 @@
 <?php
 namespace Kir\MySQL\Builder\Internal;
 
+use Kir\MySQL\Builder\Expr\OptionalExpression;
 use Kir\MySQL\Database;
 use Kir\MySQL\Builder;
 
@@ -21,10 +22,11 @@ public static function build(Database $db, string $query, array $conditions, str
 		foreach($conditions as [$expression, $arguments]) {
 			if(is_array($expression)) {
 				foreach($expression as $key => $value) {
+					$key = self::formatKey($key);
 					if($value === null) {
-						$arr = self::buildCondition($arr, "ISNULL(`{$key}`)", [$value], $db);
+						$arr = self::buildCondition($arr, "ISNULL({$key})", [$value], $db);
 					} else {
-						$arr = self::buildCondition($arr, "`{$key}`=?", [$value], $db);
+						$arr = self::buildCondition($arr, "{$key}=?", [$value], $db);
 					}
 				}
 			} else {
@@ -47,4 +49,20 @@ private static function buildCondition(array $conditions, string $expression, ar
 		$conditions[] = "\t({$expr})";
 		return $conditions;
 	}
+
+	/**
+	 * @param string $key
+	 * @return string
+	 */
+	private static function formatKey(string $key): string {
+		if(strpos($key, '`') !== false || strpos($key, '(') !== false) {
+			return $key;
+		}
+		$keyParts = explode('.', $key);
+		$fn = static function (string $part) {
+			return "`{$part}`";
+		};
+		$enclosedKeyParts = array_map($fn, $keyParts);
+		return implode('.', $enclosedKeyParts);
+	}
 }

tests/Builder/SelectTest.php

@@ -117,9 +117,9 @@ public function testWhereAsObject(): void {
 		$str = $this->select()
 		->field('a')
 		->from('t', 'test')
-		->where((object) ['field1' => 1, 'field2' => 'aaa', 'field3' => null])
+		->where((object) ['field1' => 1, 't.field2' => 'aaa', '`t`.`field3`' => null])
 		->asString();
-		self::assertEquals("SELECT\n\ta\nFROM\n\ttest t\nWHERE\n\t(`field1`=1)\n\tAND\n\t(`field2`='aaa')\n\tAND\n\t(ISNULL(`field3`))\n", $str);
+		self::assertEquals("SELECT\n\ta\nFROM\n\ttest t\nWHERE\n\t(`field1`=1)\n\tAND\n\t(`t`.`field2`='aaa')\n\tAND\n\t(ISNULL(`t`.`field3`))\n", $str);
 	}
 
 	public function testWhereAsEmptyObject(): void {
@@ -135,9 +135,9 @@ public function testWhereAsArray(): void {
 		$str = $this->select()
 		->field('a')
 		->from('t', 'test')
-		->where(['field1' => 1, 'field2' => 'aaa', 'field3' => null])
+		->where(['field1' => 1, 't.field2' => 'aaa', '`t`.`field3`' => null])
 		->asString();
-		self::assertEquals("SELECT\n\ta\nFROM\n\ttest t\nWHERE\n\t(`field1`=1)\n\tAND\n\t(`field2`='aaa')\n\tAND\n\t(ISNULL(`field3`))\n", $str);
+		self::assertEquals("SELECT\n\ta\nFROM\n\ttest t\nWHERE\n\t(`field1`=1)\n\tAND\n\t(`t`.`field2`='aaa')\n\tAND\n\t(ISNULL(`t`.`field3`))\n", $str);
 	}
 
 	public function testWhereAsEmptyArray(): void {