From fee56185dcd305c41755646e21600bad10406158 Mon Sep 17 00:00:00 2001
From: Jille Timmermans <jille@quis.cx>
Date: Wed, 28 Jun 2023 10:47:35 +0200
Subject: [PATCH] codegen/golang: Bring :execlastid in line with the rest

Handling it separately is just waiting for bugs to happen. Git-blame
tells me the person to blame is .. me. Whoops.
---
 internal/codegen/golang/gen.go                     |  2 +-
 .../codegen/golang/templates/stdlib/queryCode.tmpl | 14 ++------------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/internal/codegen/golang/gen.go b/internal/codegen/golang/gen.go
index 9f1b6fe6b5..1d3ba6e13d 100644
--- a/internal/codegen/golang/gen.go
+++ b/internal/codegen/golang/gen.go
@@ -92,7 +92,7 @@ func (t *tmplCtx) codegenQueryRetval(q Query) (string, error) {
 		return "rows, err :=", nil
 	case ":exec":
 		return "_, err :=", nil
-	case ":execrows":
+	case ":execrows", ":execlastid":
 		return "result, err :=", nil
 	case ":execresult":
 		return "return", nil
diff --git a/internal/codegen/golang/templates/stdlib/queryCode.tmpl b/internal/codegen/golang/templates/stdlib/queryCode.tmpl
index cde37d81ed..aa7b85b793 100644
--- a/internal/codegen/golang/templates/stdlib/queryCode.tmpl
+++ b/internal/codegen/golang/templates/stdlib/queryCode.tmpl
@@ -87,18 +87,8 @@ func (q *Queries) {{.MethodName}}(ctx context.Context, {{ dbarg }} {{.Arg.Pair}}
 {{if eq .Cmd ":execlastid"}}
 {{range .Comments}}//{{.}}
 {{end -}}
-{{- if $.EmitMethodsWithDBArgument -}}
-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 -}}
-    {{- if $.EmitPreparedQueries}}
-    result, err := q.exec(ctx, q.{{.FieldName}}, {{.ConstantName}}, {{.Arg.Params}})
-    {{- else if $.EmitMethodsWithDBArgument}}
-    result, err := db.ExecContext(ctx, {{.ConstantName}}, {{.Arg.Params}})
-    {{- else}}
-    result, err := q.db.ExecContext(ctx, {{.ConstantName}}, {{.Arg.Params}})
-    {{- end}}
+func (q *Queries) {{.MethodName}}(ctx context.Context, {{ dbarg }} {{.Arg.Pair}}) (int64, error) {
+    {{- template "queryCodeStdExec" . }}
     if err != nil {
         return 0, err
     }