feature: separate connection per session so it is not shared

CHANGELOG.md

@@ -9,6 +9,7 @@ Fixed
 
 Changed
 - Use google-cloud-php's CacheSessionPool since the [concerned bug](https://github.com/googleapis/google-cloud-php/issues/5567) has been fixed in [v1.53](https://github.com/googleapis/google-cloud-php-spanner/releases/tag/v1.58.2). (#90)
+- Separate session pool and authentication per connection so transaction works properly. (#89)
 
 # v5.0.0
 

src/SpannerServiceProvider.php

@@ -67,8 +67,8 @@ protected function createSpannerConnection(array $config): Connection
             $config['database'],
             $config['prefix'],
             $config,
-            $this->createAuthCache(),
-            $this->createSessionPool($config['session_pool'] ?? [])
+            $this->createAuthCache($config['name']),
+            $this->createSessionPool($config['name'], $config['session_pool'] ?? [])
         );
     }
 
@@ -87,22 +87,24 @@ protected function parseConfig(array $config, string $name): array
     }
 
     /**
+     * @param string $name
      * @param array<string, mixed> $sessionPoolConfig
      * @return SessionPoolInterface
      */
-    protected function createSessionPool(array $sessionPoolConfig): SessionPoolInterface
+    protected function createSessionPool(string $name, array $sessionPoolConfig): SessionPoolInterface
     {
-        $cachePath = storage_path(implode(DIRECTORY_SEPARATOR, ['framework', 'spanner']));
+        $cachePath = storage_path(implode(DIRECTORY_SEPARATOR, ['framework', 'spanner', $name]));
         $adapter = new FilesystemAdapter('session', 0, $cachePath);
         return new CacheSessionPool($adapter, $sessionPoolConfig);
     }
 
     /**
+     * @param string $name
      * @return CacheItemPoolInterface
      */
-    protected function createAuthCache(): CacheItemPoolInterface
+    protected function createAuthCache(string $name): CacheItemPoolInterface
     {
-        $cachePath = storage_path(implode(DIRECTORY_SEPARATOR, ['framework', 'spanner']));
+        $cachePath = storage_path(implode(DIRECTORY_SEPARATOR, ['framework', 'spanner', $name]));
         return new FilesystemAdapter('auth', 0, $cachePath);
     }
 

tests/ConnectionTest.php

@@ -249,7 +249,7 @@ public function test_AuthCache_with_FileSystemAdapter(): void
     {
         $conn = $this->getDefaultConnection();
         $conn->select('SELECT 1');
-        self::assertDirectoryExists(storage_path('framework/spanner/auth'));
+        self::assertDirectoryExists(storage_path("framework/spanner/{$conn->getName()}/auth"));
     }
 
     public function testSessionPool(): void
@@ -272,7 +272,7 @@ public function test_session_pool_with_FileSystemAdapter(): void
     {
         $conn = $this->getDefaultConnection();
         $conn->select('SELECT 1');
-        self::assertDirectoryExists(storage_path('framework/spanner/session'));
+        self::assertDirectoryExists(storage_path("framework/spanner/{$conn->getName()}/session"));
     }
 
     public function test_clearSessionPool(): void

tests/Console/SessionsCommandTest.php

@@ -42,10 +42,6 @@ protected function createSessions(Connection $connection, int $amount): array
 
     public function test_no_args(): void
     {
-        if (getenv('SPANNER_EMULATOR_HOST')) {
-            $this->markTestSkipped('Cannot list sessions on emulator');
-        }
-
         foreach (['main', 'alternative'] as $name) {
             $conn = $this->getConnection($name);
             assert($conn instanceof Connection);
@@ -57,8 +53,8 @@ public function test_no_args(): void
             ->run();
 
         $this->artisan('spanner:sessions')
-            ->expectsOutputToContain('main contains 1 session(s).')
-            ->expectsOutputToContain('alternative contains 1 session(s).')
+            ->expectsOutputToContain('main contains 2 session(s).')
+            ->expectsOutputToContain('alternative contains 2 session(s).')
             ->assertSuccessful()
             ->run();
     }

tests/Console/WarmupCommandTest.php

@@ -32,12 +32,9 @@ public function test_no_args(): void
             $this->setUpDatabaseOnce($conn);
         }
 
-        // Emulator cannot distinguish different connections
-        $altWarmupCount = env('SPANNER_EMULATOR_HOST') ? 0 : 1;
-
         $this->artisan('spanner:warmup')
             ->expectsOutputToContain("Warmed up 1 sessions for main")
-            ->expectsOutputToContain("Warmed up {$altWarmupCount} sessions for alternative")
+            ->expectsOutputToContain("Warmed up 1 sessions for alternative")
             ->assertSuccessful()
             ->run();