fix json tag naming for embeds

Author: nickjackson

internal/codegen/golang/result.go

@@ -73,6 +73,7 @@ func buildStructs(req *plugin.CodeGenRequest) []Struct {
 			s := Struct{
 				Table:   plugin.Identifier{Schema: schema.Name, Name: table.Rel.Name},
 				Name:    StructName(structName, req.Settings),
+				TagName: structName,
 				Comment: table.Comment,
 			}
 			for _, column := range table.Columns {
@@ -361,7 +362,7 @@ func columnsToStruct(req *plugin.CodeGenRequest, name string, embeds []goEmbed,
 	for _, em := range embeds {
 
 		fieldName := em.Model.Name
-		tagName := fieldName
+		tagName := em.Model.TagName
 
 		seen, ok := seenEmbeds[fieldName]
 		if !ok {

internal/codegen/golang/struct.go

@@ -11,6 +11,7 @@ import (
 type Struct struct {
 	Table       plugin.Identifier
 	Name        string
+	TagName     string
 	EmbedFields []EmbedField
 	Fields      []Field
 	Comment     string

internal/endtoend/testdata/sqlc_embed/postgresql/pgx/go/models.go

@@ -7,7 +7,9 @@
       "sql_package": "pgx/v4",
       "name": "querytest",
       "schema": "query.sql",
-      "queries": "query.sql"
+      "queries": "query.sql",
+      "emit_json_tags": true,
+      "emit_db_tags": true
     }
   ]
 }