- DBExprFilter is now able to deal with array-values

Author: rkrx

src/Builder/Expr/DBExprFilter.php

@@ -30,6 +30,9 @@ public function __construct($expression, array $data, $keyPath, $validator = nul
 		$this->value = $this->recursiveGet($data, $this->keyPath, null);
 		if($validator === null) {
 			$validator = function ($data) {
+				if(is_array($data)) {
+					return $this->isValidArray($data);
+				}
 				return (string) $data !== '';
 			};
 		}
@@ -81,6 +84,20 @@ private function buildKey($keyPath) {
 		return $keyPath;
 	}
 
+	/**
+	 * @param array $array
+	 * @return bool
+	 */
+	private function isValidArray(array $array) {
+		$data = array_filter($array, function ($value) {
+			if(is_array($value)) {
+				return $this->isValidArray($value);
+			}
+			return (string) $value !== '';
+		});
+		return count($data) > 0;
+	}
+
 	/**
 	 * @param array $array
 	 * @param array $path

tests/Builder/SelectTest.php

@@ -244,7 +244,7 @@ public function testDistinct() {
 	}
 
 	public function testOptionalExpressions() {
-		$filter = ['filter' => ['name' => 'aaa']];
+		$filter = ['filter' => ['name' => 'aaa', 'ids' => [1, 2, 3], 'empty' => [null, '', ['']]]];
 		$opt = new OptionalDBFilterMap($filter);
 
 		$query = TestSelect::create()
@@ -273,6 +273,24 @@ public function testOptionalExpressions() {
 		->asString();
 
 		$this->assertEquals("SELECT DISTINCT\n\tt.field\nFROM\n\ttest t\n", $query);
+
+		$query = TestSelect::create()
+		->distinct()
+		->field('t.field')
+		->from('t', 'test')
+		->where($opt('t.field IN (?)', ['filter', 'ids']))
+		->asString();
+
+		$this->assertEquals("SELECT DISTINCT\n\tt.field\nFROM\n\ttest t\nWHERE\n\t(t.field IN ('1', '2', '3'))\n", $query);
+
+		$query = TestSelect::create()
+		->distinct()
+		->field('t.field')
+		->from('t', 'test')
+		->where($opt('t.field=?', ['filter', 'empty']))
+		->asString();
+
+		$this->assertEquals("SELECT DISTINCT\n\tt.field\nFROM\n\ttest t\n", $query);
 	}
 
 	public function testRequired() {