Skip to content

Commit 225e175

Browse files
committed
Revert "fixup! fix: add failing test when aliasing a column of a joined relation"
This reverts commit 8aef340.
1 parent 8aef340 commit 225e175

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

tests/Ticket/GH134TestCase.php

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
class Doctrine_Ticket_GH134_TestCase extends Doctrine_UnitTestCase
44
{
5-
private function doTestWithAllColumnsAliased($hydrateType, $expectedKeys, $expectedRelationKeys = null)
5+
private function doTestWithAllColumnsAliased($hydrateType, $expectedKeys)
66
{
77
try {
88
$query = Doctrine_Query::create()
@@ -17,11 +17,6 @@ private function doTestWithAllColumnsAliased($hydrateType, $expectedKeys, $expec
1717

1818
$this->assertEqual($expectedSql, $query->getSqlQuery());
1919
$this->assertEqual($expectedKeys, array_keys($results[0]));
20-
if (null !== $expectedRelationKeys) {
21-
foreach ($expectedRelationKeys as $relationName => $relationKeys) {
22-
$this->assertEqual($relationKeys, array_keys($results[0][$relationName]));
23-
}
24-
}
2520
$this->assertEqual(count($this->users), count($results));
2621

2722
$this->pass();
@@ -50,10 +45,7 @@ public function test_hydrateArray_withAllColumnsAliased_thenResultsHasAllRecords
5045
{
5146
$hydrateType = Doctrine_Core::HYDRATE_ARRAY;
5247
$expectedKeys = array('id', 'aliasAddress', 'Email');
53-
$expectedRelationKeys = array(
54-
'Email' => array('id', 'aliasAddress'),
55-
);
5648

57-
$this->doTestWithAllColumnsAliased($hydrateType, $expectedKeys, $expectedRelationKeys);
49+
$this->doTestWithAllColumnsAliased($hydrateType, $expectedKeys);
5850
}
5951
}

0 commit comments

Comments
 (0)