Merge pull request #128 from DoubleDi/master

Remove key column conflict if spanner has a column named `key`
cloudspannerecosystem · Feb 26, 2024 · 7bd1b1f · 7bd1b1f
2 parents a26daf3 + a733cce
commit 7bd1b1f
Show file tree

Hide file tree

Showing 21 changed files with 42 additions and 42 deletions.
diff --git a/v2/module/builtin/templates/operation.go.tpl b/v2/module/builtin/templates/operation.go.tpl
@@ -47,8 +47,8 @@ func ({{ $short }} *{{ .Name }}) UpdateColumns(ctx context.Context, cols ...stri
 
 // Find{{ .Name }} gets a {{ .Name }} by primary key
 func Find{{ .Name }}(ctx context.Context, db YODB{{ goParams .PrimaryKeyFields true true }}) (*{{ .Name }}, error) {
-	key := spanner.Key{ {{ goEncodedParams .PrimaryKeyFields false }} }
-	row, err := db.ReadRow(ctx, "{{ $table }}", key, {{ .Name }}Columns())
+	_key := spanner.Key{ {{ goEncodedParams .PrimaryKeyFields false }} }
+	row, err := db.ReadRow(ctx, "{{ $table }}", _key, {{ .Name }}Columns())
 	if err != nil {
 		return nil, newError("Find{{ .Name }}", "{{ $table }}", err)
 	}

diff --git a/v2/test/testmodels/default/composite_primary_key.yo.go b/v2/test/testmodels/default/composite_primary_key.yo.go
diff --git a/v2/test/testmodels/default/custom_composite_primary_key.yo.go b/v2/test/testmodels/default/custom_composite_primary_key.yo.go
diff --git a/v2/test/testmodels/default/custom_primitive_type.yo.go b/v2/test/testmodels/default/custom_primitive_type.yo.go
diff --git a/v2/test/testmodels/default/fereign_item.yo.go b/v2/test/testmodels/default/fereign_item.yo.go
diff --git a/v2/test/testmodels/default/full_type.yo.go b/v2/test/testmodels/default/full_type.yo.go
diff --git a/v2/test/testmodels/default/generated_column.yo.go b/v2/test/testmodels/default/generated_column.yo.go
diff --git a/v2/test/testmodels/default/inflection.yo.go b/v2/test/testmodels/default/inflection.yo.go
diff --git a/v2/test/testmodels/default/item.yo.go b/v2/test/testmodels/default/item.yo.go
diff --git a/v2/test/testmodels/default/max_length.yo.go b/v2/test/testmodels/default/max_length.yo.go
diff --git a/v2/test/testmodels/default/snake_case.yo.go b/v2/test/testmodels/default/snake_case.yo.go
diff --git a/v2/test/testmodels/legacy_default/composite_primary_key.yo.go b/v2/test/testmodels/legacy_default/composite_primary_key.yo.go
diff --git a/v2/test/testmodels/legacy_default/custom_composite_primary_key.yo.go b/v2/test/testmodels/legacy_default/custom_composite_primary_key.yo.go
diff --git a/v2/test/testmodels/legacy_default/custom_primitive_type.yo.go b/v2/test/testmodels/legacy_default/custom_primitive_type.yo.go
diff --git a/v2/test/testmodels/legacy_default/fereign_item.yo.go b/v2/test/testmodels/legacy_default/fereign_item.yo.go
diff --git a/v2/test/testmodels/legacy_default/full_type.yo.go b/v2/test/testmodels/legacy_default/full_type.yo.go
diff --git a/v2/test/testmodels/legacy_default/generated_column.yo.go b/v2/test/testmodels/legacy_default/generated_column.yo.go
diff --git a/v2/test/testmodels/legacy_default/inflection.yo.go b/v2/test/testmodels/legacy_default/inflection.yo.go
diff --git a/v2/test/testmodels/legacy_default/item.yo.go b/v2/test/testmodels/legacy_default/item.yo.go
diff --git a/v2/test/testmodels/legacy_default/max_length.yo.go b/v2/test/testmodels/legacy_default/max_length.yo.go
diff --git a/v2/test/testmodels/legacy_default/snake_case.yo.go b/v2/test/testmodels/legacy_default/snake_case.yo.go