From 8e9321e5c487a8d69a94e19460205542b05653e2 Mon Sep 17 00:00:00 2001 From: zaneli Date: Fri, 10 Feb 2023 11:50:15 +0900 Subject: [PATCH 1/3] fix: Prevent variable redeclaration in single param conflict for pgx --- .../golang/templates/pgx/queryCode.tmpl | 2 + .../postgresql/pgx/v4/go/db.go | 32 +++++++++ .../postgresql/{ => pgx/v4}/go/models.go | 0 .../postgresql/pgx/v4/go/query.sql.go | 67 +++++++++++++++++++ .../postgresql/{ => pgx/v4}/query.sql | 0 .../postgresql/pgx/v4/sqlc.json | 13 ++++ .../postgresql/pgx/v5/go/db.go | 32 +++++++++ .../postgresql/pgx/v5/go/models.go | 19 ++++++ .../postgresql/pgx/v5/go/query.sql.go | 67 +++++++++++++++++++ .../postgresql/pgx/v5/query.sql | 37 ++++++++++ .../postgresql/pgx/v5/sqlc.json | 13 ++++ .../postgresql/{ => stdlib}/go/db.go | 0 .../postgresql/stdlib/go/models.go | 21 ++++++ .../postgresql/{ => stdlib}/go/query.sql.go | 0 .../postgresql/stdlib/query.sql | 37 ++++++++++ .../postgresql/{ => stdlib}/sqlc.json | 0 16 files changed, 340 insertions(+) create mode 100644 internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/db.go rename internal/endtoend/testdata/single_param_conflict/postgresql/{ => pgx/v4}/go/models.go (100%) create mode 100644 internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/query.sql.go rename internal/endtoend/testdata/single_param_conflict/postgresql/{ => pgx/v4}/query.sql (100%) create mode 100644 internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/sqlc.json create mode 100644 internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/db.go create mode 100644 internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/models.go create mode 100644 internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/query.sql.go create mode 100644 internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/query.sql create mode 100644 internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/sqlc.json rename internal/endtoend/testdata/single_param_conflict/postgresql/{ => stdlib}/go/db.go (100%) create mode 100644 internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/go/models.go rename internal/endtoend/testdata/single_param_conflict/postgresql/{ => stdlib}/go/query.sql.go (100%) create mode 100644 internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/query.sql rename internal/endtoend/testdata/single_param_conflict/postgresql/{ => stdlib}/sqlc.json (100%) diff --git a/internal/codegen/golang/templates/pgx/queryCode.tmpl b/internal/codegen/golang/templates/pgx/queryCode.tmpl index 3f56f694ec..1736fa11f7 100644 --- a/internal/codegen/golang/templates/pgx/queryCode.tmpl +++ b/internal/codegen/golang/templates/pgx/queryCode.tmpl @@ -33,7 +33,9 @@ func (q *Queries) {{.MethodName}}(ctx context.Context, db DBTX, {{.Arg.Pair}}) ( func (q *Queries) {{.MethodName}}(ctx context.Context, {{.Arg.Pair}}) ({{.Ret.DefineType}}, error) { row := q.db.QueryRow(ctx, {{.ConstantName}}, {{.Arg.Params}}) {{- end}} + {{- if ne .Arg.Pair .Ret.Pair }} var {{.Ret.Name}} {{.Ret.Type}} + {{- end}} err := row.Scan({{.Ret.Scan}}) return {{.Ret.ReturnName}}, err } diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/db.go b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/db.go new file mode 100644 index 0000000000..7fb8bea331 --- /dev/null +++ b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/db.go @@ -0,0 +1,32 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.16.0 + +package querytest + +import ( + "context" + + "github.com/jackc/pgconn" + "github.com/jackc/pgx/v4" +) + +type DBTX interface { + Exec(context.Context, string, ...interface{}) (pgconn.CommandTag, error) + Query(context.Context, string, ...interface{}) (pgx.Rows, error) + QueryRow(context.Context, string, ...interface{}) pgx.Row +} + +func New(db DBTX) *Queries { + return &Queries{db: db} +} + +type Queries struct { + db DBTX +} + +func (q *Queries) WithTx(tx pgx.Tx) *Queries { + return &Queries{ + db: tx, + } +} diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/go/models.go b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/models.go similarity index 100% rename from internal/endtoend/testdata/single_param_conflict/postgresql/go/models.go rename to internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/models.go diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/query.sql.go b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/query.sql.go new file mode 100644 index 0000000000..6943a29a45 --- /dev/null +++ b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/query.sql.go @@ -0,0 +1,67 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.16.0 +// source: query.sql + +package querytest + +import ( + "context" + + "github.com/google/uuid" +) + +const getAuthorByID = `-- name: GetAuthorByID :one +SELECT id, name, bio +FROM authors +WHERE id = $1 +LIMIT 1 +` + +func (q *Queries) GetAuthorByID(ctx context.Context, id int64) (Author, error) { + row := q.db.QueryRow(ctx, getAuthorByID, id) + var i Author + err := row.Scan(&i.ID, &i.Name, &i.Bio) + return i, err +} + +const getAuthorIDByID = `-- name: GetAuthorIDByID :one +SELECT id +FROM authors +WHERE id = $1 +LIMIT 1 +` + +func (q *Queries) GetAuthorIDByID(ctx context.Context, id int64) (int64, error) { + row := q.db.QueryRow(ctx, getAuthorIDByID, id) + err := row.Scan(&id) + return id, err +} + +const getUser = `-- name: GetUser :one +SELECT sub +FROM users +WHERE sub = $1 +LIMIT 1 +` + +func (q *Queries) GetUser(ctx context.Context, sub uuid.UUID) (uuid.UUID, error) { + row := q.db.QueryRow(ctx, getUser, sub) + err := row.Scan(&sub) + return sub, err +} + +const setDefaultName = `-- name: SetDefaultName :one + +UPDATE authors +SET name = "Default Name" +WHERE id = $1 +RETURNING id +` + +// https://github.com/kyleconroy/sqlc/issues/1235 +func (q *Queries) SetDefaultName(ctx context.Context, id int64) (int64, error) { + row := q.db.QueryRow(ctx, setDefaultName, id) + err := row.Scan(&id) + return id, err +} diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/query.sql b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/query.sql similarity index 100% rename from internal/endtoend/testdata/single_param_conflict/postgresql/query.sql rename to internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/query.sql diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/sqlc.json b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/sqlc.json new file mode 100644 index 0000000000..aa9521eab8 --- /dev/null +++ b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/sqlc.json @@ -0,0 +1,13 @@ +{ + "version": "1", + "packages": [ + { + "engine": "postgresql", + "sql_package": "pgx/v4", + "path": "go", + "name": "querytest", + "schema": "query.sql", + "queries": "query.sql" + } + ] +} diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/db.go b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/db.go new file mode 100644 index 0000000000..a213f04680 --- /dev/null +++ b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/db.go @@ -0,0 +1,32 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.16.0 + +package querytest + +import ( + "context" + + "github.com/jackc/pgx/v5" + "github.com/jackc/pgx/v5/pgconn" +) + +type DBTX interface { + Exec(context.Context, string, ...interface{}) (pgconn.CommandTag, error) + Query(context.Context, string, ...interface{}) (pgx.Rows, error) + QueryRow(context.Context, string, ...interface{}) pgx.Row +} + +func New(db DBTX) *Queries { + return &Queries{db: db} +} + +type Queries struct { + db DBTX +} + +func (q *Queries) WithTx(tx pgx.Tx) *Queries { + return &Queries{ + db: tx, + } +} diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/models.go b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/models.go new file mode 100644 index 0000000000..4b6e9cc973 --- /dev/null +++ b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/models.go @@ -0,0 +1,19 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.16.0 + +package querytest + +import ( + "github.com/jackc/pgx/v5/pgtype" +) + +type Author struct { + ID int64 + Name string + Bio pgtype.Text +} + +type User struct { + Sub pgtype.UUID +} diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/query.sql.go b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/query.sql.go new file mode 100644 index 0000000000..e30254b13d --- /dev/null +++ b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/query.sql.go @@ -0,0 +1,67 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.16.0 +// source: query.sql + +package querytest + +import ( + "context" + + "github.com/jackc/pgx/v5/pgtype" +) + +const getAuthorByID = `-- name: GetAuthorByID :one +SELECT id, name, bio +FROM authors +WHERE id = $1 +LIMIT 1 +` + +func (q *Queries) GetAuthorByID(ctx context.Context, id int64) (Author, error) { + row := q.db.QueryRow(ctx, getAuthorByID, id) + var i Author + err := row.Scan(&i.ID, &i.Name, &i.Bio) + return i, err +} + +const getAuthorIDByID = `-- name: GetAuthorIDByID :one +SELECT id +FROM authors +WHERE id = $1 +LIMIT 1 +` + +func (q *Queries) GetAuthorIDByID(ctx context.Context, id int64) (int64, error) { + row := q.db.QueryRow(ctx, getAuthorIDByID, id) + err := row.Scan(&id) + return id, err +} + +const getUser = `-- name: GetUser :one +SELECT sub +FROM users +WHERE sub = $1 +LIMIT 1 +` + +func (q *Queries) GetUser(ctx context.Context, sub pgtype.UUID) (pgtype.UUID, error) { + row := q.db.QueryRow(ctx, getUser, sub) + err := row.Scan(&sub) + return sub, err +} + +const setDefaultName = `-- name: SetDefaultName :one + +UPDATE authors +SET name = "Default Name" +WHERE id = $1 +RETURNING id +` + +// https://github.com/kyleconroy/sqlc/issues/1235 +func (q *Queries) SetDefaultName(ctx context.Context, id int64) (int64, error) { + row := q.db.QueryRow(ctx, setDefaultName, id) + err := row.Scan(&id) + return id, err +} diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/query.sql b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/query.sql new file mode 100644 index 0000000000..45c059a3aa --- /dev/null +++ b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/query.sql @@ -0,0 +1,37 @@ +-- Example queries for sqlc +CREATE TABLE authors ( + id BIGSERIAL PRIMARY KEY, + name TEXT NOT NULL, + bio text +); + +-- name: GetAuthorIDByID :one +SELECT id +FROM authors +WHERE id = $1 +LIMIT 1; + +-- name: GetAuthorByID :one +SELECT id, name, bio +FROM authors +WHERE id = $1 +LIMIT 1; + +-- https://github.com/kyleconroy/sqlc/issues/1290 +CREATE TABLE users ( + sub UUID PRIMARY KEY +); + +-- name: GetUser :one +SELECT sub +FROM users +WHERE sub = $1 +LIMIT 1; + +-- https://github.com/kyleconroy/sqlc/issues/1235 + +-- name: SetDefaultName :one +UPDATE authors +SET name = "Default Name" +WHERE id = $1 +RETURNING id; diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/sqlc.json b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/sqlc.json new file mode 100644 index 0000000000..94b58b2000 --- /dev/null +++ b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/sqlc.json @@ -0,0 +1,13 @@ +{ + "version": "1", + "packages": [ + { + "engine": "postgresql", + "sql_package": "pgx/v5", + "path": "go", + "name": "querytest", + "schema": "query.sql", + "queries": "query.sql" + } + ] +} diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/go/db.go b/internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/go/db.go similarity index 100% rename from internal/endtoend/testdata/single_param_conflict/postgresql/go/db.go rename to internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/go/db.go diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/go/models.go b/internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/go/models.go new file mode 100644 index 0000000000..46560fd641 --- /dev/null +++ b/internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/go/models.go @@ -0,0 +1,21 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.16.0 + +package querytest + +import ( + "database/sql" + + "github.com/google/uuid" +) + +type Author struct { + ID int64 + Name string + Bio sql.NullString +} + +type User struct { + Sub uuid.UUID +} diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/go/query.sql.go b/internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/go/query.sql.go similarity index 100% rename from internal/endtoend/testdata/single_param_conflict/postgresql/go/query.sql.go rename to internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/go/query.sql.go diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/query.sql b/internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/query.sql new file mode 100644 index 0000000000..45c059a3aa --- /dev/null +++ b/internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/query.sql @@ -0,0 +1,37 @@ +-- Example queries for sqlc +CREATE TABLE authors ( + id BIGSERIAL PRIMARY KEY, + name TEXT NOT NULL, + bio text +); + +-- name: GetAuthorIDByID :one +SELECT id +FROM authors +WHERE id = $1 +LIMIT 1; + +-- name: GetAuthorByID :one +SELECT id, name, bio +FROM authors +WHERE id = $1 +LIMIT 1; + +-- https://github.com/kyleconroy/sqlc/issues/1290 +CREATE TABLE users ( + sub UUID PRIMARY KEY +); + +-- name: GetUser :one +SELECT sub +FROM users +WHERE sub = $1 +LIMIT 1; + +-- https://github.com/kyleconroy/sqlc/issues/1235 + +-- name: SetDefaultName :one +UPDATE authors +SET name = "Default Name" +WHERE id = $1 +RETURNING id; diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/sqlc.json b/internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/sqlc.json similarity index 100% rename from internal/endtoend/testdata/single_param_conflict/postgresql/sqlc.json rename to internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/sqlc.json From 1a8804054e796fecdf699f76e69240eaeaeaa6a2 Mon Sep 17 00:00:00 2001 From: zaneli Date: Tue, 14 Feb 2023 22:27:31 +0900 Subject: [PATCH 2/3] generate testdata by sqlc v1.17.0 --- .../testdata/single_param_conflict/postgresql/pgx/v4/go/db.go | 2 +- .../single_param_conflict/postgresql/pgx/v4/go/query.sql.go | 2 +- .../testdata/single_param_conflict/postgresql/pgx/v5/go/db.go | 2 +- .../single_param_conflict/postgresql/pgx/v5/go/models.go | 2 +- .../single_param_conflict/postgresql/pgx/v5/go/query.sql.go | 2 +- .../single_param_conflict/postgresql/stdlib/go/models.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/db.go b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/db.go index 7fb8bea331..20efb105e8 100644 --- a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/db.go +++ b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/db.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.16.0 +// sqlc v1.17.0 package querytest diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/query.sql.go b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/query.sql.go index 6943a29a45..cd8e4e6d9b 100644 --- a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/query.sql.go +++ b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/query.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.16.0 +// sqlc v1.17.0 // source: query.sql package querytest diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/db.go b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/db.go index a213f04680..1de07c4da5 100644 --- a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/db.go +++ b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/db.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.16.0 +// sqlc v1.17.0 package querytest diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/models.go b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/models.go index 4b6e9cc973..c3e96a43a5 100644 --- a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/models.go +++ b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/models.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.16.0 +// sqlc v1.17.0 package querytest diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/query.sql.go b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/query.sql.go index e30254b13d..0c9e16fb04 100644 --- a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/query.sql.go +++ b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/query.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.16.0 +// sqlc v1.17.0 // source: query.sql package querytest diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/go/models.go b/internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/go/models.go index 46560fd641..9ff547d9a5 100644 --- a/internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/go/models.go +++ b/internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/go/models.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.16.0 +// sqlc v1.17.0 package querytest From e5c92ed950bf4d7d24960218093b473fd3c3c5c7 Mon Sep 17 00:00:00 2001 From: zaneli Date: Thu, 23 Feb 2023 09:55:01 +0900 Subject: [PATCH 3/3] generate testdata by sqlc v1.17.2 --- .../testdata/single_param_conflict/postgresql/pgx/v4/go/db.go | 2 +- .../single_param_conflict/postgresql/pgx/v4/go/query.sql.go | 2 +- .../testdata/single_param_conflict/postgresql/pgx/v5/go/db.go | 2 +- .../single_param_conflict/postgresql/pgx/v5/go/models.go | 2 +- .../single_param_conflict/postgresql/pgx/v5/go/query.sql.go | 2 +- .../single_param_conflict/postgresql/stdlib/go/models.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/db.go b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/db.go index 20efb105e8..439db75e69 100644 --- a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/db.go +++ b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/db.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.17.0 +// sqlc v1.17.2 package querytest diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/query.sql.go b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/query.sql.go index cd8e4e6d9b..6e2e09b776 100644 --- a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/query.sql.go +++ b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/query.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.17.0 +// sqlc v1.17.2 // source: query.sql package querytest diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/db.go b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/db.go index 1de07c4da5..a84825e0e1 100644 --- a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/db.go +++ b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/db.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.17.0 +// sqlc v1.17.2 package querytest diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/models.go b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/models.go index c3e96a43a5..f9d0e17505 100644 --- a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/models.go +++ b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/models.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.17.0 +// sqlc v1.17.2 package querytest diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/query.sql.go b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/query.sql.go index 0c9e16fb04..33a15028c2 100644 --- a/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/query.sql.go +++ b/internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/query.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.17.0 +// sqlc v1.17.2 // source: query.sql package querytest diff --git a/internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/go/models.go b/internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/go/models.go index 9ff547d9a5..5b045823a9 100644 --- a/internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/go/models.go +++ b/internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/go/models.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.17.0 +// sqlc v1.17.2 package querytest