gen: Create consistent JSON tags (#110)

A field's JSON tag value should be the name of the column as it appears
in the database.

Author: kyleconroy

internal/dinosql/gen.go

@@ -556,9 +556,23 @@ func (r Result) columnsToStruct(name string, columns []core.Column) *GoStruct {
 	return &gs
 }
 
+func argName(name string) string {
+	out := ""
+	for i, p := range strings.Split(name, "_") {
+		if i == 0 {
+			out += strings.ToLower(p)
+		} else if p == "id" {
+			out += "ID"
+		} else {
+			out += strings.Title(p)
+		}
+	}
+	return out
+}
+
 func paramName(p Parameter) string {
 	if p.Column.Name != "" {
-		return p.Column.Name
+		return argName(p.Column.Name)
 	}
 	return fmt.Sprintf("dollar_%d", p.Number)
 }

internal/dinosql/parser.go

@@ -804,20 +804,6 @@ func search(root nodes.Node, f func(nodes.Node) bool) nodes.List {
 	return ns.list
 }
 
-func argName(name string) string {
-	out := ""
-	for i, p := range strings.Split(name, "_") {
-		if i == 0 {
-			out += strings.ToLower(p)
-		} else if p == "id" {
-			out += "ID"
-		} else {
-			out += strings.Title(p)
-		}
-	}
-	return out
-}
-
 func resolveCatalogRefs(c core.Catalog, rvs []nodes.RangeVar, args []paramRef) ([]Parameter, error) {
 	aliasMap := map[string]core.FQN{}
 	// TODO: Deprecate defaultTable
@@ -939,7 +925,7 @@ func resolveCatalogRefs(c core.Catalog, rvs []nodes.RangeVar, args []paramRef) (
 						a = append(a, Parameter{
 							Number: ref.ref.Number,
 							Column: core.Column{
-								Name:     argName(key),
+								Name:     key,
 								DataType: c.DataType,
 								NotNull:  c.NotNull,
 								IsArray:  c.IsArray,
@@ -972,7 +958,7 @@ func resolveCatalogRefs(c core.Catalog, rvs []nodes.RangeVar, args []paramRef) (
 				a = append(a, Parameter{
 					Number: ref.ref.Number,
 					Column: core.Column{
-						Name:     argName(key),
+						Name:     key,
 						DataType: c.DataType,
 						NotNull:  c.NotNull,
 						IsArray:  c.IsArray,

internal/dinosql/parser_test.go

@@ -165,15 +165,17 @@ func TestParseSchema(t *testing.T) {
 	}
 
 	q, err := ParseQueries(c, GenerateSettings{}, PackageSettings{
-		Queries: filepath.Join("testdata", "ondeck", "query"),
+		Queries:      filepath.Join("testdata", "ondeck", "query"),
+		EmitJSONTags: true,
 	})
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	t.Run("default", func(t *testing.T) {
 		output, err := Generate(q, GenerateSettings{}, PackageSettings{
-			Name: "ondeck",
+			Name:         "ondeck",
+			EmitJSONTags: true,
 		})
 		if err != nil {
 			t.Fatal(err)

internal/dinosql/query_test.go

@@ -214,7 +214,7 @@ func TestQueries(t *testing.T) {
 					{1, core.Column{NotNull: true, DataType: "text", Name: "slug"}},
 					{2, core.Column{NotNull: true, DataType: "pg_catalog.varchar", Name: "name"}},
 					{3, core.Column{NotNull: true, DataType: "text", Name: "city"}},
-					{4, core.Column{NotNull: true, DataType: "pg_catalog.varchar", Name: "spotifyPlaylist"}},
+					{4, core.Column{NotNull: true, DataType: "pg_catalog.varchar", Name: "spotify_playlist"}},
 					{5, core.Column{NotNull: true, DataType: "status", Name: "status"}},
 				},
 			},

internal/dinosql/testdata/ondeck/city.sql.go

@@ -4,7 +4,8 @@
       "name": "ondeck",
       "path": ".",
       "schema": "./schema",
-      "queries": "./query"
+      "queries": "./query",
+      "emit_json_tags": true
     },
     {
       "path": "prepared",