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

N°1213 - Allow NOT IN SELECT in OQL syntax - Fix unit tests

Browse Source
This commit is contained in:
Eric
2019-12-04 15:39:44 +01:00
parent 1010274c48
commit a74cff6902
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/dbobjectsearch.class.php
View File

@@ -1635,6 +1635,13 @@ class DBObjectSearch extends DBSearch
}
}
/**
* @param \OqlQuery $oOqlQuery
* @param string $sQuery
*
* @throws \CoreException
* @throws \Exception
*/
public function InitFromOqlQuery(OqlQuery $oOqlQuery, $sQuery)
{
$oModelReflection = new ModelReflectionRuntime();
@@ -1751,6 +1758,10 @@ class DBObjectSearch extends DBSearch
foreach ($oOqlQuery->GetSelectedClasses() as $oClassDetails)
{
$sClassToSelect = $oClassDetails->GetValue();
if (!array_key_exists($sClassToSelect, $aAliases))
{
throw new CoreException("$sClassToSelect is not a valid alias");
}
$this->m_aSelectedClasses[$sClassToSelect] = $aAliases[$sClassToSelect];
}
$this->m_aClasses = $aAliases;