Changeset 4451 for trunk/tests/Orm

Timestamp:

05/27/08 04:44:08 (8 months ago)

Author:

guilhermeblanco

Message:

Finished first parts of SELECT support. Two test cases added and passing. Introduced the concept of DCTRN in queryComponent. Added concept of queryField, which validates for already defined fields in SELECT.

Location:

trunk/tests/Orm/Query

Files:

• IdentifierRecognitionTest.php (modified) (7 diffs)
• LanguageRecognitionTest.php (modified) (1 diff)
• SelectSqlGenerationTest.php (modified) (1 diff)

trunk/tests/Orm/Query/IdentifierRecognitionTest.php

@@ -49 +49 @@
         $this->assertEquals(null, $decl['relation']);
         $this->assertEquals(null, $decl['parent']);
-        $this->assertEquals(null, $decl['agg']);
+        $this->assertEquals(null, $decl['scalar']);
         $this->assertEquals(null, $decl['map']);
     }
@@ -64 +64 @@
         $this->assertEquals(null, $decl['relation']);
         $this->assertEquals(null, $decl['parent']);
-        $this->assertEquals(null, $decl['agg']);
+        $this->assertEquals(null, $decl['scalar']);
         $this->assertEquals('id', $decl['map']);
     }
@@ -79 +79 @@
         $this->assertEquals(null, $decl['relation']);
         $this->assertEquals(null, $decl['parent']);
-        $this->assertEquals(null, $decl['agg']);
+        $this->assertEquals(null, $decl['scalar']);
         $this->assertEquals('id', $decl['map']);
 
@@ -87 +87 @@
         $this->assertTrue($decl['relation'] instanceof Doctrine_Relation);
         $this->assertEquals('u', $decl['parent']);
-        $this->assertEquals(null, $decl['agg']);
+        $this->assertEquals(null, $decl['scalar']);
         $this->assertEquals(null, $decl['map']);
     }
@@ -103 +103 @@
         $this->assertEquals(null, $decl['relation']);
         $this->assertEquals(null, $decl['parent']);
-        $this->assertEquals(null, $decl['agg']);
+        $this->assertEquals(null, $decl['scalar']);
         $this->assertEquals('id', $decl['map']);
 
@@ -111 +111 @@
         $this->assertTrue($decl['relation'] instanceof Doctrine_Relation);
         $this->assertEquals('u', $decl['parent']);
-        $this->assertEquals(null, $decl['agg']);
+        $this->assertEquals(null, $decl['scalar']);
         $this->assertEquals(null, $decl['map']);
 
@@ -119 +119 @@
         $this->assertTrue($decl['relation'] instanceof Doctrine_Relation);
         $this->assertEquals('u', $decl['parent']);
-        $this->assertEquals(null, $decl['agg']);
+        $this->assertEquals(null, $decl['scalar']);
         $this->assertEquals('phonenumber', $decl['map']);
     }

trunk/tests/Orm/Query/LanguageRecognitionTest.php

@@ -337 +337 @@
     public function testIndexBySupportsJoins2()
     {
-        $this->assertValidDql('SELECT u.*, u.phonenumbers.* FROM CmsUser u INDEX BY id LEFT JOIN u.phonenumbers p INDEX BY phonenumber');
+        $this->assertValidDql('SELECT u.*, p.* FROM CmsUser u INDEX BY id LEFT JOIN u.phonenumbers p INDEX BY phonenumber');
     }
 

trunk/tests/Orm/Query/SelectSqlGenerationTest.php

@@ -47 +47 @@
         $q->free();
 
-        //$q->setDql('SELECT u.* FROM CmsUser u');
-        //$this->assertEquals('DELETE FROM cms_user cu WHERE 1 = 1', $q->getSql());
-        //$q->free();
+        $q->setDql('SELECT u.* FROM CmsUser u');
+        $this->assertEquals('SELECT cu.id AS cu__id, cu.status AS cu__status, cu.username AS cu__username, cu.name AS cu__name FROM cms_user cu WHERE 1 = 1', $q->getSql());
+        $q->free();
     }