Delete all sessions when dropping database

Spanner/src/Database.php

@@ -394,6 +394,11 @@ public function updateDdlBatch(array $statements, array $options = [])
     /**
      * Drop the database.
      *
+     * Please note that after a database is dropped, all sessions attached to it
+     * will be invalid and unusable. Calls to this method will clear any session
+     * pool attached to this database class instance and delete any sessions
+     * attached to the database class instance.
+     *
      * **NOTE**: Requires `https://www.googleapis.com/auth/spanner.admin` scope.
      *
      * Example:
@@ -413,6 +418,15 @@ public function drop(array $options = [])
         $this->connection->dropDatabase($options + [
             'name' => $this->name
         ]);
+
+        if ($this->sessionPool) {
+            $this->sessionPool->clear();
+        }
+
+        if ($this->session) {
+            $this->session->delete($options);
+            $this->session = null;
+        }
     }
 
     /**
@@ -1574,6 +1588,7 @@ public function __debugInfo()
             'name' => $this->name,
             'instance' => $this->instance,
             'sessionPool' => $this->sessionPool,
+            'session' => $this->session,
         ];
     }
 

Spanner/tests/Snippet/DatabaseTest.php

@@ -71,6 +71,7 @@ public function setUp()
             ->willReturn($session->reveal());
         $sessionPool->setDatabase(Argument::any())
             ->willReturn(null);
+        $sessionPool->clear()->willReturn(null);
 
         $this->connection = $this->prophesize(ConnectionInterface::class);
         $this->database = TestHelpers::stub(Database::class, [

Spanner/tests/Unit/DatabaseTest.php

@@ -38,6 +38,7 @@
 use Google\Cloud\Spanner\Snapshot;
 use Google\Cloud\Spanner\Timestamp;
 use Google\Cloud\Spanner\Transaction;
+use Google\Cloud\Spanner\V1\SpannerClient;
 use Google\Cloud\Spanner\ValueMapper;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
@@ -240,11 +241,52 @@ public function testDrop()
             'name' => DatabaseAdminClient::databaseName(self::PROJECT, self::INSTANCE, self::DATABASE)
         ])->shouldBeCalled();
 
+        $this->sessionPool->clear()->shouldBeCalled()->willReturn(null);
+
         $this->database->___setProperty('connection', $this->connection->reveal());
 
         $this->database->drop();
     }
 
+    /**
+     * @group spanneradmin
+     */
+    public function testDropDeleteSession()
+    {
+        $this->connection->createSession(Argument::any())
+            ->shouldBeCalled()
+            ->willReturn([
+                'name' => SpannerClient::sessionName(self::PROJECT, self::INSTANCE, self::DATABASE, self::SESSION)
+            ]);
+
+        $this->connection->beginTransaction(Argument::any())
+            ->shouldBeCalled()
+            ->willReturn([
+                'id' => self::TRANSACTION
+            ]);
+
+        $this->connection->deleteSession(Argument::any())
+            ->shouldBeCalled();
+
+        $this->connection->dropDatabase([
+            'name' => DatabaseAdminClient::databaseName(self::PROJECT, self::INSTANCE, self::DATABASE)
+        ])->shouldBeCalled();
+
+        $database = TestHelpers::stub(Database::class, [
+            $this->connection->reveal(),
+            $this->instance->reveal(),
+            $this->lro->reveal(),
+            $this->lroCallables,
+            self::PROJECT,
+            self::DATABASE
+        ]);
+
+        // This will set a session on the Database class.
+        $database->transaction();
+
+        $database->drop();
+    }
+
     /**
      * @group spanneradmin
      */