Skip to content

Add Begin transaction methods to pgx & sql db code templates #4024

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions internal/codegen/golang/gen.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ type tmplCtx struct {
EmitAllEnumValues bool
UsesCopyFrom bool
UsesBatch bool
EmitBegin bool
OmitSqlcVersion bool
BuildTags string
WrapErrors bool
Expand Down Expand Up @@ -181,6 +182,7 @@ func generate(req *plugin.GenerateRequest, options *opts.Options, enums []Enum,
EmitMethodsWithDBArgument: options.EmitMethodsWithDbArgument,
EmitEnumValidMethod: options.EmitEnumValidMethod,
EmitAllEnumValues: options.EmitAllEnumValues,
EmitBegin: options.EmitBegin,
UsesCopyFrom: usesCopyFrom(queries),
UsesBatch: usesBatch(queries),
SQLDriver: parseDriver(options.SqlPackage),
Expand Down
1 change: 1 addition & 0 deletions internal/codegen/golang/opts/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ type Options struct {
EmitResultStructPointers bool `json:"emit_result_struct_pointers" yaml:"emit_result_struct_pointers"`
EmitParamsStructPointers bool `json:"emit_params_struct_pointers" yaml:"emit_params_struct_pointers"`
EmitMethodsWithDbArgument bool `json:"emit_methods_with_db_argument,omitempty" yaml:"emit_methods_with_db_argument"`
EmitBegin bool `json:"emit_begin,omitempty" yaml:"emit_begin"`
EmitPointersForNullTypes bool `json:"emit_pointers_for_null_types" yaml:"emit_pointers_for_null_types"`
EmitEnumValidMethod bool `json:"emit_enum_valid_method,omitempty" yaml:"emit_enum_valid_method"`
EmitAllEnumValues bool `json:"emit_all_enum_values,omitempty" yaml:"emit_all_enum_values"`
Expand Down
20 changes: 20 additions & 0 deletions internal/codegen/golang/templates/pgx/dbCode.tmpl
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{{define "dbCodeTemplatePgx"}}

type DBTX interface {
{{- if .EmitBegin }}
Begin(context.Context) (pgx.Tx, error)
BeginTx(context.Context, txOptions TxOptions) (pgx.Tx, error)
{{- end }}
Exec(context.Context, string, ...interface{}) (pgconn.CommandTag, error)
Query(context.Context, string, ...interface{}) (pgx.Rows, error)
QueryRow(context.Context, string, ...interface{}) pgx.Row
Expand Down Expand Up @@ -33,5 +37,21 @@ func (q *Queries) WithTx(tx pgx.Tx) *Queries {
db: tx,
}
}
{{- if .EmitBegin }}
func (q *Queries) Begin(ctx context.Context) (*Queries, error) {
tx, err := q.db.Begin(ctx)
if (err != nil {
return nil, err
}
return q.WithTx(tx), nil
}
func (q *Queries) BeginTx(ctx context.Context, txOptions TxOptions) (*Queries, error) {
tx, err := q.db.BeginTx(ctx, txOptions)
if (err != nil {
return nil, err
}
return q.WithTx(tx), nil
}
{{- end }}
{{end}}
{{end}}
12 changes: 12 additions & 0 deletions internal/codegen/golang/templates/stdlib/dbCode.tmpl
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{{define "dbCodeTemplateStd"}}
type DBTX interface {
{{- if .EmitBegin }}
BeginTx(ctx context.Context, opts driver.TxOptions) (driver.Tx, error)
{{end}}
ExecContext(context.Context, string, ...interface{}) (sql.Result, error)
PrepareContext(context.Context, string) (*sql.Stmt, error)
QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error)
Expand Down Expand Up @@ -101,5 +104,14 @@ func (q *Queries) WithTx(tx *sql.Tx) *Queries {
{{- end}}
}
}
{{- if .EmitBegin }}
func (q *Queries) BeginTx(ctx context.Context, opts driver.TxOptions) (*Queries, error) {
tx, err := q.db.BeginTx(ctx, opts)
if (err != nil {
return nil, err
}
return q.WithTx(tx), nil
}
{{end}}
{{end}}
{{end}}
Loading