Skip to content

Commit 4c66700

Browse files
authored
fix(codegen/golang): Bring :execlastid in line with the rest (#2378)
Handling it separately is just waiting for bugs to happen. Git-blame tells me the person to blame is .. me. Whoops.
1 parent cde9524 commit 4c66700

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

Diff for: internal/codegen/golang/gen.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ func (t *tmplCtx) codegenQueryRetval(q Query) (string, error) {
9292
return "rows, err :=", nil
9393
case ":exec":
9494
return "_, err :=", nil
95-
case ":execrows":
95+
case ":execrows", ":execlastid":
9696
return "result, err :=", nil
9797
case ":execresult":
9898
return "return", nil

Diff for: internal/codegen/golang/templates/stdlib/queryCode.tmpl

+2-12
Original file line numberDiff line numberDiff line change
@@ -87,18 +87,8 @@ func (q *Queries) {{.MethodName}}(ctx context.Context, {{ dbarg }} {{.Arg.Pair}}
8787
{{if eq .Cmd ":execlastid"}}
8888
{{range .Comments}}//{{.}}
8989
{{end -}}
90-
{{- if $.EmitMethodsWithDBArgument -}}
91-
func (q *Queries) {{.MethodName}}(ctx context.Context, db DBTX, {{.Arg.Pair}}) (int64, error) {
92-
{{- else -}}
93-
func (q *Queries) {{.MethodName}}(ctx context.Context, {{.Arg.Pair}}) (int64, error) {
94-
{{- end -}}
95-
{{- if $.EmitPreparedQueries}}
96-
result, err := q.exec(ctx, q.{{.FieldName}}, {{.ConstantName}}, {{.Arg.Params}})
97-
{{- else if $.EmitMethodsWithDBArgument}}
98-
result, err := db.ExecContext(ctx, {{.ConstantName}}, {{.Arg.Params}})
99-
{{- else}}
100-
result, err := q.db.ExecContext(ctx, {{.ConstantName}}, {{.Arg.Params}})
101-
{{- end}}
90+
func (q *Queries) {{.MethodName}}(ctx context.Context, {{ dbarg }} {{.Arg.Pair}}) (int64, error) {
91+
{{- template "queryCodeStdExec" . }}
10292
if err != nil {
10393
return 0, err
10494
}

0 commit comments

Comments
 (0)