RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

Fix issue in LimitSubqueryOutputWalker with entities having field names different from column names

Browse source
This commit is contained in:
Bill Schaller 2015-03-31 13:59:24 -04:00 • committed by Marco Pivetta
parent 9d7aa9ba39
commit 5c93e61686
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php
View file

@ -410,27 +410,27 @@ class LimitSubqueryOutputWalker extends SqlWalker
$fieldSearchPattern = '/(?<![a-z0-9_])%s\.%s(?![a-z0-9_])/i'; $fieldSearchPattern = '/(?<![a-z0-9_])%s\.%s(?![a-z0-9_])/i';
// Generate search patterns for each field's path expression in the order by clause // Generate search patterns for each field's path expression in the order by clause
foreach($this->rsm->fieldMappings as $fieldAlias => $columnName) { foreach($this->rsm->fieldMappings as $fieldAlias => $fieldName) {
$dqlAliasForFieldAlias = $this->rsm->columnOwnerMap[$fieldAlias]; $dqlAliasForFieldAlias = $this->rsm->columnOwnerMap[$fieldAlias];
$class = $dqlAliasToClassMap[$dqlAliasForFieldAlias]; $class = $dqlAliasToClassMap[$dqlAliasForFieldAlias];
// If the field is from a joined child table, we won't be ordering // If the field is from a joined child table, we won't be ordering
// on it. // on it.
if (!isset($class->fieldMappings[$columnName])) { if (!isset($class->fieldMappings[$fieldName])) {
continue; continue;
} }
$fieldMapping = $class->fieldMappings[$fieldName];
// Get the proper column name as will appear in the select list // Get the proper column name as will appear in the select list
$columnName = $this->quoteStrategy->getColumnName( $columnName = $this->quoteStrategy->getColumnName(
$columnName, $fieldName,
$dqlAliasToClassMap[$dqlAliasForFieldAlias], $dqlAliasToClassMap[$dqlAliasForFieldAlias],
$this->em->getConnection()->getDatabasePlatform() $this->em->getConnection()->getDatabasePlatform()
); );
// Get the SQL table alias for the entity and field // Get the SQL table alias for the entity and field
$sqlTableAliasForFieldAlias = $dqlAliasToSqlTableAliasMap[$dqlAliasForFieldAlias]; $sqlTableAliasForFieldAlias = $dqlAliasToSqlTableAliasMap[$dqlAliasForFieldAlias];
$fieldMapping = $class->fieldMappings[$columnName];
if (isset($fieldMapping['declared']) && $fieldMapping['declared'] !== $class->name) { if (isset($fieldMapping['declared']) && $fieldMapping['declared'] !== $class->name) {
// Field was declared in a parent class, so we need to get the proper SQL table alias // Field was declared in a parent class, so we need to get the proper SQL table alias
// for the joined parent table. // for the joined parent table.