ReferenceIndex Post-Patch

ReferenceIndex.php.diff

diff --git a/typo3/sysext/core/Classes/Database/ReferenceIndex.php b/typo3/sysext/core/Classes/Database/ReferenceIndex.php
index a5ea028d9c..39c8998f55 100644
--- a/typo3/sysext/core/Classes/Database/ReferenceIndex.php
+++ b/typo3/sysext/core/Classes/Database/ReferenceIndex.php
@@ -981,6 +981,11 @@ class ReferenceIndex
                 if ($numberOfDeletedRecordsInTargetTable > 0) {
                     $numberOfHandledRecords += $numberOfDeletedRecordsInTargetTable;
                     // List of deleted=0 records in target table that have records in sys_refindex.
+                    // Note: $subQueryBuilder actually fills parameter placeholders for the main $queryBuilder
+                    // That means the subQuery is never meant to be executed on its own, only used to be filled-in
+                    // via $subQueryBuilder->getSQL().
+                    $queryBuilder = $this->connectionPool->getQueryBuilderForTable('sys_refindex');
+                    $queryBuilder->getRestrictions()->removeAll();
                     $subQueryBuilder = $this->connectionPool->getQueryBuilderForTable($tableName);
                     $subQueryBuilder->getRestrictions()->removeAll();
                     $subQueryBuilder
@@ -998,8 +1003,6 @@ class ReferenceIndex
                             $queryBuilder->expr()->eq('sub_' . $tableName . '.' . $tableTca['ctrl']['delete'], 1),
                         );
                     if ($testOnly) {
-                        $queryBuilder = $this->connectionPool->getQueryBuilderForTable('sys_refindex');
-                        $queryBuilder->getRestrictions()->removeAll();
                         $numberOfRemovedIndexes = $queryBuilder
                             ->count('hash')
                             ->from('sys_refindex')
@@ -1010,8 +1013,6 @@ class ReferenceIndex
                             ->executeQuery()
                             ->fetchOne();
                     } else {
-                        $queryBuilder = $this->connectionPool->getQueryBuilderForTable('sys_refindex');
-                        $queryBuilder->getRestrictions()->removeAll();
                         $numberOfRemovedIndexes = $queryBuilder
                             ->delete('sys_refindex')
                             ->where(