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

OQL arguments: when the value of a query argument is null, it must be considered as being a valid argument (was reported as missing). Improved the error reporting when the argument is in the form :this->attcode and the attcode is not valid for the class of 'this'.

Browse Source 
SVN:trunk[3999]
This commit is contained in:
Romain Quetiez
2016-04-15 15:07:35 +00:00
parent e7eb1ec7e3
commit f436cece4a
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/oql/expression.class.inc.php
View File

@@ -686,10 +686,10 @@ class VariableExpression extends UnaryExpression
public function GetAsScalar($aArgs)
{
$value = null;
$oRet = null;
if (array_key_exists($this->m_sName, $aArgs))
{
$value = $aArgs[$this->m_sName];
$oRet = new ScalarExpression($aArgs[$this->m_sName]);
}
elseif (($iPos = strpos($this->m_sName, '->')) !== false)
{
@@ -700,19 +700,23 @@ class VariableExpression extends UnaryExpression
$oObj = $aArgs[$sParamName.'->object()'];
if ($sAttCode == 'id')
{
$value = $oObj->GetKey();
$oRet = new ScalarExpression($oObj->GetKey());
}
elseif (MetaModel::IsValidAttCode(get_class($oObj), $sAttCode))
{
$oRet = new ScalarExpression($oObj->Get($sAttCode));
}
else
{
$value = $oObj->Get($sAttCode);
throw new CoreException("Query argument {$this->m_sName} not matching any attribute of class ".get_class($oObj));
}
}
}
if (is_null($value))
if (is_null($oRet))
{
throw new MissingQueryArgument('Missing query argument', array('expecting'=>$this->m_sName, 'available'=>array_keys($aArgs)));
}
return new ScalarExpression($value);
return $oRet;
}
}