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

Latest data model (Erwan) and few cosmetic changes (safer display of object hyperlinks)

Browse Source 
SVN:trunk[119]
This commit is contained in:
Romain Quetiez
2009-09-07 14:29:49 +00:00
parent 7eac4342ec
commit 3c1df7332c
30 changed files with 1139 additions and 448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/coreexception.class.inc.php
View File

@@ -54,6 +54,11 @@ class CoreException extends Exception
return MyHelpers::get_callstack_html(0, $this->getTrace());
// return "<pre>\n".$this->getTraceAsString()."</pre>\n";
}
public function addInfo($sKey, $value)
{
$this->m_aContextData[$sKey] = $value;
}
}
class CoreWarning extends CoreException

15
core/metamodel.class.php
View File

@@ -1210,7 +1210,8 @@ abstract class MetaModel
// Query caching
//
$bQueryCacheEnabled = true;
$sOqlQuery = $oFilter->ToOql();
$aParams = array();
$sOqlQuery = $oFilter->ToOql($aParams); // Render with arguments in clear
if ($bQueryCacheEnabled)
{
if (array_key_exists($sOqlQuery, self::$m_aQueryStructCache))
@@ -1254,7 +1255,17 @@ abstract class MetaModel
// Go
//
$aScalarArgs = array_merge(self::PrepareQueryArguments($aArgs), $oFilter->GetInternalParams());
$sRes = $oSelect->RenderSelect($aOrderBy, $aScalarArgs);
try
{
$sRes = $oSelect->RenderSelect($aOrderBy, $aScalarArgs);
}
catch (MissingQueryArgument $e)
{
// Add some information...
$e->addInfo('OQL', $sOqlQuery);
throw $e;
}
if (self::$m_bTraceQueries)
{