Explicitely testing escape_like_str API

1 files changed, 8 insertions, 4 deletions

diff --git a/tests/codeigniter/database/query_builder/escape_test.php b/tests/codeigniter/database/query_builder/escape_test.php
index 5dd2da058..ac1c8f659 100644
--- a/tests/codeigniter/database/query_builder/escape_test.php
+++ b/tests/codeigniter/database/query_builder/escape_test.php
@@ -13,6 +13,9 @@ class Escape_test extends CI_TestCase {
 
 		Mock_Database_Schema_Skeleton::create_tables();
 		Mock_Database_Schema_Skeleton::create_data();
+
+		$this->pre = (strpos(DB_DRIVER, 'pgsql') === FALSE) ? '`' : '"';
+		$this->esc = (strpos(DB_DRIVER, 'mysql') === FALSE) ? '!' : '';
 	}
 
 	// ------------------------------------------------------------------------
@@ -23,8 +26,8 @@ class Escape_test extends CI_TestCase {
 	public function test_escape_like_percent_sign()
 	{
 		$string = $this->db->escape_like_str('\%foo');
-		$sql = "SELECT `value` FROM `misc` WHERE `key` LIKE '$string%'"; 
-		$sql .= (strpos(DB_DRIVER, 'mysql') !== FALSE) ? ";" : "ESCAPE '!';";
+
+		$sql = "SELECT {$this->pre}value{$this->pre} FROM {$this->pre}misc{$this->pre} WHERE {$this->pre}key{$this->pre} LIKE '$string%' ESCAPE '$this->esc';";
 
 		$res = $this->db->query($sql)->result_array();
 		
@@ -40,8 +43,9 @@ class Escape_test extends CI_TestCase {
 	public function test_escape_like_backslash_sign()
 	{
 		$string = $this->db->escape_like_str('\\');
-		$sql = "SELECT `value` FROM `misc` WHERE `key` LIKE '$string%'";
-		$sql .= (strpos(DB_DRIVER, 'mysql') !== FALSE) ? ";" : "ESCAPE '!';";
+
+		$sql = "SELECT {$this->pre}value{$this->pre} FROM {$this->pre}misc{$this->pre} WHERE {$this->pre}key{$this->pre} LIKE '$string%' ESCAPE '$this->esc';";
+
 		$res = $this->db->query($sql)->result_array();
 		
 		// Check the result