diff --git a/core/dbsearch.class.php b/core/dbsearch.class.php
index 57f0b5891..59861b464 100644
--- a/core/dbsearch.class.php
+++ b/core/dbsearch.class.php
@@ -951,7 +951,7 @@ abstract class DBSearch
$e->addInfo('OQL', $this->ToOQL());
throw $e;
}
- $this->AddQueryTraceGroupBy($aArgs, $aGroupByExpr, $sRes);
+ $this->AddQueryTraceGroupBy($aArgs, $aGroupByExpr, $bExcludeNullValues, $aSelectExpr, $aOrderBy, $iLimitCount, $iLimitStart, $sRes);
return $sRes;
}
@@ -1282,7 +1282,7 @@ abstract class DBSearch
if ($hLogFile !== false)
{
flock($hLogFile, LOCK_EX);
- fwrite($hLogFile, serialize($aQueryData)."\n");
+ fwrite($hLogFile, base64_encode(serialize($aQueryData))."\n");
fflush($hLogFile);
flock($hLogFile, LOCK_UN);
fclose($hLogFile);
@@ -1291,27 +1291,53 @@ abstract class DBSearch
}
}
- /**
- * @internal
- *
- * @param $aArgs
- * @param $aGroupByExpr
- * @param $sSql
- *
- * @throws MySQLException
- */
- protected function AddQueryTraceGroupBy($aArgs, $aGroupByExpr, $sSql)
+ /**
+ * @internal
+ *
+ * @param $aArgs
+ * @param $aGroupByExpr
+ * @param $bExcludeNullValues
+ * @param $aSelectExpr
+ * @param $aOrderBy
+ * @param $iLimitCount
+ * @param $iLimitStart
+ * @param $sSql
+ *
+ * @throws \MySQLException
+ */
+ protected function AddQueryTraceGroupBy($aArgs, $aGroupByExpr, $bExcludeNullValues, $aSelectExpr, $aOrderBy, $iLimitCount, $iLimitStart, $sSql)
{
- if (self::$m_bTraceQueries)
+ if (self::$m_bTraceQueries || (utils::GetConfig()->Get('log_kpi_record_oql') == 1))
{
$aQueryData = array(
'type' => 'group_by',
'filter' => $this,
+ 'order_by' => $aOrderBy,
'args' => $aArgs,
- 'group_by_expr' => $aGroupByExpr
+ 'group_by_expr' => $aGroupByExpr,
+ 'exclude_null_values' => $bExcludeNullValues,
+ 'select_expr' => $aSelectExpr,
+ 'limit_count' => $iLimitCount,
+ 'limit_start' => $iLimitStart,
);
$sOql = $this->ToOQL(true, $aArgs);
self::AddQueryTrace($aQueryData, $sOql, $sSql);
+ if (utils::GetConfig()->Get('log_kpi_record_oql') == 1)
+ {
+ $aQueryData['oql'] = $sOql;
+ unset($aQueryData['filter']);
+
+ $hLogFile = @fopen(APPROOT.'log/oql_group_by_records.txt', 'a');
+ if ($hLogFile !== false)
+ {
+ flock($hLogFile, LOCK_EX);
+ fwrite($hLogFile, base64_encode(serialize($aQueryData))."\n");
+ fflush($hLogFile);
+ flock($hLogFile, LOCK_UN);
+ fclose($hLogFile);
+ }
+ }
+
}
}
diff --git a/core/querybuildercontext.class.inc.php b/core/querybuildercontext.class.inc.php
index 87cd5ed27..cd2afbd6b 100644
--- a/core/querybuildercontext.class.inc.php
+++ b/core/querybuildercontext.class.inc.php
@@ -34,7 +34,19 @@ class QueryBuilderContext
public $m_oQBExpressions;
- public function __construct($oFilter, $aModifierProperties, $aGroupByExpr = null, $aSelectedClasses = null, $aSelectExpr = null)
+ /**
+ * QueryBuilderContext constructor.
+ *
+ * @param $oFilter
+ * @param $aModifierProperties
+ * @param array $aGroupByExpr
+ * @param array $aSelectedClasses
+ * @param array $aSelectExpr
+ * @param array $aAttToLoad
+ *
+ * @throws \CoreException
+ */
+ public function __construct($oFilter, $aModifierProperties, $aGroupByExpr = null, $aSelectedClasses = null, $aSelectExpr = null, $aAttToLoad = null)
{
$this->m_oRootFilter = $oFilter;
$this->m_oQBExpressions = new QueryBuilderExpressions($oFilter, $aGroupByExpr, $aSelectExpr);
@@ -53,6 +65,44 @@ class QueryBuilderContext
// For the unions, the selected classes can be upper in the hierarchy (lowest common ancestor)
$this->m_aSelectedClasses = $aSelectedClasses;
}
+
+ // Add all the attribute of interest
+ foreach ($this->m_aSelectedClasses as $sClassAlias => $sClass)
+ {
+ // default to the whole list of attributes + the very std id/finalclass
+ $this->m_oQBExpressions->AddSelect($sClassAlias.'id', new FieldExpression('id', $sClassAlias));
+ if (is_null($aAttToLoad) || !array_key_exists($sClassAlias, $aAttToLoad))
+ {
+ $sSelectedClass = $this->GetSelectedClass($sClassAlias);
+ $aAttList = MetaModel::ListAttributeDefs($sSelectedClass);
+ }
+ else
+ {
+ $aAttList = $aAttToLoad[$sClassAlias];
+ }
+ foreach ($aAttList as $sAttCode => $oAttDef)
+ {
+ if (!$oAttDef->IsScalar())
+ {
+ continue;
+ }
+ // keep because it can be used for sorting - if (!$oAttDef->LoadInObject()) continue;
+
+ if ($oAttDef->IsBasedOnOQLExpression())
+ {
+ $oExpression = new FieldExpression($sAttCode, $sClassAlias);
+ $this->m_oQBExpressions->AddSelect($sClassAlias.$sAttCode, $oExpression);
+ }
+ else
+ {
+ foreach ($oAttDef->GetSQLExpressions() as $sColId => $sSQLExpr)
+ {
+ $oExpression = new FieldExpression($sAttCode.$sColId, $sClassAlias);
+ $this->m_oQBExpressions->AddSelect($sClassAlias.$sAttCode.$sColId, $oExpression);
+ }
+ }
+ }
+ }
}
public function GetRootFilter()
diff --git a/core/querybuilderexpressions.class.inc.php b/core/querybuilderexpressions.class.inc.php
index 2bd5d911c..9583f95db 100644
--- a/core/querybuilderexpressions.class.inc.php
+++ b/core/querybuilderexpressions.class.inc.php
@@ -119,14 +119,21 @@ class QueryBuilderExpressions
return $aTables;
}
- public function GetUnresolvedFields($sAlias, &$aUnresolved)
+ /**
+ * @param $sAlias
+ *
+ * @return array of unresolved fields
+ */
+ public function GetUnresolvedFields($sAlias)
{
+ $aUnresolved = array();
$this->m_oConditionExpr->GetUnresolvedFields($sAlias, $aUnresolved);
+
foreach ($this->m_aSelectExpr as $sColAlias => $oExpr)
{
$oExpr->GetUnresolvedFields($sAlias, $aUnresolved);
}
- if ($this->m_aGroupByExpr)
+ if (!empty($this->m_aGroupByExpr))
{
foreach ($this->m_aGroupByExpr as $sColAlias => $oExpr)
{
@@ -137,6 +144,7 @@ class QueryBuilderExpressions
{
$oExpression->GetUnresolvedFields($sAlias, $aUnresolved);
}
+ return $aUnresolved;
}
public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
diff --git a/core/sqlobjectquerybuilder.class.inc.php b/core/sqlobjectquerybuilder.class.inc.php
index 86d3f7fc8..b36035e4f 100644
--- a/core/sqlobjectquerybuilder.class.inc.php
+++ b/core/sqlobjectquerybuilder.class.inc.php
@@ -43,43 +43,106 @@ class SQLObjectQueryBuilder
*/
public function BuildSQLQueryStruct($aAttToLoad, $bGetCount, $aModifierProperties, $aGroupByExpr = null, $aSelectedClasses = null, $aSelectExpr = null)
{
- $oBuild = new QueryBuilderContext($this->oDBObjetSearch, $aModifierProperties, $aGroupByExpr, $aSelectedClasses, $aSelectExpr);
+ if ($bGetCount)
+ {
+ // Avoid adding all the fields for counts
+ $aAttToLoad = array();
+ foreach ($this->oDBObjetSearch->GetSelectedClasses() as $sClassAlias => $sClass)
+ {
+ $aAttToLoad[$sClassAlias] = array();
+ }
+ }
- $oSQLQuery = $this->MakeSQLObjectQuery($oBuild, $aAttToLoad, array());
+ $oBuild = new QueryBuilderContext($this->oDBObjetSearch, $aModifierProperties, $aGroupByExpr, $aSelectedClasses, $aSelectExpr, $aAttToLoad);
+
+ $oSQLQuery = $this->MakeSQLObjectQueryRoot($oBuild, $aAttToLoad, array(), $aGroupByExpr, $aSelectExpr);
+
+ return $oSQLQuery;
+ }
+
+ /**
+ * @return \SQLObjectQuery|null
+ * @throws \CoreException
+ */
+ public function MakeSQLObjectDeleteQuery()
+ {
+ $aModifierProperties = MetaModel::MakeModifierProperties($this->oDBObjetSearch);
+ $aAttToLoad = array($this->oDBObjetSearch->GetClassAlias() => array());
+ $oBuild = new QueryBuilderContext($this->oDBObjetSearch, $aModifierProperties, null, null, null, $aAttToLoad);
+ $oSQLQuery = $this->MakeSQLObjectQueryRoot($oBuild, $aAttToLoad, array());
+ return $oSQLQuery;
+ }
+
+ /**
+ * @param array $aValues an array of $sAttCode => $value
+ *
+ * @return \SQLObjectQuery|null
+ * @throws \CoreException
+ */
+ public function MakeSQLObjectUpdateQuery($aValues)
+ {
+ $aModifierProperties = MetaModel::MakeModifierProperties($this->oDBObjetSearch);
+ $aRequested = array(); // Requested attributes are the updated attributes
+ foreach ($aValues as $sAttCode => $value)
+ {
+ $aRequested[$sAttCode] = MetaModel::GetAttributeDef($this->oDBObjetSearch->GetClass(), $sAttCode);
+ }
+ $aAttToLoad = array($this->oDBObjetSearch->GetClassAlias() => $aRequested);
+ $oBuild = new QueryBuilderContext($this->oDBObjetSearch, $aModifierProperties, null, null, null, $aAttToLoad);
+ $oSQLQuery = $this->MakeSQLObjectQueryRoot($oBuild, $aAttToLoad, $aValues);
+ return $oSQLQuery;
+ }
+
+ /**
+ * @param \QueryBuilderContext $oBuild
+ * @param null $aAttToLoad
+ * @param array $aValues
+ * @param array $aGroupByExpr
+ * @param array $aSelectExpr
+ *
+ * @return null|SQLObjectQuery
+ * @throws \CoreException
+ */
+ private function MakeSQLObjectQueryRoot($oBuild, $aAttToLoad = null, $aValues = array(), $aGroupByExpr = null, $aSelectExpr = null)
+ {
+ $oSQLQuery = $this->MakeSQLObjectQuery($oBuild, $aAttToLoad, $aValues);
+
+ /**
+ * Add SQL Level additional information
+ */
$oSQLQuery->SetCondition($oBuild->m_oQBExpressions->GetCondition());
+
if (is_array($aGroupByExpr))
{
$aCols = $oBuild->m_oQBExpressions->GetGroupBy();
$oSQLQuery->SetGroupBy($aCols);
$oSQLQuery->SetSelect($aCols);
+
+ if (!empty($aSelectExpr))
+ {
+ // Get the fields corresponding to the select expressions
+ foreach($oBuild->m_oQBExpressions->GetSelect() as $sAlias => $oExpr)
+ {
+ if (key_exists($sAlias, $aSelectExpr))
+ {
+ $oSQLQuery->AddSelect($sAlias, $oExpr);
+ }
+ }
+ }
}
else
{
$oSQLQuery->SetSelect($oBuild->m_oQBExpressions->GetSelect());
}
- if ($aSelectExpr)
- {
- // Get the fields corresponding to the select expressions
- foreach($oBuild->m_oQBExpressions->GetSelect() as $sAlias => $oExpr)
- {
- if (key_exists($sAlias, $aSelectExpr))
- {
- $oSQLQuery->AddSelect($sAlias, $oExpr);
- }
- }
- }
$aMandatoryTables = null;
if ($this->bOptimizeQueries)
{
- if ($bGetCount)
- {
- // Simplify the query if just getting the count
- $oSQLQuery->SetSelect(array());
- }
$oBuild->m_oQBExpressions->GetMandatoryTables($aMandatoryTables);
$oSQLQuery->OptimizeJoins($aMandatoryTables);
}
+
+ // Filter for archive flag
// Filter tables as late as possible: do not interfere with the optimization process
foreach ($oBuild->GetFilteredTables() as $sTableAlias => $aConditions)
{
@@ -95,44 +158,6 @@ class SQLObjectQueryBuilder
return $oSQLQuery;
}
-
- /**
- * @return \SQLObjectQuery|null
- * @throws \CoreException
- */
- public function MakeSQLObjectDeleteQuery()
- {
- $aModifierProperties = MetaModel::MakeModifierProperties($this->oDBObjetSearch);
- $oBuild = new QueryBuilderContext($this->oDBObjetSearch, $aModifierProperties);
- $oSQLQuery = $this->MakeSQLObjectQuery($oBuild, array($this->oDBObjetSearch->GetClassAlias() => array()), array());
- $oSQLQuery->SetCondition($oBuild->m_oQBExpressions->GetCondition());
- $oSQLQuery->SetSelect($oBuild->m_oQBExpressions->GetSelect());
- $oSQLQuery->OptimizeJoins(array());
- return $oSQLQuery;
- }
-
- /**
- * @param array $aValues an array of $sAttCode => $value
- *
- * @return \SQLObjectQuery|null
- * @throws \CoreException
- */
- public function MakeSQLObjectUpdateQuery($aValues)
- {
- $aModifierProperties = MetaModel::MakeModifierProperties($this->oDBObjetSearch);
- $oBuild = new QueryBuilderContext($this->oDBObjetSearch, $aModifierProperties);
- $aRequested = array(); // Requested attributes are the updated attributes
- foreach ($aValues as $sAttCode => $value)
- {
- $aRequested[$sAttCode] = MetaModel::GetAttributeDef($this->oDBObjetSearch->GetClass(), $sAttCode);
- }
- $oSQLQuery = $this->MakeSQLObjectQuery($oBuild, array($this->oDBObjetSearch->GetClassAlias() => $aRequested), $aValues);
- $oSQLQuery->SetCondition($oBuild->m_oQBExpressions->GetCondition());
- $oSQLQuery->SetSelect($oBuild->m_oQBExpressions->GetSelect());
- $oSQLQuery->OptimizeJoins(array());
- return $oSQLQuery;
- }
-
/**
* @param \QueryBuilderContext $oBuild
* @param null $aAttToLoad
@@ -140,60 +165,20 @@ class SQLObjectQueryBuilder
* @return null|SQLObjectQuery
* @throws \CoreException
*/
- public function MakeSQLObjectQuery($oBuild, $aAttToLoad = null, $aValues = array())
+ private function MakeSQLObjectQuery($oBuild, $aAttToLoad = null, $aValues = array())
{
// Note: query class might be different than the class of the filter
// -> this occurs when we are linking our class to an external class (referenced by, or pointing to)
$sClass = $this->oDBObjetSearch->GetFirstJoinedClass();
$sClassAlias = $this->oDBObjetSearch->GetFirstJoinedClassAlias();
- $bIsOnQueriedClass = array_key_exists($sClassAlias, $oBuild->GetRootFilter()->GetSelectedClasses());
-
- //self::DbgTrace("Entering: ".$this->oDBObjetSearch->ToOQL().", ".($bIsOnQueriedClass ? "MAIN" : "SECONDARY"));
-
- //$sRootClass = MetaModel::GetRootClass($sClass);
- $sKeyField = MetaModel::DBGetKey($sClass);
-
- if ($bIsOnQueriedClass)
- {
- // default to the whole list of attributes + the very std id/finalclass
- $oBuild->m_oQBExpressions->AddSelect($sClassAlias.'id', new FieldExpression('id', $sClassAlias));
- if (is_null($aAttToLoad) || !array_key_exists($sClassAlias, $aAttToLoad))
- {
- $sSelectedClass = $oBuild->GetSelectedClass($sClassAlias);
- $aAttList = MetaModel::ListAttributeDefs($sSelectedClass);
- }
- else
- {
- $aAttList = $aAttToLoad[$sClassAlias];
- }
- foreach ($aAttList as $sAttCode => $oAttDef)
- {
- if (!$oAttDef->IsScalar()) continue;
- // keep because it can be used for sorting - if (!$oAttDef->LoadInObject()) continue;
-
- if ($oAttDef->IsBasedOnOQLExpression())
- {
- $oBuild->m_oQBExpressions->AddSelect($sClassAlias.$sAttCode, new FieldExpression($sAttCode, $sClassAlias));
- }
- else
- {
- foreach ($oAttDef->GetSQLExpressions() as $sColId => $sSQLExpr)
- {
- $oBuild->m_oQBExpressions->AddSelect($sClassAlias.$sAttCode.$sColId, new FieldExpression($sAttCode.$sColId, $sClassAlias));
- }
- }
- }
- }
- //echo "oQBExpr ".__LINE__.":
\n".print_r($oBuild->m_oQBExpressions, true)."
\n";
- $aExpectedAtts = array(); // array of (attcode => fieldexpression)
- //echo "".__LINE__.": GetUnresolvedFields($sClassAlias, ...)
\n";
- $oBuild->m_oQBExpressions->GetUnresolvedFields($sClassAlias, $aExpectedAtts);
+ // array of (attcode => fieldexpression)
+ $aExpectedAtts = $oBuild->m_oQBExpressions->GetUnresolvedFields($sClassAlias);
// Compute a clear view of required joins (from the current class)
// Build the list of external keys:
// -> ext keys required by an explicit join
- // -> ext keys mentionned in a 'pointing to' condition
+ // -> ext keys mentioned in a 'pointing to' condition
// -> ext keys required for an external field
// -> ext keys required for a friendly name
//
@@ -202,15 +187,6 @@ class SQLObjectQueryBuilder
// Optimization: could be partially computed once for all (cached) ?
//
- if ($bIsOnQueriedClass)
- {
- // Get all Ext keys for the queried class (??)
- foreach(MetaModel::GetKeysList($sClass) as $sKeyAttCode)
- {
- $sKeyTableClass = MetaModel::GetAttributeOrigin($sClass, $sKeyAttCode);
- $aExtKeys[$sKeyTableClass][$sKeyAttCode] = array();
- }
- }
// Get all Ext keys used by the filter
foreach ($this->oDBObjetSearch->GetCriteria_PointingTo() as $sKeyAttCode => $aPointingTo)
{
@@ -304,6 +280,7 @@ class SQLObjectQueryBuilder
}
}
+ $sKeyField = MetaModel::DBGetKey($sClass);
$bRootFirst = MetaModel::GetConfig()->Get('optimize_requests_for_join_count');
if ($bRootFirst)
{
@@ -483,8 +460,7 @@ class SQLObjectQueryBuilder
$sTableAlias = $oBuild->GenerateTableAlias($sTargetAlias.'_'.$sTable, $sTable);
$aTranslation = array();
- $aExpectedAtts = array();
- $oBuild->m_oQBExpressions->GetUnresolvedFields($sTargetAlias, $aExpectedAtts);
+ $aExpectedAtts = $oBuild->m_oQBExpressions->GetUnresolvedFields($sTargetAlias);
$bIsOnQueriedClass = array_key_exists($sTargetAlias, $oBuild->GetRootFilter()->GetSelectedClasses());