- Update::setExpr not takes value-parameters

Author: rkrx

src/Builder/InsertUpdateStatement.php

@@ -4,9 +4,7 @@
 use Kir\MySQL\Builder\Internal\DefaultValue;
 
 abstract class InsertUpdateStatement extends Statement {
-	/**
-	 * @var array
-	 */
+	/** @var array */
 	private $mask = null;
 
 	/**
@@ -39,6 +37,9 @@ protected function buildFieldList(array $fields, array $query = array()) {
 				continue;
 			}
 			if (is_int($fieldName)) {
+				if(is_array($fieldValue)) {
+					$fieldValue = $this->db()->quoteExpression($fieldValue[0], array_slice($fieldValue, 1));
+				}
 				$query[] = "\t{$fieldValue}";
 			} else {
 				$fieldName = $this->db()->quoteField($fieldName);

src/Builder/Traits/WhereBuilder.php

@@ -15,7 +15,7 @@ trait WhereBuilder {
 	 * @return $this
 	 */
 	public function where($expression) {
-		$this->where[] = array($expression, array_slice(func_get_args(), 1));
+		$this->where[] = [$expression, array_slice(func_get_args(), 1)];
 		return $this;
 	}
 

src/Builder/Update.php

@@ -59,10 +59,11 @@ public function setDefault($fieldName) {
 
 	/**
 	 * @param string $expr
+	 * @param string[] ...$value
 	 * @return $this
 	 */
 	public function setExpr($expr) {
-		$this->fields[] = $expr;
+		$this->fields[] = func_get_args();
 		return $this;
 	}
 

tests/Builder/UpdateTest.php

@@ -55,6 +55,14 @@ public function testSetExpr() {
 		$this->assertEquals("UPDATE\n\ttest1\nSET\n\tfield1=1\n", $sql);
 	}
 
+	public function testSetExprWithParams() {
+		$sql = TestUpdate::create()
+		->table('test1')
+		->setExpr('field1=COALESCE(?, ?)', 1, 2)
+		->asString();
+		$this->assertEquals("UPDATE\n\ttest1\nSET\n\tfield1=COALESCE('1', '2')\n", $sql);
+	}
+
 	public function testSetAll1() {
 		$sql = TestUpdate::create()
 		->table('test1')