feat: inject database info on list databases (#2656)

* refactor: inject database info on list databases * refactor: default info as []
googleapis · Feb 4, 2020 · e6308a6 · e6308a6
1 parent b16dd8b
commit e6308a6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/Spanner/src/Database.php b/Spanner/src/Database.php
@@ -183,14 +183,16 @@ public function __construct(
         $projectId,
         $name,
         SessionPoolInterface $sessionPool = null,
-        $returnInt64AsObject = false
+        $returnInt64AsObject = false,
+        array $info = []
     ) {
         $this->connection = $connection;
         $this->instance = $instance;
         $this->projectId = $projectId;
         $this->name = $this->fullyQualifiedDatabaseName($name);
         $this->sessionPool = $sessionPool;
         $this->operation = new Operation($connection, $returnInt64AsObject);
+        $this->info = $info;
 
         if ($this->sessionPool) {
             $this->sessionPool->setDatabase($this);

diff --git a/Spanner/src/Instance.php b/Spanner/src/Instance.php
@@ -442,7 +442,8 @@ public function database($name, array $options = [])
             $this->projectId,
             $name,
             isset($options['sessionPool']) ? $options['sessionPool'] : null,
-            $this->returnInt64AsObject
+            $this->returnInt64AsObject,
+            isset($options['database']) ? $options['database'] : []
         );
     }
 
@@ -476,7 +477,7 @@ public function databases(array $options = [])
         return new ItemIterator(
             new PageIterator(
                 function (array $database) {
-                    return $this->database($database['name']);
+                    return $this->database($database['name'], ['database' => $database]);
                 },
                 [$this->connection, 'listDatabases'],
                 $options + ['instance' => $this->name],

diff --git a/Spanner/tests/Unit/InstanceTest.php b/Spanner/tests/Unit/InstanceTest.php
@@ -308,6 +308,7 @@ public function testDatabases()
         $this->connection->listDatabases(Argument::any())
             ->shouldBeCalled()
             ->willReturn(['databases' => $databases]);
+        $this->connection->getDatabase()->shouldNotBeCalled();
 
         $this->instance->___setProperty('connection', $this->connection->reveal());
 
@@ -320,6 +321,10 @@ public function testDatabases()
         $this->assertCount(2, $dbs);
         $this->assertEquals('database1', DatabaseAdminClient::parseName($dbs[0]->name())['database']);
         $this->assertEquals('database2', DatabaseAdminClient::parseName($dbs[1]->name())['database']);
+
+        // Make sure the database->info is prefilled.
+        $this->assertEquals($databases[0], $dbs[0]->info());
+        $this->assertEquals($databases[1], $dbs[1]->info());
     }
 
     public function testDatabasesPaged()