Advanced Search: IN/NOT IN

SVN:b1162[5422]
This commit is contained in:
Eric Espié
2018-03-14 08:50:54 +00:00
parent 5632f9786c
commit 9499799f80

View File

@@ -129,6 +129,11 @@ class CriterionToOQL extends CriterionConversionAbstract
$sClass = $aCriteria['class']; $sClass = $aCriteria['class'];
$aValues = $aCriteria['values']; $aValues = $aCriteria['values'];
if (count($aValues) == 0)
{
return "({$sRef} = '')";
}
try try
{ {
$aAttributeDefs = \MetaModel::ListAttributeDefs($sClass); $aAttributeDefs = \MetaModel::ListAttributeDefs($sClass);
@@ -163,6 +168,11 @@ class CriterionToOQL extends CriterionConversionAbstract
} }
$sInList = implode(',', $aInValues); $sInList = implode(',', $aInValues);
if (count($aInValues) == 1)
{
return "({$sRef} = '$sInList')";
}
return "({$sRef} IN ($sInList))"; return "({$sRef} IN ($sInList))";
} }