- NULL-Values used in conjunction with Select::where and Select::having when conditions are used as a key-value-array are now projected with ISNULL instead of field=NULL

Author: rkrx

src/Builder/Internal/ConditionBuilder.php

@@ -21,7 +21,11 @@ public static function build(Database $db, $query, array $conditions, $token) {
 			list($expression, $arguments) = $condition;
 			if(is_array($expression)) {
 				foreach($expression as $key => $value) {
-					$arr = self::buildCondition($arr, "`{$key}`=?", [$value], $db);
+					if($value === null) {
+						$arr = self::buildCondition($arr, "ISNULL(`{$key}`)", [$value], $db);
+					} else {
+						$arr = self::buildCondition($arr, "`{$key}`=?", [$value], $db);
+					}
 				}
 			} else {
 				$arr = self::buildCondition($arr, $expression, $arguments, $db);

tests/Builder/SelectTest.php

@@ -85,9 +85,9 @@ public function testWhereAsArray() {
 		$str = TestSelect::create()
 		->field('a')
 		->from('t', 'test')
-		->where(['field1' => 1, 'field2' => 'aaa'])
+		->where(['field1' => 1, 'field2' => 'aaa', 'field3' => null])
 		->asString();
-		$this->assertEquals("SELECT\n\ta\nFROM\n\ttest t\nWHERE\n\t(`field1`='1')\n\tAND\n\t(`field2`='aaa')\n", $str);
+		$this->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);
 	}
 
 	public function testHaving() {
@@ -101,9 +101,9 @@ public function testHaving() {
 		$str = TestSelect::create()
 		->field('a')
 		->from('t', 'test')
-		->having(['field1' => 1, 'field2' => 'aaa'])
+		->having(['field1' => 1, 'field2' => 'aaa', 'field3' => null])
 		->asString();
-		$this->assertEquals("SELECT\n\ta\nFROM\n\ttest t\nHAVING\n\t(`field1`='1')\n\tAND\n\t(`field2`='aaa')\n", $str);
+		$this->assertEquals("SELECT\n\ta\nFROM\n\ttest t\nHAVING\n\t(`field1`='1')\n\tAND\n\t(`field2`='aaa')\n\tAND\n\t(ISNULL(`field3`))\n", $str);
 	}
 
 	public function testDBExpr() {