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

alquerci · alquerci · commit c7d77e1e296e · 2024-04-16T08:40:08.000+02:00
This reverts commit 1829982.
diff --git a/lib/Doctrine/Hydrator/ArrayDriver.php b/lib/Doctrine/Hydrator/ArrayDriver.php
@@ -104,13 +104,6 @@ private function addSelectedRelationToRowData($rowData, $dqlAlias, $cache)
         if (!isset($rowData[$dqlAlias])) {
             if ($cache['isRelation']) {
                 $rowData[$dqlAlias] = array();
-
-                // Needs to add on SQL the identifiers on select
-                //
-                // foreach ($cache['identifiers'] as $identifierFieldName) {
-                //     $identifierSqlAlias = $cache['identifierMap'][$identifierFieldName];
-                //     $rowData[$dqlAlias][$identifierFieldName] = $data[$identifierSqlAlias];
-                // }
             }
         }
 
diff --git a/lib/Doctrine/Hydrator/Graph.php b/lib/Doctrine/Hydrator/Graph.php
@@ -333,7 +333,6 @@ protected function _gatherRowData(&$data, &$cache, &$id, &$nonemptyComponents)
                 } else {
                   $cache[$key]['isIdentifier'] = false;
                 }
-                // $cache[$key]['identifiers'] = (array) $table->getIdentifiers();
 
                 $type = $table->getTypeOfColumn($last);
                 if ($type == 'integer' || $type == 'string') {

Original file line number	Diff line number	Diff line change
`@@ -104,13 +104,6 @@ private function addSelectedRelationToRowData($rowData, $dqlAlias, $cache)`
`104`	`104`	`if (!isset($rowData[$dqlAlias])) {`
`105`	`105`	`if ($cache['isRelation']) {`
`106`	`106`	`$rowData[$dqlAlias] = array();`
`107`		`-`
`108`		`- // Needs to add on SQL the identifiers on select`
`109`		`- //`
`110`		`- // foreach ($cache['identifiers'] as $identifierFieldName) {`
`111`		`- // $identifierSqlAlias = $cache['identifierMap'][$identifierFieldName];`
`112`		`- // $rowData[$dqlAlias][$identifierFieldName] = $data[$identifierSqlAlias];`
`113`		`- // }`
`114`	`107`	`}`
`115`	`108`	`}`
`116`	`109`
Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,6 @@ protected function _gatherRowData(&$data, &$cache, &$id, &$nonemptyComponents)`
`333`	`333`	`} else {`
`334`	`334`	`$cache[$key]['isIdentifier'] = false;`
`335`	`335`	`}`
`336`		`- // $cache[$key]['identifiers'] = (array) $table->getIdentifiers();`
`337`	`336`
`338`	`337`	`$type = $table->getTypeOfColumn($last);`
`339`	`338`	`if ($type == 'integer' \|\| $type == 'string') {`