fixup! fix: add failing test when aliasing a column of a joined relation

FriendsOfSymfony1 · Apr 16, 2024 · 8aef340 · 8aef340
1 parent c61998f
commit 8aef340
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/tests/Ticket/GH134TestCase.php b/tests/Ticket/GH134TestCase.php
@@ -2,7 +2,7 @@
 
 class Doctrine_Ticket_GH134_TestCase extends Doctrine_UnitTestCase
 {
-    private function doTestWithAllColumnsAliased($hydrateType, $expectedKeys)
+    private function doTestWithAllColumnsAliased($hydrateType, $expectedKeys, $expectedRelationKeys = null)
     {
         try {
             $query = Doctrine_Query::create()
@@ -17,6 +17,11 @@ private function doTestWithAllColumnsAliased($hydrateType, $expectedKeys)
 
             $this->assertEqual($expectedSql, $query->getSqlQuery());
             $this->assertEqual($expectedKeys, array_keys($results[0]));
+            if (null !== $expectedRelationKeys) {
+                foreach ($expectedRelationKeys as $relationName => $relationKeys) {
+                    $this->assertEqual($relationKeys, array_keys($results[0][$relationName]));
+                }
+            }
             $this->assertEqual(count($this->users), count($results));
 
             $this->pass();
@@ -45,7 +50,10 @@ public function test_hydrateArray_withAllColumnsAliased_thenResultsHasAllRecords
     {
         $hydrateType = Doctrine_Core::HYDRATE_ARRAY;
         $expectedKeys = array('id', 'aliasAddress', 'Email');
+        $expectedRelationKeys = array(
+            'Email' => array('id', 'aliasAddress'),
+        );
 
-        $this->doTestWithAllColumnsAliased($hydrateType, $expectedKeys);
+        $this->doTestWithAllColumnsAliased($hydrateType, $expectedKeys, $expectedRelationKeys);
     }
 }