Skip to content

Commit

Permalink
Revert "fixup! fix: add failing test when aliasing a column of a join…
Browse files Browse the repository at this point in the history
…ed relation"

This reverts commit 8aef340.
  • Loading branch information
alquerci committed Apr 16, 2024
1 parent 8aef340 commit 225e175
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions tests/Ticket/GH134TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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();
Expand Down Expand Up @@ -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);
}
}

0 comments on commit 225e175

Please sign in to comment.