summaryrefslogtreecommitdiff
path: root/select_test.go
diff options
context:
space:
mode:
Diffstat (limited to 'select_test.go')
-rw-r--r--select_test.go48
1 files changed, 24 insertions, 24 deletions
diff --git a/select_test.go b/select_test.go
index c76eb0b..3d6ed55 100644
--- a/select_test.go
+++ b/select_test.go
@@ -38,7 +38,7 @@ func TestSelectReturningSomeRecords(t *testing.T) {
AndReturnColumns("name", "id").
WithRow("foo", 1).
WithRow("bar", 2)
- records := must.Return(store.Select(ctx, db, `SELECT * FROM basic_records WHERE id < ?`, 3))(t)
+ records := must.Return(store.Select(ctx, db, `SELECT * FROM basic_records WHERE id < ?`, 3).Collect())(t)
assert.Equal(t, records, []basicRecord{
{1, "foo"},
{2, "bar"},
@@ -51,7 +51,7 @@ func TestSelectReturningSomeRecords(t *testing.T) {
AndReturnColumns("id", "name").
WithRow(1, "ffoo").
WithRow(2, "bbar")
- records := must.Return(store.SelectWhere(ctx, db, `id < ?`, 3))(t)
+ records := must.Return(store.SelectWhere(ctx, db, `id < ?`, 3).Collect())(t)
assert.Equal(t, records, []basicRecord{
{1, "ffoo"},
{2, "bbar"},
@@ -65,7 +65,7 @@ func TestSelectReturningSomeRecords(t *testing.T) {
WithRow(1, "fffoo").
WithRow(2, "bbbar")
query := store.MustPrepareSelectQueryWhere(`id < ?`)
- records := must.Return(query.Select(ctx, db, 3))(t)
+ records := must.Return(query.Select(ctx, db, 3).Collect())(t)
assert.Equal(t, records, []basicRecord{
{1, "fffoo"},
{2, "bbbar"},
@@ -154,7 +154,7 @@ func TestSelectReturningNoRecords(t *testing.T) {
md.ForQuery(`SELECT * FROM basic_records WHERE id < ?`).
ExpectQueryWithArgs(3).
AndReturnColumns("name", "id")
- records := must.Return(store.Select(ctx, db, `SELECT * FROM basic_records WHERE id < ?`, 3))(t)
+ records := must.Return(store.Select(ctx, db, `SELECT * FROM basic_records WHERE id < ?`, 3).Collect())(t)
assert.Equal(t, records, nil)
})
@@ -162,7 +162,7 @@ func TestSelectReturningNoRecords(t *testing.T) {
md.ForQuery(`SELECT "id", "name" FROM "basic_records" WHERE id < ?`).
ExpectQueryWithArgs(3).
AndReturnColumns("id", "name")
- records := must.Return(store.SelectWhere(ctx, db, `id < ?`, 3))(t)
+ records := must.Return(store.SelectWhere(ctx, db, `id < ?`, 3).Collect())(t)
assert.Equal(t, records, nil)
})
@@ -171,7 +171,7 @@ func TestSelectReturningNoRecords(t *testing.T) {
ExpectQueryWithArgs(3).
AndReturnColumns("id", "name")
query := store.MustPrepareSelectQueryWhere(`id < ?`)
- records := must.Return(query.Select(ctx, db, 3))(t)
+ records := must.Return(query.Select(ctx, db, 3).Collect())(t)
assert.Equal(t, records, nil)
})
@@ -254,7 +254,7 @@ func TestSelectIntoUnexpectedField(t *testing.T) {
t.Run("using Store.Select", func(t *testing.T) {
commonSetup()
- _, err := store.Select(ctx, db, `SELECT * FROM basic_records WHERE id < ?`, 3)
+ _, err := store.Select(ctx, db, `SELECT * FROM basic_records WHERE id < ?`, 3).Collect()
assert.ErrEqual(t, err, expectedError)
})
@@ -291,20 +291,20 @@ func TestSelectWithScanError(t *testing.T) {
t.Run("using Store.Select", func(t *testing.T) {
commonSetup(`SELECT * FROM basic_records WHERE id < ?`)
- _, err := store.Select(ctx, db, `SELECT * FROM basic_records WHERE id < ?`, 3)
+ _, err := store.Select(ctx, db, `SELECT * FROM basic_records WHERE id < ?`, 3).Collect()
assert.ErrEqual(t, err, expectedError)
})
t.Run("using Store.SelectWhere", func(t *testing.T) {
commonSetup(`SELECT "id", "created_at" FROM "basic_records" WHERE id < ?`)
- _, err := store.SelectWhere(ctx, db, `id < ?`, 3)
+ _, err := store.SelectWhere(ctx, db, `id < ?`, 3).Collect()
assert.ErrEqual(t, err, expectedError)
})
t.Run("using PreparedSelectQuery.Select", func(t *testing.T) {
commonSetup(`SELECT "id", "created_at" FROM "basic_records" WHERE id < ?`)
query := store.MustPrepareSelectQueryWhere(`id < ?`)
- _, err := query.Select(ctx, db, 3)
+ _, err := query.Select(ctx, db, 3).Collect()
assert.ErrEqual(t, err, expectedError)
})
@@ -362,7 +362,7 @@ func TestSelectIntoEmbeddedTypes(t *testing.T) {
t.Run("using Store.Select", func(t *testing.T) {
commonSetup(`SELECT * FROM composite_records`)
- records := must.Return(store.Select(ctx, db, `SELECT * FROM composite_records`))(t)
+ records := must.Return(store.Select(ctx, db, `SELECT * FROM composite_records`).Collect())(t)
assert.Equal(t, records, []compositeRecord{
{1, HasCreatedAt{time.Unix(1, 0)}, &HasUpdatedAt{new(time.Unix(3, 0))}},
{2, HasCreatedAt{time.Unix(2, 0)}, &HasUpdatedAt{nil}},
@@ -371,7 +371,7 @@ func TestSelectIntoEmbeddedTypes(t *testing.T) {
t.Run("using Store.SelectWhere", func(t *testing.T) {
commonSetup(`SELECT "id", "created_at", "updated_at" FROM "composite_records" WHERE TRUE`)
- records := must.Return(store.SelectWhere(ctx, db, `TRUE`))(t)
+ records := must.Return(store.SelectWhere(ctx, db, `TRUE`).Collect())(t)
assert.Equal(t, records, []compositeRecord{
{1, HasCreatedAt{time.Unix(1, 0)}, &HasUpdatedAt{new(time.Unix(3, 0))}},
{2, HasCreatedAt{time.Unix(2, 0)}, &HasUpdatedAt{nil}},
@@ -381,7 +381,7 @@ func TestSelectIntoEmbeddedTypes(t *testing.T) {
t.Run("using PreparedSelectQuery.Select", func(t *testing.T) {
commonSetup(`SELECT "id", "created_at", "updated_at" FROM "composite_records" WHERE TRUE`)
query := store.MustPrepareSelectQueryWhere(`TRUE`)
- records := must.Return(query.Select(ctx, db))(t)
+ records := must.Return(query.Select(ctx, db).Collect())(t)
assert.Equal(t, records, []compositeRecord{
{1, HasCreatedAt{time.Unix(1, 0)}, &HasUpdatedAt{new(time.Unix(3, 0))}},
{2, HasCreatedAt{time.Unix(2, 0)}, &HasUpdatedAt{nil}},
@@ -455,18 +455,18 @@ func TestSelectCapturingQueryError(t *testing.T) {
)
t.Run("using Store.Select", func(t *testing.T) {
- _, err := store.Select(ctx, db, `SELECT * FROM basic_records WHERE id < ?`, 3)
+ _, err := store.Select(ctx, db, `SELECT * FROM basic_records WHERE id < ?`, 3).Collect()
assert.ErrEqual(t, err, "during Query(): unexpected query: SELECT * FROM basic_records WHERE id < ?")
})
t.Run("using Store.SelectWhere", func(t *testing.T) {
- _, err := store.SelectWhere(ctx, db, `id < ?`, 3)
+ _, err := store.SelectWhere(ctx, db, `id < ?`, 3).Collect()
assert.ErrEqual(t, err, `during Query(): unexpected query: SELECT "id", "name" FROM "basic_records" WHERE id < ?`)
})
t.Run("using PreparedSelectQuery.Select", func(t *testing.T) {
query := store.MustPrepareSelectQueryWhere(`id < ?`)
- _, err := query.Select(ctx, db, 3)
+ _, err := query.Select(ctx, db, 3).Collect()
assert.ErrEqual(t, err, `during Query(): unexpected query: SELECT "id", "name" FROM "basic_records" WHERE id < ?`)
})
@@ -513,27 +513,27 @@ func TestSelectCapturingCloseError(t *testing.T) {
t.Run("using Store.Select", func(t *testing.T) {
commonSetup(`SELECT * FROM basic_records WHERE id < ?`)
- _, err := store.Select(ctx, db, `SELECT * FROM basic_records WHERE id < ?`, 3)
- assert.ErrEqual(t, err, "during Rows.Err(): datacenter on fire")
+ _, err := store.Select(ctx, db, `SELECT * FROM basic_records WHERE id < ?`, 3).Collect()
+ assert.ErrEqual(t, err, "datacenter on fire")
})
t.Run("using Store.SelectWhere", func(t *testing.T) {
commonSetup(`SELECT "id", "name" FROM "basic_records" WHERE id < ?`)
- _, err := store.SelectWhere(ctx, db, `id < ?`, 3)
- assert.ErrEqual(t, err, "during Rows.Err(): datacenter on fire")
+ _, err := store.SelectWhere(ctx, db, `id < ?`, 3).Collect()
+ assert.ErrEqual(t, err, "datacenter on fire")
})
t.Run("using PreparedSelectQuery.Select", func(t *testing.T) {
commonSetup(`SELECT "id", "name" FROM "basic_records" WHERE id < ?`)
query := store.MustPrepareSelectQueryWhere(`id < ?`)
- _, err := query.Select(ctx, db, 3)
- assert.ErrEqual(t, err, "during Rows.Err(): datacenter on fire")
+ _, err := query.Select(ctx, db, 3).Collect()
+ assert.ErrEqual(t, err, "datacenter on fire")
})
t.Run("using Store.SelectOne", func(t *testing.T) {
commonSetup(`SELECT * FROM basic_records WHERE id < ?`)
_, err := store.SelectOne(ctx, db, `SELECT * FROM basic_records WHERE id < ?`, 3)
- assert.ErrEqual(t, err, "during Rows.Err(): datacenter on fire")
+ assert.ErrEqual(t, err, "datacenter on fire")
})
t.Run("using Store.SelectOneWhere", func(t *testing.T) {
@@ -562,7 +562,7 @@ func TestSelectNotPossibleWithoutTableName(t *testing.T) {
store := oblast.MustNewStore[basicRecord](oblast.SqliteDialect())
t.Run("using Store.SelectWhere", func(t *testing.T) {
- _, err := store.SelectWhere(ctx, db, `id < ?`, 3)
+ _, err := store.SelectWhere(ctx, db, `id < ?`, 3).Collect()
assert.ErrEqual(t, err, "cannot execute SelectWhere() because query could not be autogenerated")
})
generated by cgit v1.3.1 (git 2.54.0) at 2026-08-03 04:21:30 +0000