Merge pull request mautic#15199 from patrykgruszka/fix-execute-query-usage

escopecz · web-flow · commit fa0653e225c3 · 2025-07-11T09:10:28.000+02:00
Replace improper executeQuery usage with executeStatement for data modification queries
diff --git a/app/bundles/CampaignBundle/Entity/LeadEventLogRepository.php b/app/bundles/CampaignBundle/Entity/LeadEventLogRepository.php
@@ -625,7 +625,7 @@ public function removeEventLogsByCampaignId(int $campaignId): void
         $conn          = $this->getEntityManager()->getConnection();
         $deleteEntries = true;
         while ($deleteEntries) {
-            $deleteEntries = $conn->executeQuery($sql, [$campaignId], [Types::INTEGER])->rowCount();
+            $deleteEntries = $conn->executeStatement($sql, [$campaignId], [Types::INTEGER]);
         }
     }
 
@@ -639,7 +639,7 @@ public function removeEventLogs(array $eventIds): void
         $conn          = $this->getEntityManager()->getConnection();
         $deleteEntries = true;
         while ($deleteEntries) {
-            $deleteEntries = $conn->executeQuery($sql, [$eventIds], [ArrayParameterType::INTEGER])->rowCount();
+            $deleteEntries = $conn->executeStatement($sql, [$eventIds], [ArrayParameterType::INTEGER]);
         }
     }
 
diff --git a/app/bundles/CampaignBundle/Entity/SummaryRepository.php b/app/bundles/CampaignBundle/Entity/SummaryRepository.php
@@ -138,7 +138,7 @@ public function summarize(
             ' triggered_count = s.triggered_count_i, '.
             ' log_counts_processed = s.log_counts_processed_i;';
 
-            $this->getEntityManager()->getConnection()->executeQuery($sql);
+            $this->getEntityManager()->getConnection()->executeStatement($sql);
         }
     }
 }
diff --git a/app/bundles/CampaignBundle/Tests/Functional/Entity/LeadEventLogRepositoryTest.php b/app/bundles/CampaignBundle/Tests/Functional/Entity/LeadEventLogRepositoryTest.php
@@ -21,11 +21,11 @@ public function testThatRemoveEventLogsMethodRemovesLogs(): void
 
         $insertStatement = $connection->prepare('INSERT INTO `'.MAUTIC_TABLE_PREFIX.'campaign_lead_event_log` (`event_id`, `lead_id`, `rotation`, `is_scheduled`, `system_triggered`) VALUES (?, ?, ?, ?, ?);');
 
-        $connection->executeQuery('SET FOREIGN_KEY_CHECKS=0;');
+        $connection->executeStatement('SET FOREIGN_KEY_CHECKS=0;');
         foreach ($this->getLeadCampaignEventData($eventId) as $row) {
-            $insertStatement->executeQuery($row);
+            $insertStatement->executeStatement($row);
         }
-        $connection->executeQuery('SET FOREIGN_KEY_CHECKS=1;');
+        $connection->executeStatement('SET FOREIGN_KEY_CHECKS=1;');
 
         Assert::assertCount(3, $leadEventLogRepository->findAll());
 
diff --git a/app/bundles/CoreBundle/Entity/AuditLogRepository.php b/app/bundles/CoreBundle/Entity/AuditLogRepository.php
@@ -261,6 +261,6 @@ public function anonymizeAllIpAddress(): int
         $sql        = "UPDATE {$table_name} SET ip_address = '*.*.*.*' WHERE ip_address != '*.*.*.*'";
         $conn       = $this->getEntityManager()->getConnection();
 
-        return $conn->executeQuery($sql)->rowCount();
+        return $conn->executeStatement($sql);
     }
 }
diff --git a/app/bundles/CoreBundle/Entity/IpAddressRepository.php b/app/bundles/CoreBundle/Entity/IpAddressRepository.php
@@ -114,6 +114,6 @@ public function anonymizeAllIpAddress(): int
         $sql               = "UPDATE {$table_name} SET ip_address = '*.*.*.*', ip_details = 'N;' WHERE ip_address != '*.*.*.*'";
         $conn              = $this->getEntityManager()->getConnection();
 
-        return $conn->executeQuery($sql)->rowCount();
+        return $conn->executeStatement($sql);
     }
 }
diff --git a/app/bundles/CoreBundle/EventListener/MigrationCommandSubscriber.php b/app/bundles/CoreBundle/EventListener/MigrationCommandSubscriber.php
@@ -60,7 +60,7 @@ public function addGeneratedColumns(ConsoleTerminateEvent $event): void
             $output->writeln("<info>++</info> adding generated column <comment>{$generatedColumn->getColumnName()}</comment>");
             $output->writeln("<comment>-></comment> {$generatedColumn->getAlterTableSql()}");
 
-            $this->connection->executeQuery($generatedColumn->getAlterTableSql());
+            $this->connection->executeStatement($generatedColumn->getAlterTableSql());
 
             $duration = (string) $stopwatch->stop($generatedColumn->getColumnName());
             $output->writeln("<info>++</info> generated column added ({$duration})");
diff --git a/app/bundles/CoreBundle/EventListener/OptimisticLockSubscriber.php b/app/bundles/CoreBundle/EventListener/OptimisticLockSubscriber.php
@@ -54,7 +54,7 @@ public function postUpdate(LifecycleEventArgs $args): void
                 return "{$name} = :{$name}";
             }, $metadata->getIdentifierFieldNames())))
             ->setParameters($entityManager->getUnitOfWork()->getEntityIdentifier($object))
-            ->executeQuery();
+            ->executeStatement();
 
         $newVersion = (int) $connection->executeQuery('SELECT @newVersion')->fetchOne();
         $object->setVersion($newVersion);
diff --git a/app/bundles/CoreBundle/Test/MauticMysqlTestCase.php b/app/bundles/CoreBundle/Test/MauticMysqlTestCase.php
@@ -145,7 +145,7 @@ protected function resetAutoincrement(array $tables): void
         $connection = $this->connection;
 
         foreach ($tables as $table) {
-            $connection->executeQuery(sprintf('ALTER TABLE `%s%s` AUTO_INCREMENT=1', $prefix, $table));
+            $connection->executeStatement(sprintf('ALTER TABLE `%s%s` AUTO_INCREMENT=1', $prefix, $table));
         }
     }
 
@@ -160,7 +160,7 @@ protected function truncateTables(string ...$tables): void
         $prefix = MAUTIC_TABLE_PREFIX;
 
         foreach ($tables as $table) {
-            $this->connection->executeQuery("SET FOREIGN_KEY_CHECKS = 0; TRUNCATE TABLE `{$prefix}{$table}`; SET FOREIGN_KEY_CHECKS = 1;");
+            $this->connection->executeStatement("SET FOREIGN_KEY_CHECKS = 0; TRUNCATE TABLE `{$prefix}{$table}`; SET FOREIGN_KEY_CHECKS = 1;");
         }
     }
 
diff --git a/app/bundles/CoreBundle/Tests/Unit/EventListener/MigrationCommandSubscriberTest.php b/app/bundles/CoreBundle/Tests/Unit/EventListener/MigrationCommandSubscriberTest.php
@@ -154,7 +154,7 @@ public function testAddGeneratedColumnsWhenDoesNotExist(): void
             ->willReturn(['id' => new \stdClass()]);
 
         $this->connection->expects($this->once())
-            ->method('executeQuery');
+            ->method('executeStatement');
 
         $this->subscriber->addGeneratedColumns($this->event);
     }
diff --git a/app/bundles/FormBundle/Tests/Controller/SubmissionFunctionalTest.php b/app/bundles/FormBundle/Tests/Controller/SubmissionFunctionalTest.php
@@ -507,7 +507,7 @@ protected function beforeTearDown(): void
         $tablePrefix = static::getContainer()->getParameter('mautic.db_table_prefix');
 
         if ($this->connection->createSchemaManager()->tablesExist("{$tablePrefix}form_results_1_submission")) {
-            $this->connection->executeQuery("DROP TABLE {$tablePrefix}form_results_1_submission");
+            $this->connection->executeStatement("DROP TABLE {$tablePrefix}form_results_1_submission");
         }
     }
 
diff --git a/app/bundles/FormBundle/Tests/EventListener/CampaignSubscriberFunctionalTest.php b/app/bundles/FormBundle/Tests/EventListener/CampaignSubscriberFunctionalTest.php
@@ -160,7 +160,7 @@ protected function beforeTearDown(): void
         $tablePrefix = static::getContainer()->getParameter('mautic.db_table_prefix');
 
         if ($this->connection->createSchemaManager()->tablesExist("{$tablePrefix}form_results_1_test_form")) {
-            $this->connection->executeQuery("DROP TABLE {$tablePrefix}form_results_1_test_form");
+            $this->connection->executeStatement("DROP TABLE {$tablePrefix}form_results_1_test_form");
         }
     }
 }
diff --git a/app/bundles/InstallBundle/Helper/SchemaHelper.php b/app/bundles/InstallBundle/Helper/SchemaHelper.php
@@ -164,7 +164,7 @@ public function installSchema(): bool
         // Execute drop queries
         foreach ($sql as $q) {
             try {
-                $this->db->executeQuery($q);
+                $this->db->executeStatement($q);
             } catch (\Exception $exception) {
                 $this->db->close();
 
diff --git a/app/bundles/InstallBundle/Tests/Install/InstallSchemaTest.php b/app/bundles/InstallBundle/Tests/Install/InstallSchemaTest.php
@@ -101,7 +101,7 @@ public function testBackupIndexesWithConfigOptions(): void
         if (!empty($sql)) {
             foreach ($sql as $q) {
                 try {
-                    $this->connection->executeQuery($q);
+                    $this->connection->executeStatement($q);
                 } catch (\Exception $exception) {
                     $exceptions[] = $exception->getMessage();
                 }
diff --git a/app/bundles/LeadBundle/Entity/CompanyLeadRepository.php b/app/bundles/LeadBundle/Entity/CompanyLeadRepository.php
@@ -217,7 +217,7 @@ public function removeAllSecondaryCompanies(): void
         $conn = $this->getEntityManager()->getConnection();
         do {
             $sql = 'DELETE FROM '.MAUTIC_TABLE_PREFIX.'companies_leads WHERE is_primary = 0 LIMIT '.self::DELETE_BATCH_SIZE;
-            $row = $conn->executeQuery($sql)->rowCount();
+            $row = $conn->executeStatement($sql);
         } while ($row);
     }
 
diff --git a/app/bundles/PluginBundle/Bundle/PluginDatabase.php b/app/bundles/PluginBundle/Bundle/PluginDatabase.php
@@ -47,12 +47,12 @@ public function installPluginSchema(array $metadata, ?bool $installedSchema = nu
             // Check if the query is a DDL statement
             if (self::isDDLStatement($q)) {
                 // Execute DDL statements outside of a transaction
-                $connection->executeQuery($q);
+                $connection->executeStatement($q);
             } else {
                 // For non-DDL statements, use transactions
                 try {
                     $connection->beginTransaction();
-                    $connection->executeQuery($q);
+                    $connection->executeStatement($q);
                     $connection->commit();
                 } catch (\Exception $e) {
                     // Rollback only for non-DDL statements
@@ -92,7 +92,7 @@ public function dropPluginSchema(array $metadata): void
         $db->beginTransaction();
         try {
             foreach ($dropQueries as $q) {
-                $db->executeQuery($q);
+                $db->executeStatement($q);
             }
 
             $db->commit();
diff --git a/app/bundles/WebhookBundle/Entity/LogRepository.php b/app/bundles/WebhookBundle/Entity/LogRepository.php
@@ -50,7 +50,7 @@ public function removeLimitExceedLogs(int $webHookId, int $logMax): int
 
         if ($id) {
             $sql = "DELETE FROM {$table_name} WHERE webhook_id = (?) and id <= (?) LIMIT ".self::LOG_DELETE_BATCH_SIZE;
-            while ($rows = $conn->executeQuery($sql, [$webHookId, $id], [ParameterType::INTEGER, ParameterType::INTEGER])->rowCount()) {
+            while ($rows = $conn->executeStatement($sql, [$webHookId, $id], [ParameterType::INTEGER, ParameterType::INTEGER])) {
                 $deletedLogs += $rows;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -625,7 +625,7 @@ public function removeEventLogsByCampaignId(int $campaignId): void`
`625`	`625`	`$conn = $this->getEntityManager()->getConnection();`
`626`	`626`	`$deleteEntries = true;`
`627`	`627`	`while ($deleteEntries) {`
`628`		`- $deleteEntries = $conn->executeQuery($sql, [$campaignId], [Types::INTEGER])->rowCount();`
	`628`	`+ $deleteEntries = $conn->executeStatement($sql, [$campaignId], [Types::INTEGER]);`
`629`	`629`	`}`
`630`	`630`	`}`
`631`	`631`
`@@ -639,7 +639,7 @@ public function removeEventLogs(array $eventIds): void`
`639`	`639`	`$conn = $this->getEntityManager()->getConnection();`
`640`	`640`	`$deleteEntries = true;`
`641`	`641`	`while ($deleteEntries) {`
`642`		`- $deleteEntries = $conn->executeQuery($sql, [$eventIds], [ArrayParameterType::INTEGER])->rowCount();`
	`642`	`+ $deleteEntries = $conn->executeStatement($sql, [$eventIds], [ArrayParameterType::INTEGER]);`
`643`	`643`	`}`
`644`	`644`	`}`
`645`	`645`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ public function summarize(`
`138`	`138`	`' triggered_count = s.triggered_count_i, '.`
`139`	`139`	`' log_counts_processed = s.log_counts_processed_i;';`
`140`	`140`
`141`		`- $this->getEntityManager()->getConnection()->executeQuery($sql);`
	`141`	`+ $this->getEntityManager()->getConnection()->executeStatement($sql);`
`142`	`142`	`}`
`143`	`143`	`}`
`144`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -261,6 +261,6 @@ public function anonymizeAllIpAddress(): int`
`261`	`261`	`$sql = "UPDATE {$table_name} SET ip_address = '...' WHERE ip_address != '...'";`
`262`	`262`	`$conn = $this->getEntityManager()->getConnection();`
`263`	`263`
`264`		`- return $conn->executeQuery($sql)->rowCount();`
	`264`	`+ return $conn->executeStatement($sql);`
`265`	`265`	`}`
`266`	`266`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,6 @@ public function anonymizeAllIpAddress(): int`
`114`	`114`	`$sql = "UPDATE {$table_name} SET ip_address = '...', ip_details = 'N;' WHERE ip_address != '...'";`
`115`	`115`	`$conn = $this->getEntityManager()->getConnection();`
`116`	`116`
`117`		`- return $conn->executeQuery($sql)->rowCount();`
	`117`	`+ return $conn->executeStatement($sql);`
`118`	`118`	`}`
`119`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ protected function resetAutoincrement(array $tables): void`
`145`	`145`	`$connection = $this->connection;`
`146`	`146`
`147`	`147`	`foreach ($tables as $table) {`
`148`		- $connection->executeQuery(sprintf('ALTER TABLE `%s%s` AUTO_INCREMENT=1', $prefix, $table));
	`148`	+ $connection->executeStatement(sprintf('ALTER TABLE `%s%s` AUTO_INCREMENT=1', $prefix, $table));
`149`	`149`	`}`
`150`	`150`	`}`
`151`	`151`
`@@ -160,7 +160,7 @@ protected function truncateTables(string ...$tables): void`
`160`	`160`	`$prefix = MAUTIC_TABLE_PREFIX;`
`161`	`161`
`162`	`162`	`foreach ($tables as $table) {`
`163`		- $this->connection->executeQuery("SET FOREIGN_KEY_CHECKS = 0; TRUNCATE TABLE `{$prefix}{$table}`; SET FOREIGN_KEY_CHECKS = 1;");
	`163`	+ $this->connection->executeStatement("SET FOREIGN_KEY_CHECKS = 0; TRUNCATE TABLE `{$prefix}{$table}`; SET FOREIGN_KEY_CHECKS = 1;");
`164`	`164`	`}`
`165`	`165`	`}`
`166`	`166`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ public function testAddGeneratedColumnsWhenDoesNotExist(): void`
`154`	`154`	`->willReturn(['id' => new \stdClass()]);`
`155`	`155`
`156`	`156`	`$this->connection->expects($this->once())`
`157`		`- ->method('executeQuery');`
	`157`	`+ ->method('executeStatement');`
`158`	`158`
`159`	`159`	`$this->subscriber->addGeneratedColumns($this->event);`
`160`	`160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -507,7 +507,7 @@ protected function beforeTearDown(): void`
`507`	`507`	`$tablePrefix = static::getContainer()->getParameter('mautic.db_table_prefix');`
`508`	`508`
`509`	`509`	`if ($this->connection->createSchemaManager()->tablesExist("{$tablePrefix}form_results_1_submission")) {`
`510`		`- $this->connection->executeQuery("DROP TABLE {$tablePrefix}form_results_1_submission");`
	`510`	`+ $this->connection->executeStatement("DROP TABLE {$tablePrefix}form_results_1_submission");`
`511`	`511`	`}`
`512`	`512`	`}`
`513`	`513`