Don't include _ in variable names

Author: kyleconroy

parser.go

@@ -392,15 +392,15 @@ func parseArgs(t postgres.Table, args []paramRef) []Arg {
 					}
 				}
 				if typ, ok := typeMap[key]; ok {
-					a = append(a, Arg{Name: key, Type: typ})
+					a = append(a, Arg{Name: argName(key), Type: typ})
 				} else {
 					panic("unknown column: " + key)
 				}
 			}
 		case nodes.ResTarget:
 			key := *n.Name
 			if typ, ok := typeMap[key]; ok {
-				a = append(a, Arg{Name: key, Type: typ})
+				a = append(a, Arg{Name: argName(key), Type: typ})
 			} else {
 				panic("unknown column: " + key)
 			}
@@ -601,6 +601,20 @@ type Arg struct {
 	Type string
 }
 
+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
+}
+
 type tmplCtx struct {
 	Q       string
 	Package string

postgres/schema.go

@@ -1,5 +1,7 @@
 package postgres
 
+import "log"
+
 type Schema struct {
 	Tables []Table
 }
@@ -28,6 +30,16 @@ func (c Column) GoType() string {
 		}
 	case "serial":
 		return "int"
+	case "integer":
+		return "int"
+	case "bool":
+		return "bool"
+	case "pg_catalog.bool":
+		return "bool"
+	case "pg_catalog.int4":
+		return "int"
+	case "pg_catalog.int8":
+		return "int"
 	case "pg_catalog.timestamp":
 		return "time.Time"
 	case "pg_catalog.varchar":
@@ -37,6 +49,7 @@ func (c Column) GoType() string {
 			return "sql.NullString"
 		}
 	default:
+		log.Printf("unknown Postgres type: %s\n", c.Type)
 		return "interface{}"
 	}
 }

testdata/ondeck/db.go

@@ -137,15 +137,15 @@ INSERT INTO venue (
 ) RETURNING id
 `
 
-func (q *Queries) CreateVenue(ctx context.Context, name string, slug string, spotify_playlist string, city string) (int, error) {
+func (q *Queries) CreateVenue(ctx context.Context, name string, slug string, spotifyPlaylist string, city string) (int, error) {
 	var row *sql.Row
 	switch {
 	case q.createVenue != nil && q.tx != nil:
-		row = q.tx.StmtContext(ctx, q.createVenue).QueryRowContext(ctx, name, slug, spotify_playlist, city)
+		row = q.tx.StmtContext(ctx, q.createVenue).QueryRowContext(ctx, name, slug, spotifyPlaylist, city)
 	case q.createVenue != nil:
-		row = q.createVenue.QueryRowContext(ctx, name, slug, spotify_playlist, city)
+		row = q.createVenue.QueryRowContext(ctx, name, slug, spotifyPlaylist, city)
 	default:
-		row = q.db.QueryRowContext(ctx, createVenue, name, slug, spotify_playlist, city)
+		row = q.db.QueryRowContext(ctx, createVenue, name, slug, spotifyPlaylist, city)
 	}
 	var i int
 	err := row.Scan(&i)