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

Parser for Short Hand Syntax

Browse Source 
SVN:b1312[5748]
This commit is contained in:
Eric Espié
2018-04-26 15:26:41 +00:00
parent 1900546440
commit 30494756fc
3 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/dbobjectsearch.class.php
View File

@@ -1264,7 +1264,7 @@ class DBObjectSearch extends DBSearch
}
elseif ($oExpression instanceof ExternalFieldOqlExpression)
{
return new TrueExpression();
return new ExternalFieldExpression($oExpression->GetName(), $oExpression->GetExpressions());
}
elseif ($oExpression instanceof FieldOqlExpression)
{

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

@@ -843,9 +843,12 @@ class FalseExpression extends ScalarExpression
class ExternalFieldExpression extends UnaryExpression
{
public function __construct($value)
protected $m_aFieldExpressions = array();
protected $m_sName;
public function __construct($sName, $aExpressions)
{
parent::__construct($value);
parent::__construct($sName);
}
}

27
core/oql/oqlquery.class.inc.php
View File

@@ -170,30 +170,37 @@ class ScalarOqlExpression extends ScalarExpression implements CheckableExpressio
class ExternalFieldOqlExpression extends ExternalFieldExpression implements CheckableExpression
{
private $aExpression = array();
protected $m_aExpression = array();
protected $m_sName = null;
function __construct($oExpr1, $oExpr2)
{
$sName = '';
$this->m_sName = '';
if ($oExpr1 instanceof ExternalFieldOqlExpression)
{
$this->aExpression = $oExpr1->GetExpressions();
$this->m_aExpression = $oExpr1->GetExpressions();
}
else
{
$this->aExpression[] = $oExpr1;
$this->m_aExpression[] = $oExpr1;
}
$this->aExpression[] = $oExpr2;
$sName = $oExpr1->GetValue().'->'.$oExpr2->GetValue();
$this->m_aExpression[] = $oExpr2;
$this->m_sName = $oExpr1->GetValue().'->'.$oExpr2->GetValue();
parent::__construct($sName);
parent::__construct($this->m_sName, $this->m_aExpression);
}
public function GetExpressions()
{
return $this->aExpression;
return $this->m_aExpression;
}
public function GetName()
{
return $this->m_sName;
}
/**
@@ -209,7 +216,7 @@ class ExternalFieldOqlExpression extends ExternalFieldExpression implements Chec
public function Check(ModelReflection $oModelReflection, $aAliases, $sSourceQuery)
{
$sParentAlias = null;
foreach($this->aExpression as $i => $oFieldOqlExpression)
foreach($this->m_aExpression as $i => $oFieldOqlExpression)
{
if (is_null($sParentAlias))
{
@@ -225,7 +232,7 @@ class ExternalFieldOqlExpression extends ExternalFieldExpression implements Chec
$sTargetClass = $oModelReflection->GetAttributeProperty($sClass, $oFieldOqlExpression->GetName(), 'targetclass');
if (is_null($sTargetClass))
{
if ($i != (count($this->aExpression) - 1))
if ($i != (count($this->m_aExpression) - 1))
{
throw new OqlNormalizeException('Forbiden operation for attribute', $sSourceQuery, $oFieldOqlExpression->GetNameDetails(), $oModelReflection->GetFiltersList($sClass));
}