Adding support to rename json fields in generated structs

internal/codegen/golang/result.go

@@ -78,7 +78,7 @@ func buildStructs(r *compiler.Result, settings config.CombinedSettings) []Struct
 					tags["db:"] = column.Name
 				}
 				if settings.Go.EmitJSONTags {
-					tags["json:"] = column.Name
+					tags["json:"] = JSONTagName(column.Name, settings)
 				}
 				s.Fields = append(s.Fields, Field{
 					Name:    StructName(column.Name, settings),
@@ -239,7 +239,7 @@ func columnsToStruct(r *compiler.Result, name string, columns []goColumn, settin
 	suffixes := map[int]int{}
 	for i, c := range columns {
 		colName := columnName(c.Column, i)
-		tagName := colName
+		tagName := JSONTagName(colName, settings)
 		fieldName := StructName(colName, settings)
 		// Track suffixes by the ID of the column, so that columns referring to the same numbered parameter can be
 		// reused.
@@ -259,7 +259,7 @@ func columnsToStruct(r *compiler.Result, name string, columns []goColumn, settin
 			tags["db:"] = tagName
 		}
 		if settings.Go.EmitJSONTags {
-			tags["json:"] = tagName
+			tags["json:"] = JSONTagName(tagName, settings)
 		}
 		gs.Fields = append(gs.Fields, Field{
 			Name: fieldName,

internal/codegen/golang/struct.go

@@ -14,17 +14,34 @@ type Struct struct {
 	Comment string
 }
 
-func StructName(name string, settings config.CombinedSettings) string {
-	if rename := settings.Rename[name]; rename != "" {
-		return rename
-	}
-	out := ""
+func doID(name string, settings config.CombinedSettings) (out string) {
 	for _, p := range strings.Split(name, "_") {
 		if p == "id" {
 			out += "ID"
 		} else {
 			out += strings.Title(p)
 		}
 	}
-	return out
+	return
+}
+
+func doRename(name string, settings config.CombinedSettings) string {
+	if rename := settings.Rename[name]; rename != "" {
+		return rename
+	}
+	return name
+}
+
+func JSONTagName(name string, settings config.CombinedSettings) string {
+	if settings.Go.RenameJSONTags {
+		name = doRename(name, settings)
+	}
+	return name
+}
+
+func StructName(name string, settings config.CombinedSettings) string {
+	if !settings.Go.SkipStructRename {
+		name = doRename(name, settings)
+	}
+	return doID(name, settings)
 }

internal/config/config.go

@@ -115,6 +115,8 @@ type SQLGo struct {
 	EmitPreparedQueries bool              `json:"emit_prepared_queries" yaml:"emit_prepared_queries"`
 	EmitExactTableNames bool              `json:"emit_exact_table_names,omitempty" yaml:"emit_exact_table_names"`
 	EmitEmptySlices     bool              `json:"emit_empty_slices,omitempty" yaml:"emit_empty_slices"`
+	SkipStructRename    bool              `json:"skip_struct_rename" yaml:"skip_struct_rename"`
+	RenameJSONTags      bool              `json:"rename_json_tags" yaml:"rename_json_tags"`
 	Package             string            `json:"package" yaml:"package"`
 	Out                 string            `json:"out" yaml:"out"`
 	Overrides           []Override        `json:"overrides,omitempty" yaml:"overrides"`

internal/config/v_one.go

@@ -27,6 +27,8 @@ type v1PackageSettings struct {
 	EmitPreparedQueries bool       `json:"emit_prepared_queries" yaml:"emit_prepared_queries"`
 	EmitExactTableNames bool       `json:"emit_exact_table_names,omitempty" yaml:"emit_exact_table_names"`
 	EmitEmptySlices     bool       `json:"emit_empty_slices,omitempty" yaml:"emit_empty_slices"`
+	SkipStructRename    bool       `json:"skip_struct_rename" yaml:"skip_struct_rename"`
+	RenameJSONTags      bool       `json:"rename_json_tags" yaml:"rename_json_tags"`
 	Overrides           []Override `json:"overrides" yaml:"overrides"`
 }
 
@@ -109,6 +111,8 @@ func (c *V1GenerateSettings) Translate() Config {
 					EmitPreparedQueries: pkg.EmitPreparedQueries,
 					EmitExactTableNames: pkg.EmitExactTableNames,
 					EmitEmptySlices:     pkg.EmitEmptySlices,
+					RenameJSONTags:      pkg.RenameJSONTags,
+					SkipStructRename:    pkg.SkipStructRename,
 					Package:             pkg.Name,
 					Out:                 pkg.Path,
 					Overrides:           pkg.Overrides,

internal/endtoend/testdata/rename_json_tag/query.sql

@@ -0,0 +1,12 @@
+CREATE TYPE ip_protocol AS enum('tcp', 'ip', 'icmp');
+
+CREATE TABLE bar_old (id_old serial not null, ip_old ip_protocol NOT NULL);
+
+-- name: ListFoo :many
+SELECT id_old as foo_old, id_old as baz_old
+FROM bar_old
+WHERE ip_old = $1 AND id_old = $2;
+
+-- name: ListBar :many
+SELECT * FROM bar_old;
+

internal/endtoend/testdata/rename_json_tag/sqlc.json

@@ -0,0 +1,21 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "name": "querytest",
+      "schema": "query.sql",
+      "queries": "query.sql",
+      "emit_json_tags": true,
+      "rename_json_tags": true
+    }
+  ],
+  "rename": {
+    "id_old": "IDNew",
+    "bar_old": "BarNew",
+    "foo_old": "FooNew",
+    "ip_protocol": "IPProtocol",
+    "ip_protocol_tcp": "IPProtocolTCP"
+  }
+}
+