[BUGFIX] Remove restrictions from SQL in InstallTool

Since the context of the install tool can now be either standalone or backend, SQL queries need to be adjusted so that Doctrine restrictions don't change their results. Resolves: #82360 Releases: master Change-Id: Ic1934f06f73d6212d108658ad655228f2e983cc3 Reviewed-on: https://review.typo3.org/53976 Tested-by: TYPO3com <no-reply@typo3.com> Reviewed-by: Matthias Vogel <typo3@kanti.de> Tested-by: Matthias Vogel <typo3@kanti.de> Reviewed-by: Jan Helke <typo3@helke.de> Tested-by: Jan Helke <typo3@helke.de>
TYPO3 · Sep 8, 2017 · 8ea2cea · 8ea2cea
1 parent 949e4de
commit 8ea2cea
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/typo3/sysext/install/Classes/Controller/Action/Ajax/SystemMaintainerWrite.php b/typo3/sysext/install/Classes/Controller/Action/Ajax/SystemMaintainerWrite.php
@@ -45,6 +45,8 @@ protected function executeAction(): array
         }
 
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('be_users');
+        $queryBuilder->getRestrictions()->removeAll();
+
         $validatedUserList = $queryBuilder
             ->select('uid')
             ->from('be_users')

diff --git a/typo3/sysext/install/Classes/Updates/StartModuleUpdate.php b/typo3/sysext/install/Classes/Updates/StartModuleUpdate.php
@@ -35,9 +35,10 @@ class StartModuleUpdate extends AbstractUpdate
      */
     public function checkForUpdate(&$description)
     {
-        $statement = GeneralUtility::makeInstance(ConnectionPool::class)
-            ->getConnectionForTable('be_users')
-            ->select(['uid', 'uc'], 'be_users', []);
+        $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('be_users');
+        $queryBuilder->getRestrictions()->removeAll();
+
+        $statement = $queryBuilder->select('uid', 'uc')->from('be_users')->execute();
         $needsExecution = false;
         while ($backendUser = $statement->fetch()) {
             if ($backendUser['uc'] !== null) {
@@ -69,6 +70,7 @@ public function checkForUpdate(&$description)
     public function performUpdate(array &$databaseQueries, &$customMessage)
     {
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('be_users');
+        $queryBuilder->getRestrictions()->removeAll();
         $statement = $queryBuilder->select('uid', 'uc')->from('be_users')->execute();
         while ($backendUser = $statement->fetch()) {
             if ($backendUser['uc'] !== null) {
@@ -79,6 +81,7 @@ public function performUpdate(array &$databaseQueries, &$customMessage)
                 ) {
                     $userConfig['startModule'] = 'help_AboutAbout';
                     $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('be_users');
+                    $queryBuilder->getRestrictions()->removeAll();
                     $queryBuilder->update('be_users')
                         ->where(
                             $queryBuilder->expr()->eq(