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

N°1213 - Allow NOT IN SELECT in OQL syntax - support of UNION queries and "nested nested" queries

Browse Source
This commit is contained in:
Eric
2019-12-03 17:14:53 +01:00
parent b415b1eeae
commit 3ae4ca89f4
9 changed files with 80 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -504,12 +504,7 @@ class BinaryExpression extends Expression
$oRight = $this->GetRightExpr()->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
return new BinaryExpression($oLeft, $this->GetOperator(), $oRight);
}
public function GetCriteria()
{
$oLeft = $this->GetLeftExpr()->GetCriteria();
$oRight = $this->GetRightExpr()->GetCriteria();
return new BinaryExpression($oLeft, $this->GetOperator(), $oRight);
}
public function ListRequiredFields()
{
$aLeft = $this->GetLeftExpr()->ListRequiredFields();
@@ -1968,27 +1963,17 @@ class NestedQueryExpression extends Expression
public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
{
// Check and prepare the select information
$oExpression = $this->m_oNestedQuery->GetCriteria()->Translate($aTranslationData, $bMatchAll , $bMarkFieldsAsResolved );
$this->m_oNestedQuery->ResetCondition();
$this->m_oNestedQuery->AddConditionExpression($oExpression);
$this->m_oNestedQuery->TranslateConditions($aTranslationData, $bMatchAll , $bMarkFieldsAsResolved );
return clone $this;
}
/*TODO*/
public function ListRequiredFields()
{
$aRes = array();
foreach ($this->m_oNestedQuery->getCondition() as $oExpr)
{
$aRes = array_merge($aRes, $oExpr->ListRequiredFields());
}
return $aRes;
return array();
}
/*TODO */
public function CollectUsedParents(&$aTable)
{
}
public function ListConstantFields()