From 225e175a735e0226a682b5969fd09cb187ae557f Mon Sep 17 00:00:00 2001 From: Alexandre Quercia Date: Tue, 16 Apr 2024 08:52:35 +0200 Subject: [PATCH] Revert "fixup! fix: add failing test when aliasing a column of a joined relation" This reverts commit 8aef340dd1405fc74da3f918e77263004aa107f6. --- tests/Ticket/GH134TestCase.php | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/tests/Ticket/GH134TestCase.php b/tests/Ticket/GH134TestCase.php index ac98bdef..aba64651 100644 --- 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, $expectedRelationKeys = null) + private function doTestWithAllColumnsAliased($hydrateType, $expectedKeys) { try { $query = Doctrine_Query::create() @@ -17,11 +17,6 @@ private function doTestWithAllColumnsAliased($hydrateType, $expectedKeys, $expec $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(); @@ -50,10 +45,7 @@ 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, $expectedRelationKeys); + $this->doTestWithAllColumnsAliased($hydrateType, $expectedKeys); } }