Consistent whitespace handling in Go query template (#1301)

* codegen/golang: test prepared query output

* codegen/golang: consistent whitespace in query tmpl

Author: wabain

internal/codegen/golang/templates/stdlib/queryCode.tmpl

@@ -29,9 +29,9 @@ func (q *Queries) {{.MethodName}}(ctx context.Context, {{.Arg.Pair}}) ({{.Ret.De
 {{- end -}}
   	{{- if $.EmitPreparedQueries}}
 	row := q.queryRow(ctx, q.{{.FieldName}}, {{.ConstantName}}, {{.Arg.Params}})
-	{{- else if $.EmitMethodsWithDBArgument -}}
+	{{- else if $.EmitMethodsWithDBArgument}}
 	row := db.QueryRowContext(ctx, {{.ConstantName}}, {{.Arg.Params}})
-	{{- else -}}
+	{{- else}}
 	row := q.db.QueryRowContext(ctx, {{.ConstantName}}, {{.Arg.Params}})
 	{{- end}}
 	{{- if ne .Arg.Pair .Ret.Pair }}
@@ -52,9 +52,9 @@ func (q *Queries) {{.MethodName}}(ctx context.Context, {{.Arg.Pair}}) ([]{{.Ret.
 {{- end -}}
     {{- if $.EmitPreparedQueries}}
     rows, err := q.query(ctx, q.{{.FieldName}}, {{.ConstantName}}, {{.Arg.Params}})
-    {{- else if $.EmitMethodsWithDBArgument -}}
+    {{- else if $.EmitMethodsWithDBArgument}}
     rows, err := db.QueryContext(ctx, {{.ConstantName}}, {{.Arg.Params}})
-    {{- else -}}
+    {{- else}}
     rows, err := q.db.QueryContext(ctx, {{.ConstantName}}, {{.Arg.Params}})
     {{- end}}
     if err != nil {
@@ -93,9 +93,9 @@ func (q *Queries) {{.MethodName}}(ctx context.Context, {{.Arg.Pair}}) error {
 {{- end -}}
     {{- if $.EmitPreparedQueries}}
     _, err := q.exec(ctx, q.{{.FieldName}}, {{.ConstantName}}, {{.Arg.Params}})
-    {{- else if $.EmitMethodsWithDBArgument -}}
+    {{- else if $.EmitMethodsWithDBArgument}}
     _, err := db.ExecContext(ctx, {{.ConstantName}}, {{.Arg.Params}})
-    {{- else -}}
+    {{- else}}
     _, err := q.db.ExecContext(ctx, {{.ConstantName}}, {{.Arg.Params}})
     {{- end}}
     return err
@@ -109,12 +109,12 @@ func (q *Queries) {{.MethodName}}(ctx context.Context, {{.Arg.Pair}}) error {
 func (q *Queries) {{.MethodName}}(ctx context.Context, db DBTX, {{.Arg.Pair}}) (int64, error) {
 {{- else -}}
 func (q *Queries) {{.MethodName}}(ctx context.Context, {{.Arg.Pair}}) (int64, error) {
-{{end -}}
+{{- end -}}
     {{- if $.EmitPreparedQueries}}
     result, err := q.exec(ctx, q.{{.FieldName}}, {{.ConstantName}}, {{.Arg.Params}})
-    {{- else if $.EmitMethodsWithDBArgument -}}
+    {{- else if $.EmitMethodsWithDBArgument}}
     result, err := db.ExecContext(ctx, {{.ConstantName}}, {{.Arg.Params}})
-    {{- else -}}
+    {{- else}}
     result, err := q.db.ExecContext(ctx, {{.ConstantName}}, {{.Arg.Params}})
     {{- end}}
     if err != nil {
@@ -134,9 +134,9 @@ func (q *Queries) {{.MethodName}}(ctx context.Context, {{.Arg.Pair}}) (sql.Resul
 {{- end -}}
     {{- if $.EmitPreparedQueries}}
     return q.exec(ctx, q.{{.FieldName}}, {{.ConstantName}}, {{.Arg.Params}})
-    {{- else if $.EmitMethodsWithDBArgument -}}
+    {{- else if $.EmitMethodsWithDBArgument}}
     return db.ExecContext(ctx, {{.ConstantName}}, {{.Arg.Params}})
-    {{- else -}}
+    {{- else}}
     return q.db.ExecContext(ctx, {{.ConstantName}}, {{.Arg.Params}})
     {{- end}}
 }

internal/endtoend/testdata/prepared_queries/mysql/go/db.go

@@ -0,0 +1,20 @@
+CREATE TABLE users (
+    id SERIAL NOT NULL,
+    first_name varchar(255) NOT NULL,
+    last_name varchar(255)
+);
+
+/* name: GetUserByID :one */
+SELECT first_name, id, last_name FROM users WHERE id = sqlc.arg('target_id');
+
+/* name: ListUsers :many */
+SELECT first_name, last_name FROM users;
+
+/* name: InsertNewUser :exec */
+INSERT INTO users (first_name, last_name) VALUES (?, ?);
+
+/* name: InsertNewUserWithResult :execresult */
+INSERT INTO users (first_name, last_name) VALUES (?, ?);
+
+/* name: DeleteUsersByName :execrows */
+DELETE FROM users WHERE first_name = ? AND last_name = ?;

internal/endtoend/testdata/prepared_queries/mysql/go/models.go

@@ -0,0 +1,13 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "name": "querytest",
+      "path": "go",
+      "schema": "query.sql",
+      "queries": "query.sql",
+      "engine": "mysql",
+      "emit_prepared_queries": true
+    }
+  ]
+}