BAP-20048: DQL cache issue with parameter with dynamic part in DQL (#28363)

- fixing failing tests

Author: x86demon

src/Oro/Bundle/FilterBundle/Datasource/Orm/OrmFilterDatasourceAdapter.php

@@ -3,6 +3,7 @@
 namespace Oro\Bundle\FilterBundle\Datasource\Orm;
 
 use Doctrine\DBAL\Platforms\MySqlPlatform;
+use Doctrine\ORM\Query\Parameter;
 use Doctrine\ORM\QueryBuilder;
 use Oro\Bundle\BatchBundle\ORM\QueryBuilder\QueryBuilderTools;
 use Oro\Bundle\FilterBundle\Datasource\FilterDatasourceAdapterInterface;
@@ -13,6 +14,8 @@
  */
 class OrmFilterDatasourceAdapter implements FilterDatasourceAdapterInterface
 {
+    private const GENERATED_PARAMETERS_PREFIX = '_gpnp'; // Generated Parameter Name Prefix
+
     /**
      * @var QueryBuilder
      */
@@ -28,6 +31,11 @@ class OrmFilterDatasourceAdapter implements FilterDatasourceAdapterInterface
      */
     private $expressionBuilder;
 
+    /**
+     * @var array
+     */
+    private $parameterNames = [];
+
     /**
      * @param QueryBuilder $qb
      */
@@ -117,7 +125,37 @@ public function setParameter($key, $value, $type = null)
      */
     public function generateParameterName($filterName)
     {
-        return preg_replace('#[^a-z0-9]#i', '', $filterName) . mt_rand();
+        if (!array_key_exists($filterName, $this->parameterNames)) {
+            $this->parameterNames[$filterName] = 0;
+        }
+
+        $usedParameterNames = [];
+        /** @var Parameter $parameter */
+        foreach ($this->qb->getParameters() as $parameter) {
+            $usedParameterNames[$parameter->getName()] = true;
+        }
+
+        return $this->generateUniqueParameterName($filterName, $usedParameterNames);
+    }
+
+    /**
+     * Get parameter name unique for the query.
+     *
+     * @param string $filterName
+     * @param array $usedParameterNames
+     * @return string
+     */
+    private function generateUniqueParameterName($filterName, array $usedParameterNames)
+    {
+        $parameterName = self::GENERATED_PARAMETERS_PREFIX
+            . preg_replace('#[^a-z0-9]#i', '', $filterName)
+            . ++$this->parameterNames[$filterName];
+
+        if (!empty($usedParameterNames[$parameterName])) {
+            return $this->generateUniqueParameterName($filterName, $usedParameterNames);
+        }
+
+        return $parameterName;
     }
 
     /**

src/Oro/Bundle/FilterBundle/Tests/Unit/Datasource/Orm/OrmFilterDatasourceAdapterTest.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Oro\Bundle\FilterBundle\Tests\Unit\Datasource\Orm;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\ORM\Query\Parameter;
+use Doctrine\ORM\QueryBuilder;
+use Oro\Bundle\FilterBundle\Datasource\Orm\OrmFilterDatasourceAdapter;
+
+class OrmFilterDatasourceAdapterTest extends \PHPUnit\Framework\TestCase
+{
+    public function testGenerateParameterName()
+    {
+        $parameters = new ArrayCollection([new Parameter('_gpnpint1', 1)]);
+
+        $qb = $this->createMock(QueryBuilder::class);
+        $qb->expects($this->any())
+            ->method('getParameters')
+            ->willReturn($parameters);
+
+        $adapter1 = new OrmFilterDatasourceAdapter($qb);
+        $adapter2 = new OrmFilterDatasourceAdapter($qb);
+
+        // Check that counters for the same prefix are increased
+        $this->assertEquals('_gpnpstring1', $adapter1->generateParameterName('string'));
+        $this->assertEquals('_gpnpstring2', $adapter1->generateParameterName('string'));
+        // Check that counters are prefix related
+        $this->assertEquals('_gpnpdate1', $adapter1->generateParameterName('date'));
+        // Check that if parameter is present in QB its name will be not generated
+        $this->assertEquals('_gpnpint2', $adapter1->generateParameterName('int'));
+
+        // Check that second adapter use its own counters.
+        $this->assertEquals('_gpnpstring1', $adapter2->generateParameterName('string'));
+    }
+}

src/Oro/Bundle/SegmentBundle/Tests/Unit/Query/DynamicSegmentQueryBuilderTest.php

@@ -95,7 +95,7 @@ function ($matches) use (&$counter) {
         );
         $result = preg_replace('/(ts)(\d+)/', 't1', $result);
         $this->assertSame(
-            'SELECT t1.userName, t1.id FROM AcmeBundle:UserEntity t1 WHERE t1.email LIKE :string1',
+            'SELECT t1.userName, t1.id FROM AcmeBundle:UserEntity t1 WHERE t1.email LIKE :_gpnpstring1',
             $result
         );
     }