spanner.Statementを受け取るように修正 refs #9

gcpug · May 23, 2019 · 125bc81 · 125bc81
1 parent eb62bec
commit 125bc81
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/spanner/spanner_service.go b/spanner/spanner_service.go
@@ -62,9 +62,7 @@ type UpdateMutationer interface {
 	GetMutation(ctx context.Context, row *spanner.Row) (*spanner.Mutation, error)
 }
 
-func (s *SpannerEntityService) UpdateExperiment(ctx context.Context, table string, columns []string, sql string, mutationer UpdateMutationer) (int, error) {
-	q := spanner.NewStatement(sql)
-
+func (s *SpannerEntityService) UpdateExperiment(ctx context.Context, table string, columns []string, statement spanner.Statement, mutationer UpdateMutationer) (int, error) {
 	const bufferCount = 1000
 	rows := make([]*spanner.Row, 0, bufferCount)
 
@@ -75,7 +73,7 @@ func (s *SpannerEntityService) UpdateExperiment(ctx context.Context, table strin
 	}
 	defer tx.Close()
 
-	iter := tx.Query(ctx, q)
+	iter := tx.Query(ctx, statement)
 	defer iter.Stop()
 	for {
 		row, err := iter.Next()

diff --git a/spanner/spanner_service_test.go b/spanner/spanner_service_test.go
@@ -39,7 +39,10 @@ func TestSpannerEntityService_UpdateExperiment(t *testing.T) {
 	ctx := context.Background()
 	client := shovels.NewClient(ctx, "projects/gcpug-public-spanner/instances/merpay-sponsored-instance/databases/sinmetal")
 	s := shovels.NewSpannerEntityService(client)
-	count, err := s.UpdateExperiment(ctx, TableName, []string{PrimaryKeyName}, `SELECT Id From TweetHashKey WHERE Author != "sinmetal"`, &SampleMutationer{})
+
+	q := spanner.NewStatement(`SELECT Id From TweetHashKey WHERE Author != @Author`)
+	q.Params["Author"] = "sinmetal"
+	count, err := s.UpdateExperiment(ctx, TableName, []string{PrimaryKeyName}, q, &SampleMutationer{})
 	if err != nil {
 		t.Fatal(err)
 	}