DibiPostgreDriver: use 'E' prefix in escapeLike() [Closes dg#159]

milo · Jan 22, 2015 · 5ee7c79 · 5ee7c79
1 parent 97b50bd
commit 5ee7c79
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 4 deletions.
diff --git a/dibi/drivers/DibiPostgreDriver.php b/dibi/drivers/DibiPostgreDriver.php
@@ -35,6 +35,9 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiResultDr
 	/** @var int|FALSE  Affected rows */
 	private $affectedRows = FALSE;
 
+	/** @var string or FALSE for PostgreSQL < 8.0 */
+	private $version;
+
 
 	/**
 	 * @throws DibiNotSupportedException
@@ -83,6 +86,7 @@ public function connect(array & $config)
 			if (DibiDriverException::catchError($msg)) {
 				throw new DibiDriverException($msg, 0);
 			}
+			$this->version = pg_parameter_status($this->resource, 'server_version');
 		}
 
 		if (!is_resource($this->connection)) {
@@ -312,7 +316,7 @@ public function escapeLike($value, $pos)
 	{
 		$value = pg_escape_string($this->connection, $value);
 		$value = strtr($value, array( '%' => '\\\\%', '_' => '\\\\_'));
-		return ($pos <= 0 ? "'%" : "'") . $value . ($pos >= 0 ? "%'" : "'");
+		return ($this->version < 8.2 ? '' : 'E') . ($pos <= 0 ? "'%" : "'") . $value . ($pos >= 0 ? "%'" : "'");
 	}
 
 
@@ -445,8 +449,7 @@ public function getResultResource()
 	 */
 	public function getTables()
 	{
-		$version = pg_parameter_status($this->resource, 'server_version');
-		if ($version < 7.4) {
+		if ($this->version < 7.4) {
 			throw new DibiDriverException('Reflection requires PostgreSQL 7.4 and newer.');
 		}
 
@@ -462,7 +465,7 @@ public function getTables()
 			WHERE
 				table_schema = ANY (current_schemas(false))";
 
-		if ($version >= 9.3) {
+		if ($this->version >= 9.3) {
 			$query .= "
 				UNION ALL
 				SELECT

diff --git a/tests/dibi/DibiPostgreDriver.like.phpt b/tests/dibi/DibiPostgreDriver.like.phpt
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * @dataProvider ../databases.ini pgsql
+ */
+
+use Tester\Assert;
+
+require __DIR__ . '/bootstrap.php';
+
+
+$danger = '_ % \\';
+
+test(function() use ($config, $danger) {
+	$conn = new DibiConnection($config);
+	$conn->query('SET standard_conforming_strings = on');
+	Assert::false($conn->query("SELECT 'ROLEX' LIKE %~like~", 'ROLE_')->fetchSingle());
+	Assert::true($conn->query("SELECT 'ROLE_X' LIKE %~like~", 'ROLE_')->fetchSingle());
+
+	Assert::same("E'%\\\\_ \\\\% \\%'", $conn->getDriver()->escapeLike($danger, 0));
+});
+
+
+test(function() use ($config, $danger) {
+	$conn = new DibiConnection($config);
+	$conn->query('SET standard_conforming_strings = off');
+	$conn->query('SET escape_string_warning = off'); // do not write into PostgreSQL log
+
+	Assert::false($conn->query("SELECT 'ROLEX' LIKE %~like~", 'ROLE_')->fetchSingle());
+	Assert::true($conn->query("SELECT 'ROLE_X' LIKE %~like~", 'ROLE_')->fetchSingle());
+
+	Assert::same("E'%\\\\_ \\\\% \\\\%'", $conn->getDriver()->escapeLike($danger, 0));
+});
+
+
+test(function() use ($config) {
+	$conn = new DibiConnection($config);
+
+	Assert::same("E'%A'", $conn->getDriver()->escapeLike('A', -1));
+	Assert::same("E'%A%'", $conn->getDriver()->escapeLike('A', 0));
+	Assert::same("E'A%'", $conn->getDriver()->escapeLike('A', 1));
+});