Database: implemented placeholder for delimited table name [closes ne…

…tte#1324]
hrach · Dec 30, 2013 · d05c7d9 · d05c7d9
1 parent 7a1a4a3
commit d05c7d9
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/Nette/Database/SqlPreprocessor.php b/Nette/Database/SqlPreprocessor.php
@@ -79,7 +79,7 @@ public function process($params)
 			} else {
 				$res[] = Nette\Utils\Strings::replace(
 					$param,
-					'~\'.*?\'|".*?"|\?|\b(?:INSERT|REPLACE|UPDATE|WHERE|HAVING|ORDER BY|GROUP BY)\b|/\*.*?\*/|--[^\n]*~si',
+					'~\'.*?\'|".*?"|\?i?|\b(?:INSERT|REPLACE|UPDATE|WHERE|HAVING|ORDER BY|GROUP BY)\b|/\*.*?\*/|--[^\n]*~si',
 					array($this, 'callback')
 				);
 			}
@@ -96,11 +96,15 @@ public function callback($m)
 		if ($m[0] === "'" || $m[0] === '"' || $m[0] === '/' || $m[0] === '-') { // string or comment
 			return $m;
 
-		} elseif ($m === '?') { // placeholder
+		} elseif ($m === '?' || $m === '?i') { // placeholder
 			if ($this->counter >= count($this->params)) {
 				throw new Nette\InvalidArgumentException('There are more placeholders than passed parameters.');
 			}
-			return $this->formatValue($this->params[$this->counter++]);
+			if ($m === '?') {
+				return $this->formatValue($this->params[$this->counter++]);
+			} else {
+				return $this->driver->delimite($this->params[$this->counter++]);
+			}
 
 		} else { // command
 			$this->arrayMode = $this->arrayModes[strtoupper($m)];

diff --git a/Nette/Database/Table/SqlBuilder.php b/Nette/Database/Table/SqlBuilder.php
@@ -478,8 +478,8 @@ protected function buildQueryEnd()
 	protected function tryDelimite($s)
 	{
 		$driver = $this->driver;
-		return preg_replace_callback('#(?<=[^\w`"\[]|^)[a-z_][a-z0-9_]*(?=[^\w`"(\]]|\z)#i', function($m) use ($driver) {
-			return strtoupper($m[0]) === $m[0] ? $m[0] : $driver->delimite($m[0]);
+		return preg_replace_callback('#(?<=[^\w`"\[]|^)(?:[a-z_][a-z0-9_]*|\?i)(?=[^\w`"(\]]|\z)#i', function($m) use ($driver) {
+			return $m[0] === '?i' || strtoupper($m[0]) === $m[0] ? $m[0] : $driver->delimite($m[0]);
 		}, $s);
 	}
 

diff --git a/tests/Nette/Database/SqlBuilder.addWhere().phpt b/tests/Nette/Database/SqlBuilder.addWhere().phpt
@@ -31,6 +31,15 @@ test(function() use ($connection, $reflection) { // test paramateres with NULL
 });
 
 
+test(function() use ($connection, $reflection) {
+	$sqlBuilder = new SqlBuilder('book', $connection, $reflection);
+	$sqlBuilder->addWhere('?i ?', 'id', 3);
+	$sqlBuilder->addWhere('?i = ?', 'number', 4);
+	$sqlBuilder->addWhere('?i ?', 'number', NULL);
+	Assert::same(reformat('SELECT * FROM [book] WHERE (?i = ?) AND (?i = ?) AND (?i IS NULL)'), $sqlBuilder->buildSelectQuery());
+});
+
+
 test(function() use ($dao, $connection, $reflection) { // test Selection as a parameter
 	$sqlBuilder = new SqlBuilder('book', $connection, $reflection);
 	$sqlBuilder->addWhere('id', $dao->table('book'));

diff --git a/tests/Nette/Database/SqlPreprocessor.phpt b/tests/Nette/Database/SqlPreprocessor.phpt
@@ -58,6 +58,13 @@ test(function() use ($preprocessor) {
 });
 
 
+test(function() use ($preprocessor) {
+	list($sql, $params) = $preprocessor->process(array('SELECT id FROM author WHERE ?i = ? OR ?i = ?', 'id', 12, 'number', 23));
+	Assert::same( reformat('SELECT id FROM author WHERE [id] = 12 OR [number] = 23'), $sql );
+	Assert::same( array(), $params );
+});
+
+
 test(function() use ($preprocessor) { // comments
 	list($sql, $params) = $preprocessor->process(array("SELECT id --?\nFROM author WHERE id = ?", 11));
 	Assert::same( "SELECT id --?\nFROM author WHERE id = 11", $sql );