SqlPreprocessor: scalar are always passed via bindValue()

nette · Dec 17, 2016 · b2067a2 · b2067a2
1 parent a01c1e1
commit b2067a2
Show file tree

Hide file tree

Showing 7 changed files with 106 additions and 110 deletions.
diff --git a/src/Database/SqlPreprocessor.php b/src/Database/SqlPreprocessor.php
@@ -113,29 +113,16 @@ public function callback($m)
 	private function formatValue($value, $mode = NULL)
 	{
 		if (!$mode || $mode === 'auto') {
-			if (is_string($value)) {
-				if (strlen($value) > 20) {
-					$this->remaining[] = $value;
-					return '?';
-
-				} else {
-					return $this->connection->quote($value);
-				}
-
-			} elseif (is_int($value)) {
-				return (string) $value;
-
-			} elseif (is_float($value)) {
-				return rtrim(rtrim(number_format($value, 10, '.', ''), '0'), '.');
-
-			} elseif (is_bool($value)) {
-				return $this->driver->formatBool($value);
+			if (is_scalar($value) || is_resource($value)) {
+				$this->remaining[] = $value;
+				return '?';
 
 			} elseif ($value === NULL) {
 				return 'NULL';
 
 			} elseif ($value instanceof Table\IRow) {
-				return $this->formatValue($value->getPrimary());
+				$this->remaining[] = $value->getPrimary();
+				return '?';
 
 			} elseif ($value instanceof SqlLiteral) {
 				$prep = clone $this;
@@ -150,10 +137,7 @@ private function formatValue($value, $mode = NULL)
 				return $this->driver->formatDateInterval($value);
 
 			} elseif (is_object($value) && method_exists($value, '__toString')) {
-				return $this->formatValue((string) $value);
-
-			} elseif (is_resource($value)) {
-				$this->remaining[] = $value;
+				$this->remaining[] = (string) $value;
 				return '?';
 			}
 

diff --git a/tests/Database/Connection.preprocess.phpt b/tests/Database/Connection.preprocess.phpt
@@ -12,4 +12,4 @@ require __DIR__ . '/connect.inc.php'; // create $connection
 
 Assert::same(['SELECT name FROM author', []], $connection->preprocess('SELECT name FROM author'));
 
-Assert::same(["SELECT 'string'", []], $connection->preprocess('SELECT ?', 'string'));
+Assert::same(["SELECT ?", ['string']], $connection->preprocess('SELECT ?', 'string'));
diff --git a/tests/Database/Connection.query.phpt b/tests/Database/Connection.query.phpt
@@ -15,17 +15,20 @@ Nette\Database\Helpers::loadFromFile($connection, __DIR__ . "/files/{$driverName
 test(function () use ($connection) {
 	$res = $connection->query('SELECT id FROM author WHERE id = ?', 11);
 	Assert::type(Nette\Database\ResultSet::class, $res);
-	Assert::same('SELECT id FROM author WHERE id = 11', $res->getQueryString());
+	Assert::same('SELECT id FROM author WHERE id = ?', $res->getQueryString());
+	Assert::same([11], $res->getParameters());
 });
 
 
 test(function () use ($connection) {
 	$res = $connection->query('SELECT id FROM author WHERE id = ? OR id = ?', 11, 12);
-	Assert::same('SELECT id FROM author WHERE id = 11 OR id = 12', $res->getQueryString());
+	Assert::same('SELECT id FROM author WHERE id = ? OR id = ?', $res->getQueryString());
+	Assert::same([11, 12], $res->getParameters());
 });
 
 
 test(function () use ($connection) {
 	$res = $connection->queryArgs('SELECT id FROM author WHERE id = ? OR id = ?', [11, 12]);
-	Assert::same('SELECT id FROM author WHERE id = 11 OR id = 12', $res->getQueryString());
+	Assert::same('SELECT id FROM author WHERE id = ? OR id = ?', $res->getQueryString());
+	Assert::same([11, 12], $res->getParameters());
 });
diff --git a/tests/Database/Context.query.phpt b/tests/Database/Context.query.phpt
@@ -15,17 +15,20 @@ Nette\Database\Helpers::loadFromFile($connection, __DIR__ . "/files/{$driverName
 test(function () use ($context) {
 	$res = $context->query('SELECT id FROM author WHERE id = ?', 11);
 	Assert::type(Nette\Database\ResultSet::class, $res);
-	Assert::same('SELECT id FROM author WHERE id = 11', $res->getQueryString());
+	Assert::same('SELECT id FROM author WHERE id = ?', $res->getQueryString());
+	Assert::same([11], $res->getParameters());
 });
 
 
 test(function () use ($context) {
 	$res = $context->query('SELECT id FROM author WHERE id = ? OR id = ?', 11, 12);
-	Assert::same('SELECT id FROM author WHERE id = 11 OR id = 12', $res->getQueryString());
+	Assert::same('SELECT id FROM author WHERE id = ? OR id = ?', $res->getQueryString());
+	Assert::same([11, 12], $res->getParameters());
 });
 
 
 test(function () use ($context) {
 	$res = $context->queryArgs('SELECT id FROM author WHERE id = ? OR id = ?', [11, 12]);
-	Assert::same('SELECT id FROM author WHERE id = 11 OR id = 12', $res->getQueryString());
+	Assert::same('SELECT id FROM author WHERE id = ? OR id = ?', $res->getQueryString());
+	Assert::same([11, 12], $res->getParameters());
 });