Cast keySet keys to arrays instead of wrapping them (#505)

* cast keySet keys to arrays instead of wrapping them * adds tests for keyset formatting
googleapis · May 19, 2017 · f9fad9a · f9fad9a
1 parent 0632d3a
commit f9fad9a
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/src/Spanner/Connection/Grpc.php b/src/Spanner/Connection/Grpc.php
@@ -661,7 +661,7 @@ private function formatKeySet(array $keySet)
             $keySet['keys'] = [];
 
             foreach ($keys as $key) {
-                $keySet['keys'][] = $this->formatListForApi([$key]);
+                $keySet['keys'][] = $this->formatListForApi((array) $key);
             }
         }
 

diff --git a/tests/unit/Spanner/Connection/GrpcTest.php b/tests/unit/Spanner/Connection/GrpcTest.php
@@ -124,6 +124,10 @@ public function methodProvider()
         $keySetArgs = [];
         $keySet = (new KeySet)
             ->deserialize($keySetArgs, $codec);
+        $keySetSingular = (new KeySet())
+            ->deserialize(['keys' => [['values' => ['number_value' => 1]]]], $codec);
+        $keySetComposite = (new KeySet())
+            ->deserialize(['keys' => [['values' => [['number_value' => 1], ['number_value' => 1]]]]], $codec);
 
         $readWriteTransactionArgs = ['readWrite' => []];
         $readWriteTransactionOptions = new TransactionOptions;
@@ -308,6 +312,30 @@ public function methodProvider()
                 ],
                 [$sessionName, $tableName, $columns, $keySet, ['transaction' => $transactionSelector, 'userHeaders' => ['google-cloud-resource-prefix' => [$databaseName]]]]
             ],
+            [
+                'streamingRead',
+                [
+                    'keySet' => ['keys' => [1]],
+                    'transactionId' => $transactionName,
+                    'session' => $sessionName,
+                    'table' => $tableName,
+                    'columns' => $columns,
+                    'database' => $databaseName,
+                ],
+                [$sessionName, $tableName, $columns, $keySetSingular, ['transaction' => $transactionSelector, 'userHeaders' => ['google-cloud-resource-prefix' => [$databaseName]]]]
+            ],
+            [
+                'streamingRead',
+                [
+                    'keySet' => ['keys' => [[1,1]]],
+                    'transactionId' => $transactionName,
+                    'session' => $sessionName,
+                    'table' => $tableName,
+                    'columns' => $columns,
+                    'database' => $databaseName,
+                ],
+                [$sessionName, $tableName, $columns, $keySetComposite, ['transaction' => $transactionSelector, 'userHeaders' => ['google-cloud-resource-prefix' => [$databaseName]]]]
+            ],
             // test read write
             [
                 'beginTransaction',