Optimize the queries for the export page

SVN:trunk[3066]
This commit is contained in:
Romain Quetiez
2014-02-03 14:23:55 +00:00
parent 16f1fd56ec
commit c67e7e18e6

View File

@@ -125,6 +125,7 @@ if (!empty($sExpression))
// Check and adjust column names
//
$aAliasToFields = array();
foreach($aFields as $index => $sField)
{
if (preg_match('/^(.*)\.(.*)$/', $sField, $aMatches))
@@ -136,8 +137,11 @@ if (!empty($sExpression))
{
$sClassAlias = $oFilter->GetClassAlias();
$sAttCode = $sField;
// Disambiguate the class alias
$aFields[$index] = $sClassAlias.'.'.$sAttCode;
}
$aAliasToFields[$sClassAlias][] = $sAttCode;
$sClass = $oFilter->GetClassName($sClassAlias);
if (!MetaModel::IsValidAttCode($sClass, $sAttCode))
{
@@ -161,6 +165,7 @@ if (!empty($sExpression))
if ($oFilter)
{
$oSet = new CMDBObjectSet($oFilter, array(), $aArgs);
$oSet->OptimizeColumnLoad($aAliasToFields);
switch($sFormat)
{
case 'html':