composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 11:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

#360 Wrong COUNT when using JOINS (+ other conditions)

Browse Source 
SVN:trunk[1128]
This commit is contained in:
Romain Quetiez
2011-03-11 17:47:03 +00:00
parent cfbf77544e
commit 52a47b193d
2 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/metamodel.class.php
View File

@@ -2161,14 +2161,23 @@ abstract class MetaModel
//
$aUpdateValues = array();
// 1/a - Get the key and friendly name
//
// We need one pkey to be the key, let's take the one corresponding to the root class
// (used to be based on the leaf, but it may happen that this one has no table defined)
$sRootClass = self::GetRootClass($sTargetClass);
$oSelectedIdField = null;
if ($sTableClass == $sRootClass)
{
$aTranslation[$sTargetAlias]['id'] = new FieldExpressionResolved(self::DBGetKey($sTableClass), $sTableAlias);
$oIdField = new FieldExpressionResolved(self::DBGetKey($sTableClass), $sTableAlias);
$aTranslation[$sTargetAlias]['id'] = $oIdField;
if ($bIsOnQueriedClass)
{
// Add this field to the list of queried fields (required for the COUNT to work fine)
$oSelectedIdField = $oIdField;
}
}
// 1/b - Get the other attributes
@@ -2227,7 +2236,7 @@ abstract class MetaModel
// 3 - The whole stuff, for this table only
//
$oSelectBase = new SQLQuery($sTable, $sTableAlias, array(), $aFullText, $bIsOnQueriedClass, $aUpdateValues);
$oSelectBase = new SQLQuery($sTable, $sTableAlias, array(), $aFullText, $bIsOnQueriedClass, $aUpdateValues, $oSelectedIdField);
// 4 - The external keys -> joins...
//