N°10081 - DRAFT - Impact analysis nested query considered as being invalid

Refactor NestedQueryExpression to use OQLQuery and update related methods

core/oql/expression.class.inc.php

@@ -2430,24 +2430,25 @@ class ListExpression extends Expression
 
 class NestedQueryExpression extends Expression
 {
-	/** @var DBSearch */
+	/** @var OQLQuery */
 	protected $m_oNestedQuery;
 
-	/*$m_oNestedQuery is an DBSearch object*/
+	/**
+	 * @param OQLQuery $oNestedQuery
+	 */
 	public function __construct($oNestedQuery)
 	{
 		$this->m_oNestedQuery = $oNestedQuery;
 	}
 
 	/**
-	 * @param OQLObjectQuery $oObjQuery
+	 * @param OQLQuery $oObjQuery
 	 *
 	 * @return \NestedQueryExpression
 	 */
 	public static function FromOQLObjectQuery($oObjQuery)
 	{
-		$oExpressions = $oObjQuery->ToDBSearch("");
-		return new NestedQueryExpression($oExpressions);
+		return new NestedQueryExpression($oObjQuery);
 	}
 
 	public function IsTrue()
@@ -2472,19 +2473,22 @@ class NestedQueryExpression extends Expression
 	 */
 	public function RenderExpression($bForSQL = false, &$aArgs = null, $bRetrofitParams = false)
 	{
-		if ($bForSQL)
-		{
-			$aAttToLoad = array();
-			foreach ($this->m_oNestedQuery->GetSelectedClasses() as $sClassAlias => $sClass)
-			{
-				$aAttToLoad[$sClassAlias] = array();
-			}
-			return  '('.$this->m_oNestedQuery->MakeSelectQuery(array(), $aArgs, $aAttToLoad).')';
-		}
-		else
-		{
-			return '('.$this->m_oNestedQuery->ToOQL(false, null, false).')';
-		}
+		// TODO implement in OQLQuery
+		throw new Exception('a nested query cannot be rendered');
+
+//		if ($bForSQL)
+//		{
+//			$aAttToLoad = array();
+//			foreach ($this->m_oNestedQuery->GetSelectedClasses() as $sClassAlias => $sClass)
+//			{
+//				$aAttToLoad[$sClassAlias] = array();
+//			}
+//			return  '('.$this->m_oNestedQuery->MakeSelectQuery(array(), $aArgs, $aAttToLoad).')';
+//		}
+//		else
+//		{
+//			return '('.$this->m_oNestedQuery->ToOQL(false, null, false).')';
+//		}
 	}
 
 	/**
@@ -2504,6 +2508,7 @@ class NestedQueryExpression extends Expression
 
 	/**/
 	public function ApplyParameters($aArgs) {
+		// TODO implement in OQLQuery
 		$this->m_oNestedQuery->ApplyParameters($aArgs);
 	}
 
@@ -2514,6 +2519,7 @@ class NestedQueryExpression extends Expression
 	/**/
 	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true) {
 		// Check and prepare the select information
+		// TODO implement in OQLQuery
 		$this->m_oNestedQuery->TranslateConditions($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
 
 		return clone $this;
@@ -2527,18 +2533,22 @@ class NestedQueryExpression extends Expression
 	}
 
 	public function ListConstantFields() {
+		// TODO implement in OQLQuery
 		return $this->m_oNestedQuery->ListConstantFields();
 	}
 
 	public function ListParameters() {
+		// TODO implement in OQLQuery
 		return $this->m_oNestedQuery->GetExpectedArguments();
 	}
 
 	public function RenameParam($sOldName, $sNewName) {
+		// TODO implement in OQLQuery
 		$this->m_oNestedQuery->RenameParam($sOldName, $sNewName);
 	}
 
 	public function RenameAlias($sOldName, $sNewName) {
+		// TODO implement in OQLQuery
 		$this->m_oNestedQuery->RenameAlias($sOldName, $sNewName);
 	}
 
@@ -2546,6 +2556,7 @@ class NestedQueryExpression extends Expression
 	 * @inheritDoc
 	 */
 	public function ToJSON(&$aArgs = null, $bRetrofitParams = false) {
+		// TODO implement in OQLQuery
 		return $this->m_oNestedQuery->ToJSON();
 	}
 
@@ -2557,6 +2568,7 @@ class NestedQueryExpression extends Expression
 	 * @uses \DBSearch::AllowAllData()
 	 */
 	public function AllowAllData($bAllowAllData = true) {
+		// TODO implement in OQLQuery
 		$this->m_oNestedQuery->AllowAllData($bAllowAllData);
 	}
 }

core/oql/oqlquery.class.inc.php

@@ -193,18 +193,15 @@ class ScalarOqlExpression extends ScalarExpression implements CheckableExpressio
 
 class NestedQueryOqlExpression extends NestedQueryExpression implements CheckableExpression
 {
-	/** @var OQLObjectQuery */
-	private $m_oOQLObjectQuery;
 
 	/**
 	 * NestedQueryOqlExpression constructor.
 	 *
-	 * @param OQLObjectQuery $oOQLObjectQuery
+	 * @param OQLQuery $oOQLObjectQuery
 	 */
-	public function __construct($oOQLObjectQuery)
+	public function __construct(OQLQuery $oOQLObjectQuery)
 	{
-		parent::__construct($oOQLObjectQuery->ToDBSearch(""));
-		$this->m_oOQLObjectQuery = $oOQLObjectQuery;
+		parent::__construct($oOQLObjectQuery);
 	}
 
 	/**
@@ -219,12 +216,12 @@ class NestedQueryOqlExpression extends NestedQueryExpression implements Checkabl
 	 */
 	public function Check(ModelReflection $oModelReflection, $aAliases, $sSourceQuery)
 	{
-		$this->m_oOQLObjectQuery->Check($oModelReflection, "", $aAliases);
+		$this->m_oNestedQuery->Check($oModelReflection, "", $aAliases);
 	}
 
 	public function GetOQLObjectQuery()
 	{
-		return $this->m_oOQLObjectQuery;
+		return $this->m_oNestedQuery;
 	}
 }