summaryrefslogtreecommitdiff
path: root/pgruntime
diff options
context:
space:
mode:
authorStefan Majewsky <majewsky@gmx.net>2026-11-10 00:14:08 +0100
committerStefan Majewsky <majewsky@gmx.net>2026-11-10 00:14:08 +0100
commitca96a116a0e468f6fe9e1701ca90cf734acdef57 (patch)
treebe635c79dc48b8ef010ddd543d94cfb14444eca7 /pgruntime
parentedf487f2e1ff6f392a5b9ddc69a4a44a36ca4985 (diff)
downloadgo-gg-ca96a116a0e468f6fe9e1701ca90cf734acdef57.tar.gz
replace selectOneValue() with oblast.SelectOne()
Diffstat (limited to 'pgruntime')
-rw-r--r--pgruntime/behavior.go3
-rw-r--r--pgruntime/connector.go2
-rw-r--r--pgruntime/helpers.go14
3 files changed, 3 insertions, 16 deletions
diff --git a/pgruntime/behavior.go b/pgruntime/behavior.go
index 03ff338..cdd1e67 100644
--- a/pgruntime/behavior.go
+++ b/pgruntime/behavior.go
@@ -9,6 +9,7 @@ import (
"slices"
"go.xyrillian.de/gg/gsql"
+ "go.xyrillian.de/gg/oblast"
)
// ConnectionBehavior contains configuration for [Connector.Connect] and [Connector.ConnectForTest].
@@ -68,7 +69,7 @@ func applyMigrations(ctx context.Context, db gsql.ConnectionHandle, migrations m
}
// read schema_migrations table
- rowCount, err := selectOneValue[int64](ctx, db, `SELECT COUNT(*) FROM schema_migrations`)
+ rowCount, err := oblast.SelectOne[int64](ctx, db, `SELECT COUNT(*) FROM schema_migrations`)
if err != nil {
return fmt.Errorf("could not check row count for schema_migrations: %w", err)
}
diff --git a/pgruntime/connector.go b/pgruntime/connector.go
index c60b8d4..3a41548 100644
--- a/pgruntime/connector.go
+++ b/pgruntime/connector.go
@@ -136,7 +136,7 @@ func (c Connector[T]) ConnectForTest(t assert.TestingTB, behavior ConnectionBeha
func createDatabaseIfMissing(ctx context.Context, db gsql.Handle, dbName string) error {
// check if database exists
- exists, err := selectOneValue[bool](ctx, db, `SELECT COUNT(*) > 0 FROM pg_catalog.pg_database WHERE datname = $1`, dbName)
+ exists, err := oblast.SelectOne[bool](ctx, db, `SELECT COUNT(*) > 0 FROM pg_catalog.pg_database WHERE datname = $1`, dbName)
if err != nil {
return fmt.Errorf("while reading from pg_catalog.pg_database: %w", err)
}
diff --git a/pgruntime/helpers.go b/pgruntime/helpers.go
index 3f4723a..7a7d97e 100644
--- a/pgruntime/helpers.go
+++ b/pgruntime/helpers.go
@@ -33,20 +33,6 @@ func queryRow(ctx context.Context, db gsql.Handle, query string, args, slots []a
return errext.WithCleanup(err, "stmt.Close", stmt.Close())
}
-// Convenience function for executing a one-off SQL query returning one value.
-// TODO: move to gsql
-func selectOneValue[T any](ctx context.Context, db gsql.Handle, query string, args ...any) (T, error) {
- stmt, err := db.GSQLPrepare(ctx, query, false)
- if err != nil {
- var none T
- return none, err
- }
-
- var result T
- err = stmt.QueryRow(ctx, args, []any{&result})
- return result, errext.WithCleanup(err, "stmt.Close", stmt.Close())
-}
-
// Convenience function for preparing an identifier that needs to be inserted into a query verbatim
// (e.g. a database name for CREATE DATABASE).
func quoteIdentifier(name string) string {