protos: Add missing field name (#2354)

kyleconroy · web-flow · commit da6fe0a21f5c · 2023-06-21T15:13:28.000-07:00
* buf: Add buf.yaml and buf.lock

* protos: Add missing json_tags_id_uppercase proto field

* Verify buf actions
diff --git a/.github/workflows/buf.yml b/.github/workflows/buf.yml
@@ -0,0 +1,9 @@
+name: buf
+on: pull_request
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: bufbuild/buf-setup-action@v1
+      - uses: bufbuild/buf-lint-action@v1
diff --git a/buf.lock b/buf.lock
@@ -0,0 +1,2 @@
+# Generated by buf. DO NOT EDIT.
+version: v1
diff --git a/buf.yaml b/buf.yaml
@@ -0,0 +1,7 @@
+version: v1
+breaking:
+  use:
+    - FILE
+lint:
+  use:
+    - DEFAULT
diff --git a/internal/cmd/shim.go b/internal/cmd/shim.go
@@ -84,7 +84,7 @@ func pluginGoCode(s config.SQLGo) *plugin.GoCode {
 	return &plugin.GoCode{
 		EmitInterface:               s.EmitInterface,
 		EmitJsonTags:                s.EmitJSONTags,
-		JsonTagsIDUppercase:         s.JsonTagsIDUppercase,
+		JsonTagsIdUppercase:         s.JsonTagsIDUppercase,
 		EmitDbTags:                  s.EmitDBTags,
 		EmitPreparedQueries:         s.EmitPreparedQueries,
 		EmitExactTableNames:         s.EmitExactTableNames,
diff --git a/internal/codegen/golang/field.go b/internal/codegen/golang/field.go
@@ -42,7 +42,7 @@ func TagsToString(tags map[string]string) string {
 
 func JSONTagName(name string, settings *plugin.Settings) string {
 	style := settings.Go.JsonTagsCaseStyle
-	idUppercase := settings.Go.JsonTagsIDUppercase
+	idUppercase := settings.Go.JsonTagsIdUppercase
 	if style == "" || style == "none" {
 		return name
 	} else {
diff --git a/internal/codegen/golang/gen.go b/internal/codegen/golang/gen.go
@@ -123,7 +123,7 @@ func generate(req *plugin.CodeGenRequest, enums []Enum, structs []Struct, querie
 	tctx := tmplCtx{
 		EmitInterface:             golang.EmitInterface,
 		EmitJSONTags:              golang.EmitJsonTags,
-		JsonTagsIDUppercase:       golang.JsonTagsIDUppercase,
+		JsonTagsIDUppercase:       golang.JsonTagsIdUppercase,
 		EmitDBTags:                golang.EmitDbTags,
 		EmitPreparedQueries:       golang.EmitPreparedQueries,
 		EmitEmptySlices:           golang.EmitEmptySlices,
diff --git a/internal/endtoend/testdata/codegen_json/gen/codegen.json b/internal/endtoend/testdata/codegen_json/gen/codegen.json
@@ -40,7 +40,8 @@
       "inflection_exclude_table_names": [],
       "emit_pointers_for_null_types": false,
       "query_parameter_limit": 1,
-      "output_batch_file_name": ""
+      "output_batch_file_name": "",
+      "json_tags_id_uppercase": false
     },
     "json": {
       "out": "gen",
diff --git a/internal/endtoend/testdata/process_plugin_disabled/gen/codegen.json b/internal/endtoend/testdata/process_plugin_disabled/gen/codegen.json
@@ -40,7 +40,8 @@
       "inflection_exclude_table_names": [],
       "emit_pointers_for_null_types": false,
       "query_parameter_limit": 1,
-      "output_batch_file_name": ""
+      "output_batch_file_name": "",
+      "json_tags_id_uppercase": false
     },
     "json": {
       "out": "",
diff --git a/internal/endtoend/testdata/process_plugin_sqlc_gen_json/gen/codegen.json b/internal/endtoend/testdata/process_plugin_sqlc_gen_json/gen/codegen.json
@@ -40,7 +40,8 @@
       "inflection_exclude_table_names": [],
       "emit_pointers_for_null_types": false,
       "query_parameter_limit": 1,
-      "output_batch_file_name": ""
+      "output_batch_file_name": "",
+      "json_tags_id_uppercase": false
     },
     "json": {
       "out": "",
diff --git a/internal/plugin/codegen.pb.go b/internal/plugin/codegen.pb.go
diff --git a/internal/plugin/codegen_vtproto.pb.go b/internal/plugin/codegen_vtproto.pb.go
diff --git a/protos/plugin/codegen.proto b/protos/plugin/codegen.proto
@@ -98,6 +98,7 @@ message GoCode
   bool emit_pointers_for_null_types = 22;
   optional int32 query_parameter_limit = 23;
   string output_batch_file_name = 24;
+  bool json_tags_id_uppercase = 26;
 }
 
 message JSONCode

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# Generated by buf. DO NOT EDIT.`
	`2`	`+version: v1`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +version: v1
 +breaking:
 +  use:
 +    - FILE
 +lint:
 +  use:
 +    - DEFAULT
Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,7 @@ message GoCode`
`98`	`98`	`bool emit_pointers_for_null_types = 22;`
`99`	`99`	`optional int32 query_parameter_limit = 23;`
`100`	`100`	`string output_batch_file_name = 24;`
	`101`	`+ bool json_tags_id_uppercase = 26;`
`101`	`102`	`}`
`102`	`103`
`103`	`104`	`message JSONCode`