Merge branch '3.12.x' into 4.0.x

Author: DavidBadura

Makefile

@@ -41,11 +41,11 @@ phpunit-integration: vendor
 
 .PHONY: phpunit-integration-postgres
 phpunit-integration-postgres: vendor                                            ## run phpunit integration tests on postgres
-	DB_URL="pdo-pgsql://postgres:postgres@localhost:5432/eventstore?charset=utf8" vendor/bin/phpunit --testsuite=integration
+	DB_URL="pdo-pgsql://postgres:postgres@127.0.0.1:5432/eventstore?charset=utf8" vendor/bin/phpunit --testsuite=integration
 
 .PHONY: phpunit-integration-mysql
 phpunit-integration-mysql: vendor                                               ## run phpunit integration tests on mysql
-	DB_URL="pdo-mysql://root@localhost:3306/eventstore?charset=utf8" vendor/bin/phpunit --testsuite=integration
+	DB_URL="pdo-mysql://root@127.0.0.1:3306/eventstore?charset=utf8" vendor/bin/phpunit --testsuite=integration
 
 .PHONY: phpunit-unit
 phpunit-unit: vendor                                             				## run phpunit unit tests

baseline.xml

@@ -92,6 +92,12 @@
       <code><![CDATA[archive]]></code>
     </UndefinedInterfaceMethod>
   </file>
+  <file src="src/Schema/DoctrineHelper.php">
+    <InternalMethod>
+      <code><![CDATA[getParams]]></code>
+      <code><![CDATA[getParams]]></code>
+    </InternalMethod>
+  </file>
   <file src="src/Schema/DoctrineSchemaDirector.php">
     <InternalMethod>
       <code><![CDATA[getName]]></code>

composer.lock

@@ -6,6 +6,7 @@
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Schema\Schema;
+use Patchlevel\EventSourcing\Schema\DoctrineHelper;
 use Patchlevel\EventSourcing\Schema\DoctrineSchemaConfigurator;
 use Patchlevel\Hydrator\Cryptography\Cipher\CipherKey;
 use Patchlevel\Hydrator\Cryptography\Store\CipherKeyNotExists;
@@ -80,7 +81,7 @@ public function remove(string $id): void
 
     public function configureSchema(Schema $schema, Connection $connection): void
     {
-        if ($connection !== $this->connection) {
+        if (!DoctrineHelper::sameDatabase($this->connection, $connection)) {
             return;
         }
 

src/Cryptography/DoctrineCipherKeyStore.php

@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Patchlevel\EventSourcing\Schema;
+
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Exception\TableNotFoundException;
+use Throwable;
+
+use function bin2hex;
+use function random_bytes;
+use function sprintf;
+
+final class DoctrineHelper
+{
+    public static function sameDatabase(Connection $connectionA, Connection $connectionB): bool
+    {
+        if ($connectionA === $connectionB) {
+            return true;
+        }
+
+        if ($connectionA->getParams() === $connectionB->getParams()) {
+            return true;
+        }
+
+        $checkTable = 'same_db_check_' . bin2hex(random_bytes(7));
+        $connectionA->executeStatement(sprintf('CREATE TABLE %s (id INTEGER NOT NULL)', $checkTable));
+
+        try {
+            $connectionB->executeStatement(sprintf('DROP TABLE %s', $checkTable));
+        } catch (Throwable) {
+            // ignore
+        }
+
+        try {
+            $connectionA->executeStatement(sprintf('DROP TABLE %s', $checkTable));
+
+            return false;
+        } catch (TableNotFoundException) {
+            return true;
+        }
+    }
+}

src/Schema/DoctrineHelper.php

@@ -21,6 +21,7 @@
 use Patchlevel\EventSourcing\Message\Message;
 use Patchlevel\EventSourcing\Message\Serializer\DefaultHeadersSerializer;
 use Patchlevel\EventSourcing\Message\Serializer\HeadersSerializer;
+use Patchlevel\EventSourcing\Schema\DoctrineHelper;
 use Patchlevel\EventSourcing\Schema\DoctrineSchemaConfigurator;
 use Patchlevel\EventSourcing\Serializer\EventSerializer;
 use Patchlevel\EventSourcing\Store\Criteria\ArchivedCriterion;
@@ -396,7 +397,7 @@ public function archive(Criteria|null $criteria = null): void
 
     public function configureSchema(Schema $schema, Connection $connection): void
     {
-        if ($this->connection !== $connection) {
+        if (!DoctrineHelper::sameDatabase($this->connection, $connection)) {
             return;
         }
 

src/Store/StreamDoctrineDbalStore.php

@@ -15,6 +15,7 @@
 use Doctrine\DBAL\Types\Type;
 use Doctrine\DBAL\Types\Types;
 use Patchlevel\EventSourcing\Clock\SystemClock;
+use Patchlevel\EventSourcing\Schema\DoctrineHelper;
 use Patchlevel\EventSourcing\Schema\DoctrineSchemaConfigurator;
 use Patchlevel\EventSourcing\Subscription\RunMode;
 use Patchlevel\EventSourcing\Subscription\Status;
@@ -208,6 +209,10 @@ public function inLock(Closure $closure): mixed
 
     public function configureSchema(Schema $schema, Connection $connection): void
     {
+        if (!DoctrineHelper::sameDatabase($this->connection, $connection)) {
+            return;
+        }
+
         $table = $schema->createTable($this->tableName);
 
         $table->addColumn('id', Types::STRING)

src/Subscription/Store/DoctrineSubscriptionStore.php

@@ -7,6 +7,7 @@
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Driver\AbstractSQLiteDriver;
 use Doctrine\DBAL\DriverManager;
+use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use Doctrine\DBAL\Tools\DsnParser;
 use Patchlevel\EventSourcing\Console\DoctrineHelper;
 use RuntimeException;
@@ -45,6 +46,14 @@ public static function createConnection(string $dbName = self::DEFAULT_DB_NAME):
         $databases = $schemaManager->listDatabases();
 
         if (in_array($dbName, $databases, true)) {
+            if ($tempConnection->getDatabasePlatform() instanceof PostgreSQLPlatform) {
+                $tempConnection->executeStatement("
+                    SELECT pg_terminate_backend(pid)
+                    FROM pg_stat_activity
+                    WHERE datname = '{$dbName}';
+                ");
+            }
+
             $schemaManager->dropDatabase($dbName);
         }
 

tests/DbalManager.php

@@ -6,6 +6,7 @@
 
 use DateTimeImmutable;
 use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Schema\Schema;
 use Patchlevel\EventSourcing\Clock\FrozenClock;
 use Patchlevel\EventSourcing\Message\Message;
 use Patchlevel\EventSourcing\Schema\DoctrineSchemaDirector;
@@ -538,4 +539,40 @@ public function testRemove(): void
 
         self::assertEquals(['foo'], $streams);
     }
+
+    public function testConfigureSchemaSameDatabase(): void
+    {
+        $connection = DbalManager::createConnection();
+        $otherConnection = DbalManager::createConnection();
+
+        $store = new StreamDoctrineDbalStore(
+            $connection,
+            DefaultEventSerializer::createFromPaths([__DIR__ . '/Events']),
+            clock: $this->clock,
+        );
+
+        $schema = new Schema();
+
+        $store->configureSchema($schema, $otherConnection);
+
+        self::assertTrue($schema->hasTable('event_store'));
+    }
+
+    public function testConfigureSchemaNotSameDatabase(): void
+    {
+        $connection = DbalManager::createConnection();
+        $otherConnection = DbalManager::createConnection('other');
+
+        $store = new StreamDoctrineDbalStore(
+            $connection,
+            DefaultEventSerializer::createFromPaths([__DIR__ . '/Events']),
+            clock: $this->clock,
+        );
+
+        $schema = new Schema();
+
+        $store->configureSchema($schema, $otherConnection);
+
+        self::assertFalse($schema->hasTable('event_store'));
+    }
 }

tests/Integration/Store/StreamDoctrineDbalStoreTest.php

@@ -1404,9 +1404,11 @@ public function testWait(): void
         $doctrineDbalStore->wait(100);
     }
 
-    public function testConfigureSchemaWithDifferentConnections(): void
+    public function testConfigureSchemaWithDifferentDatabase(): void
     {
         $connection = $this->createMock(Connection::class);
+        $connection->expects($this->once())->method('getParams')->willReturn(['dbname' => 'db']);
+
         $eventSerializer = $this->createMock(EventSerializer::class);
         $headersSerializer = $this->createMock(HeadersSerializer::class);
 
@@ -1415,8 +1417,12 @@ public function testConfigureSchemaWithDifferentConnections(): void
             $eventSerializer,
             $headersSerializer,
         );
+
+        $differentConnection = $this->createMock(Connection::class);
+        $connection->expects($this->once())->method('getParams')->willReturn(['dbname' => 'db2']);
+
         $schema = new Schema();
-        $doctrineDbalStore->configureSchema($schema, $this->createMock(Connection::class));
+        $doctrineDbalStore->configureSchema($schema, $differentConnection);
 
         self::assertEquals(new Schema(), $schema);
     }