Small fixes

Author: brendt

packages/database/src/Connection/ConnectionInitializer.php

@@ -16,17 +16,17 @@ final class ConnectionInitializer implements Initializer
     #[Singleton]
     public function initialize(Container $container): Connection
     {
-        $databaseConfig = $container->get(DatabaseConfig::class);
+        $config = $container->get(DatabaseConfig::class);
 
-        $connection = self::$connection;
+        $connection = $config->usePersistentConnection
+            ? self::$connection
+            : null;
 
-        if (! $connection instanceof Connection) {
-            $connection = new PDOConnection($databaseConfig);
+        if (!$connection instanceof Connection) {
+            $connection = new PDOConnection($config);
             $connection->connect();
             self::$connection = $connection;
-        }
-
-        if ($connection instanceof PDOConnection && $connection->ping() === false) {
+        } elseif ($connection instanceof PDOConnection && $connection->ping() === false) {
             $connection->reconnect();
         }
 

packages/database/src/Connection/ConnectionReset.php

@@ -13,6 +13,6 @@ public function __construct(
 
     public function reset(): void
     {
-        $this->container->unregister(Connection::class);
+        $this->container->unregister(Connection::class, tagged: true);
     }
 }

packages/database/src/DatabaseInitializer.php

@@ -40,9 +40,7 @@ public function initialize(ClassReflector $class, null|string|UnitEnum $tag, Con
             $connection = new PDOConnection($config);
             $connection->connect();
             self::$connections[$connectionKey] = $connection;
-        }
-
-        if ($connection instanceof PDOConnection && $connection->ping() === false) {
+        } elseif ($connection instanceof PDOConnection && $connection->ping() === false) {
             $connection->reconnect();
         }
 
@@ -66,6 +64,7 @@ private function getConnectionKey(DatabaseConfig $config): string
             $config->dsn,
             $config->username,
             $config->options,
+            $config->password,
         ]));
     }
 }

packages/database/src/DatabaseReset.php

@@ -13,6 +13,6 @@ public function __construct(
 
     public function reset(): void
     {
-        $this->container->unregister(Database::class);
+        $this->container->unregister(Database::class, tagged: true);
     }
 }

tests/Integration/Database/DatabaseInitializerTest.php

@@ -3,8 +3,11 @@
 namespace Tests\Tempest\Integration\Database;
 
 use PHPUnit\Framework\Attributes\Test;
+use ReflectionMethod;
+use Tempest\Database\Config\MysqlConfig;
 use Tempest\Database\Config\SQLiteConfig;
 use Tempest\Database\Connection\Connection;
+use Tempest\Database\Connection\PDOConnection;
 use Tempest\Database\Database;
 use Tempest\Database\DatabaseInitializer;
 use Tempest\Database\GenericDatabase;
@@ -111,6 +114,58 @@ public function test_it_does_not_reuse_a_persistent_connection_for_the_same_tag_
         $this->assertSame($second->connection, $this->container->get(Connection::class, 'main'));
     }
 
+    #[Test]
+    public function test_it_does_not_reuse_a_persistent_connection_when_only_the_password_differs(): void
+    {
+        $initializer = new DatabaseInitializer();
+        $method = new ReflectionMethod($initializer, 'getConnectionKey');
+
+        $first = new MysqlConfig(
+            host: 'localhost',
+            username: 'tempest',
+            password: 'first-password', // @mago-expect lint:no-literal-password
+            database: 'tempest',
+            persistent: true,
+            tag: 'main',
+        );
+
+        $second = new MysqlConfig(
+            host: 'localhost',
+            username: 'tempest',
+            password: 'second-password', // @mago-expect lint:no-literal-password
+            database: 'tempest',
+            persistent: true,
+            tag: 'main',
+        );
+
+        $this->assertNotSame(
+            $method->invoke($initializer, $first),
+            $method->invoke($initializer, $second),
+        );
+    }
+
+    #[Test]
+    public function test_it_reconnects_a_stale_persistent_connection_when_reusing_it(): void
+    {
+        $this->configureSqliteDatabase('main', 'stale-persistent-main.sqlite');
+
+        $first = $this->container->get(Database::class, 'main');
+
+        $this->assertInstanceOf(GenericDatabase::class, $first);
+        $this->assertInstanceOf(PDOConnection::class, $first->connection);
+
+        $first->connection->close();
+
+        $this->container->unregister(Database::class, tagged: true);
+        $this->container->unregister(Connection::class, tagged: true);
+
+        $second = $this->container->get(Database::class, 'main');
+
+        $this->assertInstanceOf(GenericDatabase::class, $second);
+        $this->assertSame($first->connection, $second->connection);
+        $this->assertTrue($second->connection->ping());
+    }
+
     private function configureSqliteDatabase(string $tag, string $filename, bool $persistent = true): void
     {
         $path = $this->databasePath($filename);