composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed regression due to the recent optimization of SQL queries

Browse Source 
SVN:trunk[2510]
This commit is contained in:
Romain Quetiez
2012-12-05 12:43:35 +00:00
parent 64c9c1fead
commit 7561f8f8da
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/sqlquery.class.inc.php
View File

@@ -671,22 +671,33 @@ class SQLQuery
}
// Is required in the JOIN, and therefore we must ensure that the join expression will be valid
protected function HasRequiredTables($aTables)
protected function HasRequiredTables(&$aTables)
{
$bResult = false;
if (array_key_exists($this->m_sTableAlias, $aTables))
{
return true;
$bResult = true;
}
foreach ($this->m_aJoinSelects as $i => $aJoinInfo)
{
$oSQLQuery = $aJoinInfo["select"];
if ($oSQLQuery->HasRequiredTables($aTables))
{
return true;
// There is something required in the branch, then this node is a MUST
if (isset($aJoinInfo['righttablealias']))
{
$aTables[$aJoinInfo['righttablealias']] = true;
}
if (isset($aJoinInfo["on_expression"]))
{
$sJoinCond = $aJoinInfo["on_expression"]->CollectUsedParents($aTables);
}
$bResult = true;
}
}
// None of the tables is in the list of required tables
return false;
return $bResult;
}
}
?>