SqlPreprocessor: fixed IN (?) with empty array

dg · dg · commit d5aa567f2b52 · 2015-02-20T00:23:26.000+01:00
diff --git a/src/Database/SqlPreprocessor.php b/src/Database/SqlPreprocessor.php
@@ -205,7 +205,7 @@ private function formatValue($value, $mode = NULL)
 						$vx[] = $this->delimite($k) . '=' . $this->formatValue($v);
 					}
 				}
-				return implode(', ', $vx);
+				return $vx ? implode(', ', $vx) : '1=1';
 
 			} elseif ($mode === 'and' || $mode === 'or') { // (key [operator] value) AND ...
 				foreach ($value as $k => $v) {
diff --git a/tests/Database/SqlPreprocessor.phpt b/tests/Database/SqlPreprocessor.phpt
@@ -46,6 +46,10 @@ test(function() use ($preprocessor) {
 
 
 test(function() use ($preprocessor) { // IN
+	list($sql, $params) = $preprocessor->process(array('SELECT id FROM author WHERE id IN (?)', array()));
+	Assert::same( 'SELECT id FROM author WHERE id IN (1=1)', $sql );
+	Assert::same( array(), $params );
+
 	list($sql, $params) = $preprocessor->process(array('SELECT id FROM author WHERE id IN (?)', array(10, 11)));
 	Assert::same( 'SELECT id FROM author WHERE id IN (10, 11)', $sql );
 	Assert::same( array(), $params );

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ private function formatValue($value, $mode = NULL)`
`205`	`205`	`$vx[] = $this->delimite($k) . '=' . $this->formatValue($v);`
`206`	`206`	`}`
`207`	`207`	`}`
`208`		`- return implode(', ', $vx);`
	`208`	`+ return $vx ? implode(', ', $vx) : '1=1';`
`209`	`209`
`210`	`210`	`} elseif ($mode === 'and' \|\| $mode === 'or') { // (key [operator] value) AND ...`
`211`	`211`	`foreach ($value as $k => $v) {`