[Bug]: Fix missing QueryBuilder parameter support in Listing Dao (pim…

…core#16381) * use getParameters instead of model->getConditionVariables * replace string type cast to getSQL * replace string type cast to getSQL
elevantiq · Jan 24, 2024 · 3737470 · 3737470
1 parent ad458f3
commit 3737470
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/doc/20_Extending_Pimcore/17_Custom_Persistent_Models.md b/doc/20_Extending_Pimcore/17_Custom_Persistent_Models.md
@@ -415,7 +415,7 @@ class Dao extends Listing\Dao\AbstractDao
     public function loadIdList(): array
     {
         $query = $this->getQueryBuilder();
-        $objectIds = $this->db->fetchFirstColumn((string) $query, $this->model->getConditionVariables(), $this->model->getConditionVariableTypes());
+        $objectIds = $this->db->fetchFirstColumn($query->getSQL(), $query->getParameters(), $query->getParameterTypes());
         $this->totalCount = (int) $this->db->fetchOne('SELECT FOUND_ROWS()');
 
         return array_map('intval', $objectIds);
@@ -447,7 +447,7 @@ class Dao extends Listing\Dao\AbstractDao
         $queryBuilder = $this->getQueryBuilder();
         $this->prepareQueryBuilderForTotalCount($queryBuilder, $this->getTableName() . '.id');
 
-        $totalCount = $this->db->fetchOne((string) $queryBuilder, $this->model->getConditionVariables(), $this->model->getConditionVariableTypes());
+        $totalCount = $this->db->fetchOne($queryBuilder->getSql(), $queryBuilder->getParameters(), $queryBuilder->getParameterTypes());
 
         return (int) $totalCount;
     }

diff --git a/models/Asset/Listing/Dao.php b/models/Asset/Listing/Dao.php
@@ -37,7 +37,7 @@ public function load(): array
         $assets = [];
 
         $queryBuilder = $this->getQueryBuilder('assets.id', 'assets.type');
-        $assetsData = $this->db->fetchAllAssociative((string) $queryBuilder, $this->model->getConditionVariables(), $this->model->getConditionVariableTypes());
+        $assetsData = $this->db->fetchAllAssociative($queryBuilder->getSQL(), $queryBuilder->getParameters(), $queryBuilder->getParameterTypes());
 
         foreach ($assetsData as $assetData) {
             if ($assetData['type']) {
@@ -74,7 +74,7 @@ public function getQueryBuilder(...$columns): DoctrineQueryBuilder
     public function loadIdList(): array
     {
         $queryBuilder = $this->getQueryBuilder('assets.id');
-        $assetIds = $this->db->fetchFirstColumn((string) $queryBuilder, $this->model->getConditionVariables(), $this->model->getConditionVariableTypes());
+        $assetIds = $this->db->fetchFirstColumn($queryBuilder->getSql(), $queryBuilder->getParameters(), $queryBuilder->getParameterTypes());
 
         return array_map('intval', $assetIds);
     }
@@ -95,7 +95,7 @@ public function getTotalCount(): int
         $queryBuilder = $this->getQueryBuilder();
         $this->prepareQueryBuilderForTotalCount($queryBuilder, 'assets.id');
 
-        $amount = (int) $this->db->fetchOne((string) $queryBuilder, $this->model->getConditionVariables(), $this->model->getConditionVariableTypes());
+        $amount = (int) $this->db->fetchOne($queryBuilder->getSql(), $queryBuilder->getParameters(), $queryBuilder->getParameterTypes());
 
         return $amount;
     }

diff --git a/models/DataObject/Listing/Dao.php b/models/DataObject/Listing/Dao.php
@@ -78,7 +78,7 @@ public function getTotalCount(): int
         $queryBuilder = $this->getQueryBuilder();
         $this->prepareQueryBuilderForTotalCount($queryBuilder, $this->getTableName() . '.id');
 
-        $totalCount = $this->db->fetchOne((string) $queryBuilder, $this->model->getConditionVariables(), $this->model->getConditionVariableTypes());
+        $totalCount = $this->db->fetchOne($queryBuilder->getSql(), $queryBuilder->getParameters(), $queryBuilder->getParameterTypes());
 
         return (int) $totalCount;
     }
@@ -102,7 +102,7 @@ public function getCount(): int
     public function loadIdList(): array
     {
         $queryBuilder = $this->getQueryBuilder([sprintf('%s as id', $this->getTableName() . '.id'), sprintf('%s as `type`', $this->getTableName() . '.type')]);
-        $objectIds = $this->db->fetchFirstColumn((string) $queryBuilder, $this->model->getConditionVariables(), $this->model->getConditionVariableTypes());
+        $objectIds = $this->db->fetchFirstColumn($queryBuilder->getSql(), $queryBuilder->getParameters(), $queryBuilder->getParameterTypes());
 
         return array_map('intval', $objectIds);
     }

diff --git a/models/Document/Listing/Dao.php b/models/Document/Listing/Dao.php
@@ -39,7 +39,7 @@ public function load(): array
         $documents = [];
         $select = $this->getQueryBuilder('documents.id', 'documents.type');
 
-        $documentsData = $this->db->fetchAllAssociative((string) $select, $this->model->getConditionVariables(), $this->model->getConditionVariableTypes());
+        $documentsData = $this->db->fetchAllAssociative($select->getSQL(), $select->getParameters(), $select->getParameterTypes());
 
         foreach ($documentsData as $documentData) {
             if ($documentData['type']) {
@@ -76,7 +76,7 @@ public function getQueryBuilder(...$columns): DoctrineQueryBuilder
     public function loadIdList(): array
     {
         $queryBuilder = $this->getQueryBuilder('documents.id');
-        $documentIds = $this->db->fetchFirstColumn((string) $queryBuilder, $this->model->getConditionVariables(), $this->model->getConditionVariableTypes());
+        $documentIds = $this->db->fetchFirstColumn($queryBuilder->getSql(), $queryBuilder->getParameters(), $queryBuilder->getParameterTypes());
 
         return array_map('intval', $documentIds);
     }
@@ -87,7 +87,7 @@ public function loadIdList(): array
     public function loadIdPathList(): array
     {
         $queryBuilder = $this->getQueryBuilder('documents.id', 'CONCAT(documents.path, documents.key) as `path`');
-        $documentIds = $this->db->fetchAllAssociative((string) $queryBuilder, $this->model->getConditionVariables(), $this->model->getConditionVariableTypes());
+        $documentIds = $this->db->fetchAllAssociative($queryBuilder->getSql(), $queryBuilder->getParameters(), $queryBuilder->getParameterTypes());
 
         return $documentIds;
     }
@@ -108,7 +108,7 @@ public function getTotalCount(): int
         $queryBuilder = $this->getQueryBuilder();
         $this->prepareQueryBuilderForTotalCount($queryBuilder, 'documents.id');
 
-        $amount = (int) $this->db->fetchOne((string) $queryBuilder, $this->model->getConditionVariables(), $this->model->getConditionVariableTypes());
+        $amount = (int) $this->db->fetchOne($queryBuilder->getSql(), $queryBuilder->getParameters(), $queryBuilder->getParameterTypes());
 
         return $amount;
     }

diff --git a/models/Translation/Listing/Dao.php b/models/Translation/Listing/Dao.php
@@ -68,7 +68,7 @@ public function getAllTranslations(): array
         if (!empty($this->model->getConditionParams()) || !$translations = Cache::load($cacheKey)) {
             $translations = [];
             $queryBuilder->setMaxResults(null); //retrieve all results
-            $translationsData = $this->db->fetchAllAssociative((string) $queryBuilder, $this->model->getConditionVariables());
+            $translationsData = $this->db->fetchAllAssociative($queryBuilder->getSql(), $queryBuilder->getParameters(), $queryBuilder->getParameterTypes());
 
             foreach ($translationsData as $t) {
                 if (!isset($translations[$t['key']])) {
@@ -103,7 +103,7 @@ public function getAllTranslations(): array
     public function loadRaw(): array
     {
         $queryBuilder = $this->getQueryBuilder('*');
-        $translationsData = $this->db->fetchAllAssociative((string) $queryBuilder, $this->model->getConditionVariables());
+        $translationsData = $this->db->fetchAllAssociative($queryBuilder->getSql(), $queryBuilder->getParameters(), $queryBuilder->getParameterTypes());
 
         return $translationsData;
     }
@@ -117,7 +117,7 @@ public function load(): array
 
         if (!empty($this->model->getConditionParams()) || !$translations = Cache::load($cacheKey)) {
             $translations = [];
-            $translationsData = $this->db->fetchAllAssociative((string) $queryBuilder, $this->model->getConditionVariables());
+            $translationsData = $this->db->fetchAllAssociative($queryBuilder->getSql(), $queryBuilder->getParameters(), $queryBuilder->getParameterTypes());
             foreach ($translationsData as $t) {
                 $transObj = Model\Translation::getByKey(id: $t['key'], domain: $this->model->getDomain(), languages: $this->model->getLanguages());