N°2589 - Infinite loops when logging with a Contact having a non empt…

…y TagSet field

Add ListParameters to DBSearch for nested queries

core/dbobjectsearch.class.php

@@ -2097,4 +2097,9 @@ static public function GetPolymorphicExpression($sClass, $sAttCode)
 		}
 		return $oExpression;
 	}
+
+	public function ListParameters()
+	{
+		return $this->GetCriteria()->ListParameters();
+	}
 }

core/dbsearch.class.php

@@ -1230,6 +1230,8 @@ public abstract function GetSQLQueryStructure(
 	 */
 	public abstract function GetCriteria();
 
+	public abstract function ListParameters();
+
     /**
      * Shortcut to add efficient IN condition
      *

core/dbunionsearch.class.php

@@ -728,4 +728,14 @@ public function AddConditionForInOperatorUsingParam($sFilterCode, $aValues, $bPo
 			$oSearch->AddConditionExpression($oInCondition);
 		}
 	}
+
+	public function ListParameters()
+	{
+		$aParameters = array();
+		foreach ($this->aSearches as $oSearch)
+		{
+			$aParameters = array_merge($aParameters, $oSearch->ListParameters());
+		}
+		return $aParameters;
+	}
 }

core/oql/expression.class.inc.php

@@ -2624,7 +2624,7 @@ public function ListConstantFields()
 
 	public function ListParameters()
 	{
-		return array();
+		return $this->m_oValue->ListParameters();
 	}
 
 	public function RenameParam($sOldName, $sNewName)

test/core/ExpressionTest.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace Combodo\iTop\Test\UnitTest\Core;
+
+use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
+use Expression;
+
+class ExpressionTest extends ItopDataTestCase
+{
+	const USE_TRANSACTION = false;
+
+	/**
+	 * @dataProvider ListParametersProvider
+	 * @param $sOQL
+	 * @param $aExpected
+	 *
+	 * @throws \OQLException
+	 */
+	public function testListParameters($sOQL, $aExpected)
+	{
+		$oExpression = Expression::FromOQL($sOQL);
+		$aParameters = $oExpression->ListParameters();
+		$aResult = array();
+		foreach ($aParameters as $oVarExpr)
+		{
+			/** var \VariableExpression $oVarExpr */
+			$aResult[] = $oVarExpr->RenderExpression();
+		}
+		$this->debug($aResult);
+		$this->assertSame(array_diff($aExpected, $aResult), array_diff($aResult, $aExpected));
+	}
+
+	public function ListParametersProvider()
+	{
+		return array(
+			array('1', array()),
+			array(':id = 2', array(':id')),
+			array('expiration_date < DATE_SUB(NOW(), INTERVAL :expiration_days DAY)', array(':expiration_days')),
+			array('id IN (SELECT Organization WHERE :id = 2)', array(':id')),
+			array('id IN (:id, 2)', array(':id')),
+			array("B.name LIKE :name", array(':name')),
+			array("name REGEXP :regexp", array(':regexp')),
+			array(" t.agent_id = :current_contact_id", array(':current_contact_id')),
+			array("INET_ATON(dev.managementip) > INET_ATON('10.22.32.224') AND INET_ATON(:ip) < INET_ATON('10.22.32.255')", array(':ip')),
+		);
+	}
+}

test/core/OQLTest.php

@@ -402,6 +402,7 @@ public function testMakeSelectQuery($sOQL, $sExpectedExceptionClass = '')
 		}
 		catch (Exception $e)
 		{
+			$this->debug($e->getMessage());
 			$sExceptionClass = get_class($e);
 		}