fix(Spanner): default creator role is empty str (#5941)

googleapis · Mar 17, 2023 · f922d6c · f922d6c
1 parent 465811f
commit f922d6c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/Spanner/src/Batch/BatchClient.php b/Spanner/src/Batch/BatchClient.php
@@ -146,7 +146,7 @@ public function __construct(Operation $operation, $databaseName, array $options
     {
         $this->operation = $operation;
         $this->databaseName = $databaseName;
-        $this->databaseRole = isset($options['databaseRole']) ? $options['databaseRole'] : null;
+        $this->databaseRole = isset($options['databaseRole']) ? $options['databaseRole'] : '';
     }
 
     /**

diff --git a/Spanner/src/Database.php b/Spanner/src/Database.php
@@ -202,7 +202,7 @@ public function __construct(
         SessionPoolInterface $sessionPool = null,
         $returnInt64AsObject = false,
         array $info = [],
-        $databaseRole = null
+        $databaseRole = ''
     ) {
         $this->connection = $connection;
         $this->instance = $instance;
@@ -2090,7 +2090,7 @@ private function fullyQualifiedDatabaseName($name)
 
     /**
      * Returns the 'CREATE DATABASE' statement as per the given database dialect
-     * 
+     *
      * @param string $dialect The dialect of the database to be created
      * @return string The specific 'CREATE DATABASE' statement
      */

diff --git a/Spanner/src/Instance.php b/Spanner/src/Instance.php
@@ -510,7 +510,7 @@ public function database($name, array $options = [])
             isset($options['sessionPool']) ? $options['sessionPool'] : null,
             $this->returnInt64AsObject,
             isset($options['database']) ? $options['database'] : [],
-            isset($options['databaseRole']) ? $options['databaseRole'] : null
+            isset($options['databaseRole']) ? $options['databaseRole'] : ''
         );
     }
 

diff --git a/Spanner/src/Operation.php b/Spanner/src/Operation.php
@@ -563,7 +563,7 @@ public function createSession($databaseName, array $options = [])
             'database' => $databaseName,
             'session' => [
                 'labels' => $this->pluck('labels', $options, false) ?: [],
-                'creator_role' => $this->pluck('creator_role', $options, false) ?: null
+                'creator_role' => $this->pluck('creator_role', $options, false) ?: ''
             ]
         ] + $options);
 

diff --git a/Spanner/src/Session/CacheSessionPool.php b/Spanner/src/Session/CacheSessionPool.php
@@ -692,7 +692,7 @@ private function createSessions($count)
                     'database' => $this->database->name(),
                     'sessionTemplate' => [
                         'labels' => isset($this->config['labels']) ? $this->config['labels'] : [],
-                        'creator_role' => isset($this->config['databaseRole']) ? $this->config['databaseRole'] : null
+                        'creator_role' => isset($this->config['databaseRole']) ? $this->config['databaseRole'] : ''
                     ],
                     'sessionCount' => $count - $created
                 ]);