dbal cleanup handler: check if a table or index exists before deleting it

composer.json

@@ -32,7 +32,7 @@
   ],
   "require": {
     "php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
-    "doctrine/dbal": "^4.0.0",
+    "doctrine/dbal": "^4.4.0",
     "doctrine/migrations": "^3.3.2",
     "patchlevel/hydrator": "^1.8.0",
     "patchlevel/worker": "^1.4.0",

phpstan-baseline.neon

@@ -312,6 +312,12 @@ parameters:
 			count: 1
 			path: tests/Integration/Store/StreamDoctrineDbalStoreTest.php
 
+		-
+			message: '#^Parameter \#1 \$table of class Patchlevel\\EventSourcing\\Subscription\\Cleanup\\Dbal\\DropTableTask constructor expects non\-empty\-string, string given\.$#'
+			identifier: argument.type
+			count: 1
+			path: tests/Integration/Subscription/Subscriber/ProfileProjectionWithCleanup.php
+
 		-
 			message: '#^Call to static method PHPUnit\\Framework\\Assert\:\:assertArrayHasKey\(\) with 0 and array\{Patchlevel\\EventSourcing\\Subscription\\Subscription\} will always evaluate to true\.$#'
 			identifier: staticMethod.alreadyNarrowedType
@@ -336,18 +342,6 @@ parameters:
 			count: 1
 			path: tests/Unit/Aggregate/AggregateRootTest.php
 
-		-
-			message: '#^Cannot access offset 0 on iterable\<int, Patchlevel\\EventSourcing\\CommandBus\\HandlerDescriptor\>\.$#'
-			identifier: offsetAccess.nonOffsetAccessible
-			count: 2
-			path: tests/Unit/CommandBus/AggregateHandlerProviderTest.php
-
-		-
-			message: '#^Cannot call method callable\(\) on mixed\.$#'
-			identifier: method.nonObject
-			count: 2
-			path: tests/Unit/CommandBus/AggregateHandlerProviderTest.php
-
 		-
 			message: '#^Parameter \#2 \$aggregateClass of class Patchlevel\\EventSourcing\\CommandBus\\Handler\\CreateAggregateHandler constructor expects class\-string\<Patchlevel\\EventSourcing\\Aggregate\\AggregateRoot\>, string given\.$#'
 			identifier: argument.type
@@ -366,18 +360,6 @@ parameters:
 			count: 5
 			path: tests/Unit/CommandBus/InstantRetryCommandBusTest.php
 
-		-
-			message: '#^Cannot access offset 0 on iterable\<int, Patchlevel\\EventSourcing\\CommandBus\\HandlerDescriptor\>\.$#'
-			identifier: offsetAccess.nonOffsetAccessible
-			count: 2
-			path: tests/Unit/CommandBus/ServiceHandlerProviderTest.php
-
-		-
-			message: '#^Cannot call method callable\(\) on mixed\.$#'
-			identifier: method.nonObject
-			count: 2
-			path: tests/Unit/CommandBus/ServiceHandlerProviderTest.php
-
 		-
 			message: '#^Parameter \#1 \$data of static method Patchlevel\\EventSourcing\\Tests\\Unit\\Fixture\\Message\:\:fromArray\(\) expects array\{id\: string, text\: string, createdAt\: string\}, array\<mixed, mixed\> given\.$#'
 			identifier: argument.type

src/Subscription/Cleanup/Dbal/DbalCleanupTaskHandler.php

@@ -9,6 +9,8 @@
 use Patchlevel\EventSourcing\Subscription\Cleanup\CleanupTaskHandler;
 use Patchlevel\EventSourcing\Subscription\Cleanup\CleanupTaskNotSupported;
 
+use function strtolower;
+
 final class DbalCleanupTaskHandler implements CleanupTaskHandler
 {
     public function __construct(
@@ -19,13 +21,27 @@
     public function __invoke(object $task): void
     {
         if ($task instanceof DropTableTask) {
-            $this->connection($task->connectionName)->createSchemaManager()->dropTable($task->table);
+            $schemaManager = $this->connection($task->connectionName)->createSchemaManager();
+            if ($schemaManager->tablesExist([$task->table])) {
+                $schemaManager->dropTable($task->table);
+            }
 
             return;
         }
 
         if ($task instanceof DropIndexTask) {
-            $this->connection($task->connectionName)->createSchemaManager()->dropIndex($task->index, $task->table);
+            $schemaManager = $this->connection($task->connectionName)->createSchemaManager();
+
+            if (!$schemaManager->tablesExist([$task->table])) {
+                return;
+            }
+
+            foreach ($schemaManager->introspectTableIndexesByUnquotedName($task->table) as $index) {
+                if (strtolower($index->getObjectName()->toString()) === strtolower($task->index)) {
+                    $schemaManager->dropIndex($task->index, $task->table);
+                    break;
+                }
+            }
 
             return;
         }

src/Subscription/Cleanup/Dbal/DropIndexTask.php

@@ -6,6 +6,11 @@
 
 final class DropIndexTask
 {
+    /**
+     * @param non-empty-string      $index
+     * @param non-empty-string      $table
+     * @param non-empty-string|null $connectionName
+     */
     public function __construct(
         public readonly string $index,
         public readonly string $table,

src/Subscription/Cleanup/Dbal/DropTableTask.php

@@ -6,6 +6,10 @@
 
 final class DropTableTask
 {
+    /**
+     * @param non-empty-string      $table
+     * @param non-empty-string|null $connectionName
+     */
     public function __construct(
         public readonly string $table,
         public readonly string|null $connectionName = null,

tests/Unit/Subscription/Cleanup/Dbal/DbalCleanupTaskHandlerTest.php

@@ -6,6 +6,7 @@
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
+use Doctrine\DBAL\Schema\Index;
 use Doctrine\Persistence\ConnectionRegistry;
 use Patchlevel\EventSourcing\Subscription\Cleanup\CleanupTaskNotSupported;
 use Patchlevel\EventSourcing\Subscription\Cleanup\Dbal\ConnectionNameNotSupported;
@@ -53,6 +54,7 @@ public function testHandleNoSupportedTask(): void
     public function testHandleDropTable(): void
     {
         $schemaManager = $this->createMock(AbstractSchemaManager::class);
+        $schemaManager->expects($this->once())->method('tablesExist')->with(['test'])->willReturn(true);
         $schemaManager->expects($this->once())->method('dropTable')->with('test');
 
         $connection = $this->createMock(Connection::class);
@@ -66,9 +68,32 @@ public function testHandleDropTable(): void
         $handler(new DropTableTask('test'));
     }
 
+    public function testHandleDropTableIfNotExists(): void
+    {
+        $schemaManager = $this->createMock(AbstractSchemaManager::class);
+        $schemaManager->expects($this->once())->method('tablesExist')->with(['test'])->willReturn(false);
+        $schemaManager->expects($this->never())->method('dropTable');
+
+        $connection = $this->createMock(Connection::class);
+        $connection
+            ->expects($this->once())
+            ->method('createSchemaManager')
+            ->willReturn($schemaManager);
+
+        $handler = new DbalCleanupTaskHandler($connection);
+
+        $handler(new DropTableTask('test'));
+    }
+
     public function testHandleDropIndex(): void
     {
         $schemaManager = $this->createMock(AbstractSchemaManager::class);
+        $schemaManager->expects($this->once())->method('tablesExist')->with(['bar'])->willReturn(true);
+        $schemaManager
+            ->expects($this->once())
+            ->method('introspectTableIndexesByUnquotedName')
+            ->with('bar')
+            ->willReturn([new Index('foo', ['id'])]);
         $schemaManager->expects($this->once())->method('dropIndex')->with('foo', 'bar');
 
         $connection = $this->createMock(Connection::class);
@@ -82,9 +107,50 @@ public function testHandleDropIndex(): void
         $handler(new DropIndexTask('foo', 'bar'));
     }
 
+    public function testHandleDropIndexIfTableNotExists(): void
+    {
+        $schemaManager = $this->createMock(AbstractSchemaManager::class);
+        $schemaManager->expects($this->once())->method('tablesExist')->with(['bar'])->willReturn(false);
+        $schemaManager->expects($this->never())->method('introspectTableIndexesByUnquotedName');
+        $schemaManager->expects($this->never())->method('dropIndex');
+
+        $connection = $this->createMock(Connection::class);
+        $connection
+            ->expects($this->once())
+            ->method('createSchemaManager')
+            ->willReturn($schemaManager);
+
+        $handler = new DbalCleanupTaskHandler($connection);
+
+        $handler(new DropIndexTask('foo', 'bar'));
+    }
+
+    public function testHandleDropIndexIfIndexNotExists(): void
+    {
+        $schemaManager = $this->createMock(AbstractSchemaManager::class);
+        $schemaManager->expects($this->once())->method('tablesExist')->with(['bar'])->willReturn(true);
+        $schemaManager
+            ->expects($this->once())
+            ->method('introspectTableIndexesByUnquotedName')
+            ->with('bar')
+            ->willReturn([new Index('baz', ['id'])]);
+        $schemaManager->expects($this->never())->method('dropIndex');
+
+        $connection = $this->createMock(Connection::class);
+        $connection
+            ->expects($this->once())
+            ->method('createSchemaManager')
+            ->willReturn($schemaManager);
+
+        $handler = new DbalCleanupTaskHandler($connection);
+
+        $handler(new DropIndexTask('foo', 'bar'));
+    }
+
     public function testHandleWithConnectionRegistry(): void
     {
         $schemaManager = $this->createMock(AbstractSchemaManager::class);
+        $schemaManager->expects($this->once())->method('tablesExist')->with(['test'])->willReturn(true);
         $schemaManager->expects($this->once())->method('dropTable')->with('test');
 
         $connection = $this->createMock(Connection::class);