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

Internal: DBObjectSearch->AddCondition, allow the case $value = null (otherwise failing because the keyword null has not yet been implemented in OQL)

Browse Source 
SVN:trunk[4744]
This commit is contained in:
Romain Quetiez
2017-05-19 09:15:22 +00:00
parent 018d6a98e9
commit 3b48428897
1 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
core/dbobjectsearch.class.php
View File

@@ -439,23 +439,46 @@ class DBObjectSearch extends DBSearch
break;
default:
$this->m_aParams[$sFilterCode] = $value;
$sOperator = $sOpCode;
if ($value === null)
{
switch ($sOpCode)
{
case '=':
$sOpCode = '*Expression*';
$oExpression = new FunctionExpression('ISNULL', array($oField));
break;
case '!=':
$sOpCode = '*Expression*';
$oExpression = new FunctionExpression('ISNULL', array($oField));
$oExpression = new BinaryExpression($oExpression, '=', new ScalarExpression(0));
break;
default:
throw new Exception("AddCondition on null value: unsupported operator '$sOpCode''");
}
}
else
{
$this->m_aParams[$sFilterCode] = $value;
$sOperator = $sOpCode;
}
}
switch($sOpCode)
{
case "IN":
case "NOTIN":
$oNewCondition = Expression::FromOQL($sOQLCondition);
break;
case '*Expression*':
$oNewCondition = $oExpression;
break;
case "IN":
case "NOTIN":
$oNewCondition = Expression::FromOQL($sOQLCondition);
break;
case 'Contains':
case 'Begins with':
case 'Finishes with':
default:
$oRightExpr = new VariableExpression($sFilterCode);
$oNewCondition = new BinaryExpression($oField, $sOperator, $oRightExpr);
case 'Contains':
case 'Begins with':
case 'Finishes with':
default:
$oRightExpr = new VariableExpression($sFilterCode);
$oNewCondition = new BinaryExpression($oField, $sOperator, $oRightExpr);
}
$this->AddConditionExpression($oNewCondition);