Skip to content

Commit 9fe4bc8

Browse files
jsimonwebbshaffer
jsimonweb
authored and
bshaffer
committed
Update Cloud Spanner sample to match documentation. (GoogleCloudPlatform#679)
1 parent eed0aee commit 9fe4bc8

File tree

3 files changed

+24
-20
lines changed

3 files changed

+24
-20
lines changed

‎spanner/README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,12 @@ This directory contains samples for Google Cloud Spanner.
1212
horizontally-scaling database with consistent global transactions and SQL
1313
semantics.
1414

15+
See [Getting Started in PHP][getting-started-php]
16+
for a walkthrough of these samples.
17+
1518
[spanner]: https://cloud.google.com/spanner/docs
1619
[newsql]: https://en.wikipedia.org/wiki/NewSQL
20+
[getting-started-php]: https://cloud.google.com/spanner/docs/getting-started/php/
1721

1822
## Setup
1923

‎spanner/src/insert_data.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ function insert_data($instanceId, $databaseId)
5454
['SingerId' => 5, 'FirstName' => 'David', 'LastName' => 'Lomond'],
5555
])
5656
->insertBatch('Albums', [
57-
['SingerId' => 1, 'AlbumId' => 1, 'AlbumTitle' => 'Go, Go, Go'],
58-
['SingerId' => 1, 'AlbumId' => 2, 'AlbumTitle' => 'Total Junk'],
57+
['SingerId' => 1, 'AlbumId' => 1, 'AlbumTitle' => 'Total Junk'],
58+
['SingerId' => 1, 'AlbumId' => 2, 'AlbumTitle' => 'Go, Go, Go'],
5959
['SingerId' => 2, 'AlbumId' => 1, 'AlbumTitle' => 'Green'],
6060
['SingerId' => 2, 'AlbumId' => 2, 'AlbumTitle' => 'Forever Hold Your Peace'],
6161
['SingerId' => 2, 'AlbumId' => 3, 'AlbumTitle' => 'Terrified']

‎spanner/test/spannerTest.php‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ public function testInsertData()
8888
public function testQueryData()
8989
{
9090
$output = $this->runCommand('query-data');
91-
$this->assertContains('SingerId: 1, AlbumId: 1, AlbumTitle: Go, Go, Go', $output);
92-
$this->assertContains('SingerId: 1, AlbumId: 2, AlbumTitle: Total Junk', $output);
91+
$this->assertContains('SingerId: 1, AlbumId: 1, AlbumTitle: Total Junk', $output);
92+
$this->assertContains('SingerId: 1, AlbumId: 2, AlbumTitle: Go, Go, Go', $output);
9393
$this->assertContains('SingerId: 2, AlbumId: 1, AlbumTitle: Green', $output);
9494
$this->assertContains('SingerId: 2, AlbumId: 2, AlbumTitle: Forever Hold Your Peace', $output);
9595
$this->assertContains('SingerId: 2, AlbumId: 3, AlbumTitle: Terrified', $output);
@@ -117,8 +117,8 @@ public function testBatchQueryData()
117117
public function testReadData()
118118
{
119119
$output = $this->runCommand('read-data');
120-
$this->assertContains('SingerId: 1, AlbumId: 1, AlbumTitle: Go, Go, Go', $output);
121-
$this->assertContains('SingerId: 1, AlbumId: 2, AlbumTitle: Total Junk', $output);
120+
$this->assertContains('SingerId: 1, AlbumId: 1, AlbumTitle: Total Junk', $output);
121+
$this->assertContains('SingerId: 1, AlbumId: 2, AlbumTitle: Go, Go, Go', $output);
122122
$this->assertContains('SingerId: 2, AlbumId: 1, AlbumTitle: Green', $output);
123123
$this->assertContains('SingerId: 2, AlbumId: 2, AlbumTitle: Forever Hold Your Peace', $output);
124124
$this->assertContains('SingerId: 2, AlbumId: 3, AlbumTitle: Terrified', $output);
@@ -184,7 +184,7 @@ public function testQueryDataWithIndex()
184184
{
185185
$output = $this->runCommand('query-data-with-index');
186186
$this->assertContains('AlbumId: 2, AlbumTitle: Forever Hold Your Peace', $output);
187-
$this->assertContains('AlbumId: 1, AlbumTitle: Go, Go, Go', $output);
187+
$this->assertContains('AlbumId: 2, AlbumTitle: Go, Go, Go', $output);
188188
}
189189

190190
/**
@@ -194,8 +194,8 @@ public function testReadDataWithIndex()
194194
{
195195
$output = $this->runCommand('read-data-with-index');
196196

197-
$this->assertContains('AlbumId: 2, AlbumTitle: Total Junk', $output);
198-
$this->assertContains('AlbumId: 1, AlbumTitle: Go, Go, Go', $output);
197+
$this->assertContains('AlbumId: 1, AlbumTitle: Total Junk', $output);
198+
$this->assertContains('AlbumId: 2, AlbumTitle: Go, Go, Go', $output);
199199
$this->assertContains('AlbumId: 1, AlbumTitle: Green', $output);
200200
$this->assertContains('AlbumId: 3, AlbumTitle: Terrified', $output);
201201
$this->assertContains('AlbumId: 2, AlbumTitle: Forever Hold Your Peace', $output);
@@ -218,10 +218,10 @@ public function testReadDataWithStoringIndex()
218218
{
219219
$output = $this->runCommand('read-data-with-storing-index');
220220
$this->assertContains('AlbumId: 2, AlbumTitle: Forever Hold Your Peace, MarketingBudget:', $output);
221-
$this->assertContains('AlbumId: 1, AlbumTitle: Go, Go, Go, MarketingBudget:', $output);
221+
$this->assertContains('AlbumId: 2, AlbumTitle: Go, Go, Go, MarketingBudget:', $output);
222222
$this->assertContains('AlbumId: 1, AlbumTitle: Green, MarketingBudget:', $output);
223223
$this->assertContains('AlbumId: 3, AlbumTitle: Terrified, MarketingBudget:', $output);
224-
$this->assertContains('AlbumId: 2, AlbumTitle: Total Junk, MarketingBudget:', $output);
224+
$this->assertContains('AlbumId: 1, AlbumTitle: Total Junk, MarketingBudget:', $output);
225225
}
226226

227227
/**
@@ -230,8 +230,8 @@ public function testReadDataWithStoringIndex()
230230
public function testReadOnlyTransaction()
231231
{
232232
$output = $this->runCommand('read-only-transaction');
233-
$this->assertContains('SingerId: 1, AlbumId: 1, AlbumTitle: Go, Go, Go', $output);
234-
$this->assertContains('SingerId: 1, AlbumId: 2, AlbumTitle: Total Junk', $output);
233+
$this->assertContains('SingerId: 1, AlbumId: 1, AlbumTitle: Total Junk', $output);
234+
$this->assertContains('SingerId: 1, AlbumId: 2, AlbumTitle: Go, Go, Go', $output);
235235
$this->assertContains('SingerId: 2, AlbumId: 1, AlbumTitle: Green', $output);
236236
$this->assertContains('SingerId: 2, AlbumId: 2, AlbumTitle: Forever Hold Your Peace', $output);
237237
$this->assertContains('SingerId: 2, AlbumId: 3, AlbumTitle: Terrified', $output);
@@ -249,13 +249,13 @@ public function testReadStaleData()
249249
sleep(16 - $elapsed);
250250
}
251251
$output = $this->runCommand('read-stale-data');
252-
$this->assertContains('SingerId: 1, AlbumId: 1, AlbumTitle: Go, Go, Go', $output);
253-
$this->assertContains('SingerId: 1, AlbumId: 2, AlbumTitle: Total Junk', $output);
252+
$this->assertContains('SingerId: 1, AlbumId: 1, AlbumTitle: Total Junk', $output);
253+
$this->assertContains('SingerId: 1, AlbumId: 2, AlbumTitle: Go, Go, Go', $output);
254254
$this->assertContains('SingerId: 2, AlbumId: 1, AlbumTitle: Green', $output);
255255
$this->assertContains('SingerId: 2, AlbumId: 2, AlbumTitle: Forever Hold Your Peace', $output);
256256
$this->assertContains('SingerId: 2, AlbumId: 3, AlbumTitle: Terrified', $output);
257257
}
258-
258+
259259
/**
260260
* @depends testReadStaleData
261261
*/
@@ -265,7 +265,7 @@ public function testCreateTableTimestamp()
265265
$this->assertContains('Waiting for operation to complete...', $output);
266266
$this->assertContains('Created Performances table in database test-', $output);
267267
}
268-
268+
269269
/**
270270
* @depends testCreateTableTimestamp
271271
*/
@@ -274,7 +274,7 @@ public function testInsertDataTimestamp()
274274
$output = $this->runCommand('insert-data-timestamp');
275275
$this->assertEquals('Inserted data.' . PHP_EOL, $output);
276276
}
277-
277+
278278
/**
279279
* @depends testInsertDataTimestamp
280280
*/
@@ -284,7 +284,7 @@ public function testAddTimestampColumn()
284284
$this->assertContains('Waiting for operation to complete...', $output);
285285
$this->assertContains('Added LastUpdateTime as a commit timestamp column in Albums table', $output);
286286
}
287-
287+
288288
/**
289289
* @depends testAddTimestampColumn
290290
*/
@@ -293,7 +293,7 @@ public function testUpdateDataTimestamp()
293293
$output = $this->runCommand('update-data-timestamp');
294294
$this->assertEquals('Updated data.' . PHP_EOL, $output);
295295
}
296-
296+
297297
/**
298298
* @depends testUpdateDataTimestamp
299299
*/

0 commit comments

Comments
 (0)