- You can now set a DBExpr as a field-value which will not be quoted when a query is generated

Author: rkr

src/Builder/DBExpr.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Kir\MySQL\Builder;
+
+class DBExpr {
+	/** @var string */
+	private $expression;
+
+	/**
+	 * @param $expression
+	 */
+	public function __construct($expression) {
+		$this->expression = $expression;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getExpression() {
+		return $this->expression;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function __toString() {
+		return $this->expression;
+	}
+}

src/Databases/MySQL.php

@@ -151,6 +151,8 @@ public function quoteExpression($expression, array $arguments = array()) {
 	public function quote($value) {
 		if(is_null($value)) {
 			$result = 'NULL';
+		} elseif($value instanceof Builder\DBExpr) {
+			$result = $value->getExpression();
 		} elseif($value instanceof Builder\Select) {
 			$result = sprintf('(%s)', (string) $value);
 		} elseif(is_array($value)) {

tests/Builder/DeleteTest.php

@@ -38,6 +38,14 @@ public function testWhere() {
 		$this->assertEquals("DELETE FROM\n\ttravis_test.test1\nWHERE\n\t(field1='1')\n\tAND\n\t(field2 != field1)\n", $sql);
 	}
 
+	public function testDBExpr() {
+		$sql = TestDelete::create()
+		->from('travis#test1')
+		->where('field1=?', new DBExpr('NOW()'))
+		->asString();
+		$this->assertEquals("DELETE FROM\n\ttravis_test.test1\nWHERE\n\t(field1=NOW())\n", $sql);
+	}
+
 	public function testOrderBy() {
 		$sql = TestDelete::create()
 		->from('travis#test1')

tests/Builder/InsertTest.php

@@ -149,4 +149,14 @@ public function testExprWithParams() {
 		->asString();
 		$this->assertEquals("INSERT INTO\n\ttest\nSET\n\ta='a',\n\tc='c'\nON DUPLICATE KEY UPDATE\n\tb='b',\n\tc='c'\n", $sql);
 	}
+
+	public function testDBExpr() {
+		$sql = TestInsert::create()
+		->into('test')
+		->addExpr('a=?', new DBExpr('NOW()'))
+		->updateExpr('b=?', new DBExpr('NOW()'))
+		->addOrUpdateExpr('c=?', new DBExpr('NOW()'))
+		->asString();
+		$this->assertEquals("INSERT INTO\n\ttest\nSET\n\ta=NOW(),\n\tc=NOW()\nON DUPLICATE KEY UPDATE\n\tb=NOW(),\n\tc=NOW()\n", $sql);
+	}
 }

tests/Builder/SelectTest.php

@@ -74,6 +74,23 @@ public function testHaving() {
 		$this->assertEquals("SELECT\n\ta\nFROM\n\ttest t\nHAVING\n\t(a+1<2)\n", $str);
 	}
 
+	public function testDBExpr() {
+		$str = TestSelect::create()
+		->field('a')
+		->from('t', 'test')
+		->where('a=?', new DBExpr('NOW()'))
+		->having('b=?', new DBExpr('NOW()'))
+		->asString();
+		$this->assertEquals("SELECT\n\ta\nFROM\n\ttest t\nWHERE\n\t(a=NOW())\nHAVING\n\t(b=NOW())\n", $str);
+
+		$str = TestSelect::create()
+		->field('a')
+		->from('t', 'test')
+		->where('a < ?', 1000)
+		->asString();
+		$this->assertEquals("SELECT\n\ta\nFROM\n\ttest t\nWHERE\n\t(a < '1000')\n", $str);
+	}
+
 	public function testOrder() {
 		$str = TestSelect::create()
 		->field('a')

tests/Builder/UpdateTest.php

@@ -130,4 +130,14 @@ public function testMask() {
 		->asString();
 		$this->assertEquals("UPDATE\n\ttest1\nSET\n\t`field1`='1'\nLIMIT\n\t10\n", $sql);
 	}
+
+	public function testDBExpr() {
+		$sql = TestUpdate::create()
+		->table('test1')
+		->set('field1', 1)
+		->set('field2', new DBExpr('NOW()'))
+		->limit(10)
+		->asString();
+		$this->assertEquals("UPDATE\n\ttest1\nSET\n\t`field1`='1',\n\t`field2`=NOW()\nLIMIT\n\t10\n", $sql);
+	}
 }