Fixing some tests involving identifier quoting

cakephp · Jan 20, 2014 · 7af5414 · 7af5414 · jrbasso · Jan 20, 2014
1 parent 5cad7fc
commit 7af5414
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/tests/TestCase/Database/ConnectionTest.php b/tests/TestCase/Database/ConnectionTest.php
@@ -124,7 +124,8 @@ public function testPrepare() {
 		$query = $this->connection->newQuery()->select('1 + 1');
 		$result = $this->connection->prepare($query);
 		$this->assertInstanceOf('Cake\Database\StatementInterface', $result);
-		$this->assertEquals($sql, $result->queryString);
+		$sql = '#SELECT [`"\[]?1 \+ 1[`"\]]?#';
+		$this->assertRegExp($sql, $result->queryString);
 	}
 
 /**

diff --git a/tests/TestCase/Database/QueryTest.php b/tests/TestCase/Database/QueryTest.php
@@ -1088,29 +1088,45 @@ public function testSelectModifiers() {
 			->select(['city', 'state', 'country'])
 			->from(['addresses'])
 			->modifier('DISTINCTROW');
-		$this->assertSame('SELECT DISTINCTROW city, state, country FROM addresses', $result->sql());
+		$this->assertQuotedQuery(
+			'SELECT DISTINCTROW <city>, <state>, <country> FROM <addresses>',
+			$result->sql(),
+			true
+		);
 
 		$query = new Query($this->connection);
 		$result = $query
 			->select(['city', 'state', 'country'])
 			->from(['addresses'])
 			->modifier(['DISTINCTROW', 'SQL_NO_CACHE']);
-		$this->assertSame('SELECT DISTINCTROW SQL_NO_CACHE city, state, country FROM addresses', $result->sql());
+		$this->assertQuotedQuery(
+			'SELECT DISTINCTROW SQL_NO_CACHE <city>, <state>, <country> FROM <addresses>',
+			$result->sql(),
+			true
+		);
 
 		$query = new Query($this->connection);
 		$result = $query
 			->select(['city', 'state', 'country'])
 			->from(['addresses'])
 			->modifier('DISTINCTROW')
 			->modifier('SQL_NO_CACHE');
-		$this->assertSame('SELECT DISTINCTROW SQL_NO_CACHE city, state, country FROM addresses', $result->sql());
+		$this->assertQuotedQuery(
+			'SELECT DISTINCTROW SQL_NO_CACHE <city>, <state>, <country> FROM <addresses>',
+			$result->sql(),
+			true
+		);
 
 		$query = new Query($this->connection);
 		$result = $query
 			->select(['city', 'state', 'country'])
 			->from(['addresses'])
 			->modifier(['TOP 10']);
-		$this->assertSame('SELECT TOP 10 city, state, country FROM addresses', $result->sql());
+		$this->assertQuotedQuery(
+			'SELECT TOP 10 <city>, <state>, <country> FROM <addresses>',
+			$result->sql(),
+			true
+		);
 	}
 
 /**