diff options
| author | Stefan Majewsky <majewsky@gmx.net> | 2026-11-10 00:14:08 +0100 |
|---|---|---|
| committer | Stefan Majewsky <majewsky@gmx.net> | 2026-11-10 00:14:08 +0100 |
| commit | ca96a116a0e468f6fe9e1701ca90cf734acdef57 (patch) | |
| tree | be635c79dc48b8ef010ddd543d94cfb14444eca7 /testing | |
| parent | edf487f2e1ff6f392a5b9ddc69a4a44a36ca4985 (diff) | |
| download | go-gg-ca96a116a0e468f6fe9e1701ca90cf734acdef57.tar.gz | |
replace selectOneValue() with oblast.SelectOne()
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/pgruntime/connect_test.go | 5 | ||||
| -rw-r--r-- | testing/pgruntime/helpers_test.go | 14 | ||||
| -rw-r--r-- | testing/pgruntime/migration_test.go | 9 |
3 files changed, 8 insertions, 20 deletions
diff --git a/testing/pgruntime/connect_test.go b/testing/pgruntime/connect_test.go index 1073791..4992c7f 100644 --- a/testing/pgruntime/connect_test.go +++ b/testing/pgruntime/connect_test.go @@ -7,6 +7,7 @@ import ( "testing" "go.xyrillian.de/gg/assert" + "go.xyrillian.de/gg/oblast" ) func TestMultipleConnectionsToSameDB(t *testing.T) { @@ -31,7 +32,7 @@ func TestMultipleConnectionsToSameDB(t *testing.T) { if err != nil { t.Fatal(err.Error()) } - barID, err := selectOneValue[int64](ctx, db2, `SELECT id FROM objects WHERE name = $1`, "bar") + barID, err := oblast.SelectOne[int64](ctx, db2, `SELECT id FROM objects WHERE name = $1`, "bar") if assert.ErrEqual(t, err, nil) { assert.Equal(t, barID, 2) } @@ -44,7 +45,7 @@ func TestMultipleConnectionsToSameDB(t *testing.T) { if assert.ErrEqual(t, err, nil) { assert.Equal(t, count, 0) } - nextID, err := selectOneValue[int64](ctx, db3, `INSERT INTO objects (name) VALUES ($1) RETURNING id`, "qux") + nextID, err := oblast.SelectOne[int64](ctx, db3, `INSERT INTO objects (name) VALUES ($1) RETURNING id`, "qux") if assert.ErrEqual(t, err, nil) { assert.Equal(t, nextID, 1) // sequence was reset and starts at 1 again } diff --git a/testing/pgruntime/helpers_test.go b/testing/pgruntime/helpers_test.go index ca4ffd2..835df8b 100644 --- a/testing/pgruntime/helpers_test.go +++ b/testing/pgruntime/helpers_test.go @@ -31,17 +31,3 @@ func queryRow(ctx context.Context, db gsql.Handle, query string, args, slots []a err = stmt.QueryRow(ctx, args, slots) 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()) -} diff --git a/testing/pgruntime/migration_test.go b/testing/pgruntime/migration_test.go index 4dfff4d..6113c36 100644 --- a/testing/pgruntime/migration_test.go +++ b/testing/pgruntime/migration_test.go @@ -7,6 +7,7 @@ import ( "testing" "go.xyrillian.de/gg/assert" + "go.xyrillian.de/gg/oblast" "go.xyrillian.de/gg/pgruntime" ) @@ -45,7 +46,7 @@ func TestMigrations(t *testing.T) { db, target := connector.ConnectForTest(t, b) // check that the schema is applied by inserting some basic records - postID, err := selectOneValue[int64](ctx, db, `INSERT INTO posts (message) VALUES ($1) RETURNING id`, "Hello World!") + postID, err := oblast.SelectOne[int64](ctx, db, `INSERT INTO posts (message) VALUES ($1) RETURNING id`, "Hello World!") if err != nil { t.Fatal(err.Error()) } @@ -68,7 +69,7 @@ func TestMigrations(t *testing.T) { } // check that the data was modified appropriately - message, err := selectOneValue[string](ctx, db, `SELECT message FROM comments`) + message, err := oblast.SelectOne[string](ctx, db, `SELECT message FROM comments`) if assert.ErrEqual(t, err, nil) { assert.Equal(t, message, "Hi there. in response to: Hello World!") } @@ -81,11 +82,11 @@ func TestMigrations(t *testing.T) { assert.ErrEqual(t, err, `while migrating to schema version 51: could not execute schema migration: pq: relation "commands" does not exist (42P01)`) // check that the migration was not applied - version, err := selectOneValue[int64](ctx, db, `SELECT version FROM schema_migrations`) + version, err := oblast.SelectOne[int64](ctx, db, `SELECT version FROM schema_migrations`) if assert.ErrEqual(t, err, nil) { assert.Equal(t, version, 50) } - commentCount, err := selectOneValue[int64](ctx, db, `SELECT COUNT(*) FROM comments`) + commentCount, err := oblast.SelectOne[int64](ctx, db, `SELECT COUNT(*) FROM comments`) if assert.ErrEqual(t, err, nil) { assert.Equal(t, commentCount, 1) } |
