From ac4558702097a4b99929e1596cd36b1ca3e227ba Mon Sep 17 00:00:00 2001 From: Brandur Date: Mon, 20 Apr 2026 14:43:38 -0500 Subject: [PATCH] Upgrade sqlc to 1.31.0 I just noticed that we got a rare release of sqlc yesterday [1] and figured I'd upgrade things to make sure they still work. Very little changed, but we did get a couple tiny fixes in SQLite. [1] https://github.com/sqlc-dev/sqlc/releases/tag/v1.31.0 --- .github/workflows/ci.yaml | 2 +- .../riverdatabasesql/internal/dbsqlc/db.go | 2 +- .../riverdatabasesql/internal/dbsqlc/models.go | 2 +- .../internal/dbsqlc/pg_misc.sql.go | 2 +- .../internal/dbsqlc/river_job.sql.go | 2 +- .../internal/dbsqlc/river_leader.sql.go | 2 +- .../internal/dbsqlc/river_migration.sql.go | 2 +- .../internal/dbsqlc/river_queue.sql.go | 2 +- .../internal/dbsqlc/schema.sql.go | 2 +- .../riverpgxv5/internal/dbsqlc/copyfrom.go | 2 +- riverdriver/riverpgxv5/internal/dbsqlc/db.go | 2 +- .../riverpgxv5/internal/dbsqlc/models.go | 2 +- .../riverpgxv5/internal/dbsqlc/pg_misc.sql.go | 2 +- .../internal/dbsqlc/river_job.sql.go | 2 +- .../internal/dbsqlc/river_job_copyfrom.sql.go | 2 +- .../internal/dbsqlc/river_leader.sql.go | 2 +- .../internal/dbsqlc/river_migration.sql.go | 2 +- .../internal/dbsqlc/river_queue.sql.go | 2 +- .../riverpgxv5/internal/dbsqlc/schema.sql.go | 2 +- riverdriver/riversqlite/internal/dbsqlc/db.go | 2 +- .../riversqlite/internal/dbsqlc/models.go | 2 +- .../internal/dbsqlc/river_job.sql.go | 2 +- .../internal/dbsqlc/river_leader.sql.go | 2 +- .../internal/dbsqlc/river_migration.sql.go | 2 +- .../internal/dbsqlc/river_queue.sql.go | 2 +- .../riversqlite/internal/dbsqlc/schema.sql.go | 18 +++++++++--------- riverdriver/riversqlite/river_sqlite_driver.go | 4 ++-- 27 files changed, 36 insertions(+), 36 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d9c7b6db..c6cf46f2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -341,7 +341,7 @@ jobs: - name: Setup sqlc uses: sqlc-dev/setup-sqlc@v5 with: - sqlc-version: "1.30.0" + sqlc-version: "1.31.0" - name: Verify migrations match run: | diff --git a/riverdriver/riverdatabasesql/internal/dbsqlc/db.go b/riverdriver/riverdatabasesql/internal/dbsqlc/db.go index 5cdead39..3bebd3a3 100644 --- a/riverdriver/riverdatabasesql/internal/dbsqlc/db.go +++ b/riverdriver/riverdatabasesql/internal/dbsqlc/db.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.30.0 +// sqlc v1.31.0 package dbsqlc diff --git a/riverdriver/riverdatabasesql/internal/dbsqlc/models.go b/riverdriver/riverdatabasesql/internal/dbsqlc/models.go index b89cbae4..c8188fc7 100644 --- a/riverdriver/riverdatabasesql/internal/dbsqlc/models.go +++ b/riverdriver/riverdatabasesql/internal/dbsqlc/models.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.30.0 +// sqlc v1.31.0 package dbsqlc diff --git a/riverdriver/riverdatabasesql/internal/dbsqlc/pg_misc.sql.go b/riverdriver/riverdatabasesql/internal/dbsqlc/pg_misc.sql.go index d8722258..e2542e76 100644 --- a/riverdriver/riverdatabasesql/internal/dbsqlc/pg_misc.sql.go +++ b/riverdriver/riverdatabasesql/internal/dbsqlc/pg_misc.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.30.0 +// sqlc v1.31.0 // source: pg_misc.sql package dbsqlc diff --git a/riverdriver/riverdatabasesql/internal/dbsqlc/river_job.sql.go b/riverdriver/riverdatabasesql/internal/dbsqlc/river_job.sql.go index 14ec9c43..ac01941a 100644 --- a/riverdriver/riverdatabasesql/internal/dbsqlc/river_job.sql.go +++ b/riverdriver/riverdatabasesql/internal/dbsqlc/river_job.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.30.0 +// sqlc v1.31.0 // source: river_job.sql package dbsqlc diff --git a/riverdriver/riverdatabasesql/internal/dbsqlc/river_leader.sql.go b/riverdriver/riverdatabasesql/internal/dbsqlc/river_leader.sql.go index ea4dc674..a54d2bd7 100644 --- a/riverdriver/riverdatabasesql/internal/dbsqlc/river_leader.sql.go +++ b/riverdriver/riverdatabasesql/internal/dbsqlc/river_leader.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.30.0 +// sqlc v1.31.0 // source: river_leader.sql package dbsqlc diff --git a/riverdriver/riverdatabasesql/internal/dbsqlc/river_migration.sql.go b/riverdriver/riverdatabasesql/internal/dbsqlc/river_migration.sql.go index 78a5a2d6..28320468 100644 --- a/riverdriver/riverdatabasesql/internal/dbsqlc/river_migration.sql.go +++ b/riverdriver/riverdatabasesql/internal/dbsqlc/river_migration.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.30.0 +// sqlc v1.31.0 // source: river_migration.sql package dbsqlc diff --git a/riverdriver/riverdatabasesql/internal/dbsqlc/river_queue.sql.go b/riverdriver/riverdatabasesql/internal/dbsqlc/river_queue.sql.go index a348f05b..b33808c8 100644 --- a/riverdriver/riverdatabasesql/internal/dbsqlc/river_queue.sql.go +++ b/riverdriver/riverdatabasesql/internal/dbsqlc/river_queue.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.30.0 +// sqlc v1.31.0 // source: river_queue.sql package dbsqlc diff --git a/riverdriver/riverdatabasesql/internal/dbsqlc/schema.sql.go b/riverdriver/riverdatabasesql/internal/dbsqlc/schema.sql.go index 5022dcd9..e734ca4a 100644 --- a/riverdriver/riverdatabasesql/internal/dbsqlc/schema.sql.go +++ b/riverdriver/riverdatabasesql/internal/dbsqlc/schema.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.30.0 +// sqlc v1.31.0 // source: schema.sql package dbsqlc diff --git a/riverdriver/riverpgxv5/internal/dbsqlc/copyfrom.go b/riverdriver/riverpgxv5/internal/dbsqlc/copyfrom.go index 3aaf953d..5523c792 100644 --- a/riverdriver/riverpgxv5/internal/dbsqlc/copyfrom.go +++ b/riverdriver/riverpgxv5/internal/dbsqlc/copyfrom.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.30.0 +// sqlc v1.31.0 // source: copyfrom.go package dbsqlc diff --git a/riverdriver/riverpgxv5/internal/dbsqlc/db.go b/riverdriver/riverpgxv5/internal/dbsqlc/db.go index 6d96bdd4..eaa98caf 100644 --- a/riverdriver/riverpgxv5/internal/dbsqlc/db.go +++ b/riverdriver/riverpgxv5/internal/dbsqlc/db.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.30.0 +// sqlc v1.31.0 package dbsqlc diff --git a/riverdriver/riverpgxv5/internal/dbsqlc/models.go b/riverdriver/riverpgxv5/internal/dbsqlc/models.go index 66588b13..4c8ba801 100644 --- a/riverdriver/riverpgxv5/internal/dbsqlc/models.go +++ b/riverdriver/riverpgxv5/internal/dbsqlc/models.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.30.0 +// sqlc v1.31.0 package dbsqlc diff --git a/riverdriver/riverpgxv5/internal/dbsqlc/pg_misc.sql.go b/riverdriver/riverpgxv5/internal/dbsqlc/pg_misc.sql.go index 432e3636..9215c089 100644 --- a/riverdriver/riverpgxv5/internal/dbsqlc/pg_misc.sql.go +++ b/riverdriver/riverpgxv5/internal/dbsqlc/pg_misc.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.30.0 +// sqlc v1.31.0 // source: pg_misc.sql package dbsqlc diff --git a/riverdriver/riverpgxv5/internal/dbsqlc/river_job.sql.go b/riverdriver/riverpgxv5/internal/dbsqlc/river_job.sql.go index a86a2235..0be29561 100644 --- a/riverdriver/riverpgxv5/internal/dbsqlc/river_job.sql.go +++ b/riverdriver/riverpgxv5/internal/dbsqlc/river_job.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.30.0 +// sqlc v1.31.0 // source: river_job.sql package dbsqlc diff --git a/riverdriver/riverpgxv5/internal/dbsqlc/river_job_copyfrom.sql.go b/riverdriver/riverpgxv5/internal/dbsqlc/river_job_copyfrom.sql.go index 8a29bfe9..3daff367 100644 --- a/riverdriver/riverpgxv5/internal/dbsqlc/river_job_copyfrom.sql.go +++ b/riverdriver/riverpgxv5/internal/dbsqlc/river_job_copyfrom.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.30.0 +// sqlc v1.31.0 // source: river_job_copyfrom.sql package dbsqlc diff --git a/riverdriver/riverpgxv5/internal/dbsqlc/river_leader.sql.go b/riverdriver/riverpgxv5/internal/dbsqlc/river_leader.sql.go index 4fcea1cf..1976cf4d 100644 --- a/riverdriver/riverpgxv5/internal/dbsqlc/river_leader.sql.go +++ b/riverdriver/riverpgxv5/internal/dbsqlc/river_leader.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.30.0 +// sqlc v1.31.0 // source: river_leader.sql package dbsqlc diff --git a/riverdriver/riverpgxv5/internal/dbsqlc/river_migration.sql.go b/riverdriver/riverpgxv5/internal/dbsqlc/river_migration.sql.go index 7c80e7d7..bf20e03b 100644 --- a/riverdriver/riverpgxv5/internal/dbsqlc/river_migration.sql.go +++ b/riverdriver/riverpgxv5/internal/dbsqlc/river_migration.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.30.0 +// sqlc v1.31.0 // source: river_migration.sql package dbsqlc diff --git a/riverdriver/riverpgxv5/internal/dbsqlc/river_queue.sql.go b/riverdriver/riverpgxv5/internal/dbsqlc/river_queue.sql.go index 761d96d8..0988828b 100644 --- a/riverdriver/riverpgxv5/internal/dbsqlc/river_queue.sql.go +++ b/riverdriver/riverpgxv5/internal/dbsqlc/river_queue.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.30.0 +// sqlc v1.31.0 // source: river_queue.sql package dbsqlc diff --git a/riverdriver/riverpgxv5/internal/dbsqlc/schema.sql.go b/riverdriver/riverpgxv5/internal/dbsqlc/schema.sql.go index a0f27f4c..5860284e 100644 --- a/riverdriver/riverpgxv5/internal/dbsqlc/schema.sql.go +++ b/riverdriver/riverpgxv5/internal/dbsqlc/schema.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.30.0 +// sqlc v1.31.0 // source: schema.sql package dbsqlc diff --git a/riverdriver/riversqlite/internal/dbsqlc/db.go b/riverdriver/riversqlite/internal/dbsqlc/db.go index 5cdead39..3bebd3a3 100644 --- a/riverdriver/riversqlite/internal/dbsqlc/db.go +++ b/riverdriver/riversqlite/internal/dbsqlc/db.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.30.0 +// sqlc v1.31.0 package dbsqlc diff --git a/riverdriver/riversqlite/internal/dbsqlc/models.go b/riverdriver/riversqlite/internal/dbsqlc/models.go index 5890b263..1a9ce5c5 100644 --- a/riverdriver/riversqlite/internal/dbsqlc/models.go +++ b/riverdriver/riversqlite/internal/dbsqlc/models.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.30.0 +// sqlc v1.31.0 package dbsqlc diff --git a/riverdriver/riversqlite/internal/dbsqlc/river_job.sql.go b/riverdriver/riversqlite/internal/dbsqlc/river_job.sql.go index 083dc5c3..1963523d 100644 --- a/riverdriver/riversqlite/internal/dbsqlc/river_job.sql.go +++ b/riverdriver/riversqlite/internal/dbsqlc/river_job.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.30.0 +// sqlc v1.31.0 // source: river_job.sql package dbsqlc diff --git a/riverdriver/riversqlite/internal/dbsqlc/river_leader.sql.go b/riverdriver/riversqlite/internal/dbsqlc/river_leader.sql.go index a43227f0..780b3ac6 100644 --- a/riverdriver/riversqlite/internal/dbsqlc/river_leader.sql.go +++ b/riverdriver/riversqlite/internal/dbsqlc/river_leader.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.30.0 +// sqlc v1.31.0 // source: river_leader.sql package dbsqlc diff --git a/riverdriver/riversqlite/internal/dbsqlc/river_migration.sql.go b/riverdriver/riversqlite/internal/dbsqlc/river_migration.sql.go index 096baff5..460f47ed 100644 --- a/riverdriver/riversqlite/internal/dbsqlc/river_migration.sql.go +++ b/riverdriver/riversqlite/internal/dbsqlc/river_migration.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.30.0 +// sqlc v1.31.0 // source: river_migration.sql package dbsqlc diff --git a/riverdriver/riversqlite/internal/dbsqlc/river_queue.sql.go b/riverdriver/riversqlite/internal/dbsqlc/river_queue.sql.go index fd8c1f98..d9edc714 100644 --- a/riverdriver/riversqlite/internal/dbsqlc/river_queue.sql.go +++ b/riverdriver/riversqlite/internal/dbsqlc/river_queue.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.30.0 +// sqlc v1.31.0 // source: river_queue.sql package dbsqlc diff --git a/riverdriver/riversqlite/internal/dbsqlc/schema.sql.go b/riverdriver/riversqlite/internal/dbsqlc/schema.sql.go index a16cb1b3..203347be 100644 --- a/riverdriver/riversqlite/internal/dbsqlc/schema.sql.go +++ b/riverdriver/riversqlite/internal/dbsqlc/schema.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.30.0 +// sqlc v1.31.0 // source: schema.sql package dbsqlc @@ -16,11 +16,11 @@ SELECT EXISTS ( ) ` -func (q *Queries) IndexExists(ctx context.Context, db DBTX, index string) (int64, error) { +func (q *Queries) IndexExists(ctx context.Context, db DBTX, index string) (bool, error) { row := db.QueryRowContext(ctx, indexExists, index) - var column_1 int64 - err := row.Scan(&column_1) - return column_1, err + var exists bool + err := row.Scan(&exists) + return exists, err } const tableExists = `-- name: TableExists :one @@ -30,9 +30,9 @@ SELECT EXISTS ( ) ` -func (q *Queries) TableExists(ctx context.Context, db DBTX, table string) (int64, error) { +func (q *Queries) TableExists(ctx context.Context, db DBTX, table string) (bool, error) { row := db.QueryRowContext(ctx, tableExists, table) - var column_1 int64 - err := row.Scan(&column_1) - return column_1, err + var exists bool + err := row.Scan(&exists) + return exists, err } diff --git a/riverdriver/riversqlite/river_sqlite_driver.go b/riverdriver/riversqlite/river_sqlite_driver.go index 586fdc53..132d0e46 100644 --- a/riverdriver/riversqlite/river_sqlite_driver.go +++ b/riverdriver/riversqlite/river_sqlite_driver.go @@ -208,7 +208,7 @@ func (e *Executor) IndexDropIfExists(ctx context.Context, params *riverdriver.In func (e *Executor) IndexExists(ctx context.Context, params *riverdriver.IndexExistsParams) (bool, error) { exists, err := dbsqlc.New().IndexExists(schemaTemplateParam(ctx, params.Schema), e.dbtx, params.Index) - return exists > 0, interpretError(err) + return exists, interpretError(err) } func (e *Executor) IndexReindex(ctx context.Context, params *riverdriver.IndexReindexParams) error { @@ -1450,7 +1450,7 @@ func (e *Executor) SchemaGetExpired(ctx context.Context, params *riverdriver.Sch func (e *Executor) TableExists(ctx context.Context, params *riverdriver.TableExistsParams) (bool, error) { exists, err := dbsqlc.New().TableExists(schemaTemplateParam(ctx, params.Schema), e.dbtx, params.Table) - return exists > 0, interpretError(err) + return exists, interpretError(err) } func (e *Executor) TableTruncate(ctx context.Context, params *riverdriver.TableTruncateParams) error {