[TASK] Avoid deprecated doctrine/dbal method 'executeUpdate()'

doctrine/dbal deprecated quite some methods to cleanup their codebase and provided replacements with more speaking method names. Most depcrecated method usages have been replaced in the core, but we missed some. The patch replaces the depcrecated method 'executeUpdate()' with the corresponding 'executeStatement()' method in several places to cleanup this up. This can be done also in 11.5 too, the required minimum version of doctrine/dbal provides these new methods as upwards compatible layer. Resolves: #96389 Releases: main, 11.5 Change-Id: Ibf8f49a27a1c8c4b34bda88a20f4fba6afe45cb8 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/72710 Tested-by: Christian Kuhn <lolli@schwarzbu.ch> Tested-by: core-ci <typo3@b13.com> Tested-by: Benni Mack <benni@typo3.org> Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch> Reviewed-by: Benni Mack <benni@typo3.org>
TYPO3 · Dec 20, 2021 · da29e38 · da29e38
1 parent 7c7705f
commit da29e38
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/typo3/sysext/core/Classes/Database/Connection.php b/typo3/sysext/core/Classes/Database/Connection.php
@@ -335,7 +335,7 @@ public function delete($tableName, array $identifier, array $types = []): int
      */
     public function truncate(string $tableName, bool $cascade = false): int
     {
-        return $this->executeUpdate(
+        return $this->executeStatement(
             $this->getDatabasePlatform()->getTruncateTableSQL(
                 $this->quoteIdentifier($tableName),
                 $cascade

diff --git a/typo3/sysext/core/Classes/Database/Query/BulkInsertQuery.php b/typo3/sysext/core/Classes/Database/Query/BulkInsertQuery.php
@@ -200,7 +200,7 @@ public function execute(): int
             );
         }
 
-        return $this->connection->executeUpdate($this->getSQL(), $this->parameters, $this->types);
+        return $this->connection->executeStatement($this->getSQL(), $this->parameters, $this->types);
     }
 
     /**

diff --git a/typo3/sysext/core/Classes/Database/Schema/ConnectionMigrator.php b/typo3/sysext/core/Classes/Database/Schema/ConnectionMigrator.php
@@ -190,7 +190,7 @@ static function ($columnName) {
 
         foreach ($statements as $statement) {
             try {
-                $this->connection->executeUpdate($statement);
+                $this->connection->executeStatement($statement);
                 $result[$statement] = '';
             } catch (DBALException $e) {
                 $result[$statement] = $e->getPrevious()->getMessage();

diff --git a/typo3/sysext/core/Classes/Database/Schema/SchemaMigrator.php b/typo3/sysext/core/Classes/Database/Schema/SchemaMigrator.php
@@ -217,7 +217,7 @@ public function importStaticData(array $statements, bool $truncate = false): arr
 
             foreach ((array)$perTableStatements as $statement) {
                 try {
-                    $connection->executeUpdate($statement);
+                    $connection->executeStatement($statement);
                     $result[$statement] = '';
                 } catch (DBALException $e) {
                     $result[$statement] = $e->getPrevious()->getMessage();

diff --git a/typo3/sysext/core/Tests/Functional/Database/Schema/SchemaMigratorTest.php b/typo3/sysext/core/Tests/Functional/Database/Schema/SchemaMigratorTest.php
@@ -253,7 +253,7 @@ public function dropUnusedField(): void
             $toSchema,
             $connection->getDatabasePlatform()
         );
-        $connection->executeUpdate($statements[0]);
+        $connection->executeStatement($statements[0]);
         self::assertTrue($this->getTableDetails()->hasColumn('zzz_deleted_testfield'));
 
         $statements = $this->readFixtureFile('newTable');

diff --git a/typo3/sysext/core/Tests/Unit/Database/ConnectionTest.php b/typo3/sysext/core/Tests/Unit/Database/ConnectionTest.php
@@ -237,7 +237,7 @@ public function insertQueries(array $args, string $expectedQuery, array $expecte
     public function bulkInsert(): void
     {
         $this->connection->expects(self::once())
-            ->method('executeUpdate')
+            ->method('executeStatement')
             ->with('INSERT INTO "aTestTable" ("aField") VALUES (?), (?)', ['aValue', 'anotherValue'])
             ->willReturn(2);
 
@@ -504,7 +504,7 @@ public function countQueries(array $args, string $expectedQuery, array $expected
     public function truncateQuery(): void
     {
         $this->connection->expects(self::once())
-            ->method('executeUpdate')
+            ->method('executeStatement')
             ->with('TRUNCATE "aTestTable"')
             ->willReturn(0);