Skip to content

Commit

Permalink
Fix bug with First (#37)
Browse files Browse the repository at this point in the history
  • Loading branch information
logan-stytch authored Feb 29, 2024
1 parent 03d4ec9 commit 065dd5d
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 6 deletions.
6 changes: 3 additions & 3 deletions select.go
Original file line number Diff line number Diff line change
Expand Up @@ -266,13 +266,13 @@ func (b SelectBuilder[T]) First() (*T, error) {
return nil, err
}

var dest *T
err = scan.RowStrict(dest, rows)
var dest T
err = scan.RowStrict(&dest, rows)
if err != nil {
return nil, err
}

return dest, nil
return &dest, nil
}

// FirstScalar is like First but dereferences the result into a scalar value. If an error is raised, the scalar value
Expand Down
31 changes: 31 additions & 0 deletions sqx_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,37 @@ func TestInsert(t *testing.T) {
})
}

func TestSelect(t *testing.T) {
ctx := context.Background()

w1 := newWidget("great")
w2 := newWidget("fine")

t.Run("First returns either w1 or w2", func(t *testing.T) {
tx := Tx(t)
setupTestWidgetsTable(t, tx)
dbWidget := newDBWidget()
require.NoError(t, dbWidget.Create(ctx, tx, &w1))
require.NoError(t, dbWidget.Create(ctx, tx, &w2))

w, err := dbWidget.First(ctx, tx, &widgetGetFilter{})

require.NoError(t, err)
assert.True(t, *w == w1 || *w == w2)
})

t.Run("First returns an error when no rows are found", func(t *testing.T) {
tx := Tx(t)
setupTestWidgetsTable(t, tx)
dbWidget := newDBWidget()

_, err := dbWidget.First(ctx, tx, &widgetGetFilter{})

assert.Error(t, err)
assert.EqualError(t, sql.ErrNoRows, err.Error())
})
}

func TestDelete(t *testing.T) {
// Arrange
ctx := context.Background()
Expand Down
2 changes: 1 addition & 1 deletion version.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package sqx

const VERSION = "0.3.0"
const VERSION = "0.4.0"
12 changes: 10 additions & 2 deletions widget_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ func (w Widget) toSetMap() (map[string]any, error) {
return sqx.ToSetMap(&w)
}

type dbWidget struct {
}
type dbWidget struct{}

func newDBWidget() dbWidget {
return dbWidget{}
Expand Down Expand Up @@ -99,6 +98,15 @@ func (d *dbWidget) Get(ctx context.Context, tx sqx.Queryable, f *widgetGetFilter
All()
}

func (d *dbWidget) First(ctx context.Context, tx sqx.Queryable, f *widgetGetFilter) (*Widget, error) {
return sqx.Read[Widget](ctx).
WithQueryable(tx).
Select("*").
From("sqx_widgets_test").
Where(sqx.ToClause(f)).
First()
}

func (d *dbWidget) GetAll(ctx context.Context, tx sqx.Queryable) ([]Widget, error) {
return sqx.Read[Widget](ctx).
WithQueryable(tx).
Expand Down

0 comments on commit 065dd5d

Please sign in to comment.