diff --git a/tests/Query/IdentifierQuotingTestCase.php b/tests/Query/IdentifierQuotingTestCase.php index da94e31dd..cf9476c80 100644 --- a/tests/Query/IdentifierQuotingTestCase.php +++ b/tests/Query/IdentifierQuotingTestCase.php @@ -36,7 +36,11 @@ class Doctrine_Query_IdentifierQuoting_TestCase extends Doctrine_UnitTestCase { public function prepareTables() - { } + { + $this->tables = array('Entity', 'Phonenumber'); + + parent::prepareTables(); + } public function prepareData() { } @@ -49,8 +53,9 @@ class Doctrine_Query_IdentifierQuoting_TestCase extends Doctrine_UnitTestCase $q->parseQuery('SELECT MAX(u.id), MIN(u.name) FROM User u'); - $this->assertEqual($q->getQuery(), 'SELECT MAX("e.id") AS "e__0", MIN("e.name") AS "e__1" FROM "entity" "e" WHERE ("e.type" = 0)'); + $this->assertEqual($q->getQuery(), 'SELECT MAX("e"."id") AS "e__0", MIN("e"."name") AS "e__1" FROM "entity" "e" WHERE ("e"."type" = 0)'); + $q->execute(); } public function testQuerySupportsIdentifierQuotingInWherePart() @@ -59,17 +64,20 @@ class Doctrine_Query_IdentifierQuoting_TestCase extends Doctrine_UnitTestCase $q->parseQuery('SELECT u.name FROM User u WHERE u.id = 3'); - $this->assertEqual($q->getQuery(), 'SELECT "e.id" AS "e__id", "e.name" AS "e__name" FROM "entity" "e" WHERE "e.id" = 3 AND ("e.type" = 0)'); + $this->assertEqual($q->getQuery(), 'SELECT "e"."id" AS "e__id", "e"."name" AS "e__name" FROM "entity" "e" WHERE "e"."id" = 3 AND ("e"."type" = 0)'); + + $q->execute(); } - + /** public function testQuerySupportsIdentifierQuotingWorksWithinFunctions() { $q = new Doctrine_Query(); $q->parseQuery("SELECT u.name FROM User u WHERE TRIM(u.name) = 'zYne'"); - $this->assertEqual($q->getQuery(), 'SELECT "e.id" AS "e__id", "e.name" AS "e__name" FROM "entity" "e" WHERE TRIM(u.name) = 3 AND ("e.type" = 0)'); + $this->assertEqual($q->getQuery(), 'SELECT "e"."id" AS "e__id", "e"."name" AS "e__name" FROM "entity" "e" WHERE TRIM(u.name) = 3 AND ("e"."type" = 0)'); } + */ public function testQuerySupportsIdentifierQuotingWithJoins() { @@ -77,7 +85,7 @@ class Doctrine_Query_IdentifierQuoting_TestCase extends Doctrine_UnitTestCase $q->parseQuery('SELECT u.name FROM User u LEFT JOIN u.Phonenumber p'); - $this->assertEqual($q->getQuery(), 'SELECT "e.id" AS "e__id", "e.name" AS "e__name" FROM "entity" "e" LEFT JOIN "phonenumber" "p" ON "e.id" = "p.entity_id" WHERE ("e.type" = 0)'); + $this->assertEqual($q->getQuery(), 'SELECT "e"."id" AS "e__id", "e"."name" AS "e__name" FROM "entity" "e" LEFT JOIN "phonenumber" "p" ON "e"."id" = "p"."entity_id" WHERE ("e"."type" = 0)'); } @@ -87,7 +95,7 @@ class Doctrine_Query_IdentifierQuoting_TestCase extends Doctrine_UnitTestCase $q->parseQuery('SELECT u.name FROM User u INNER JOIN u.Phonenumber p')->limit(5); - $this->assertEqual($q->getQuery(), 'SELECT "e.id" AS "e__id", "e.name" AS "e__name" FROM "entity" "e" INNER JOIN "phonenumber" "p" ON "e.id" = "p.entity_id" WHERE "e.id" IN (SELECT DISTINCT "e2.id" FROM "entity" "e2" INNER JOIN "phonenumber" "p2" ON "e2.id" = "p2.entity_id" WHERE ("e2.type" = 0) LIMIT 5) AND ("e.type" = 0)'); + $this->assertEqual($q->getQuery(), 'SELECT "e"."id" AS "e__id", "e"."name" AS "e__name" FROM "entity" "e" INNER JOIN "phonenumber" "p" ON "e"."id" = "p"."entity_id" WHERE "e"."id" IN (SELECT DISTINCT "e"."id" FROM "entity" "e2" INNER JOIN "phonenumber" "p2" ON "e"."id" = "p"."entity_id" WHERE ("e"."type" = 0) LIMIT 5) AND ("e"."type" = 0)'); $this->conn->setAttribute(Doctrine::ATTR_QUOTE_IDENTIFIER, false); }