Fix sqlx unit test

Emyrk · Emyrk · commit e907a0f49a23 · 2023-03-07T14:39:23.000-06:00
diff --git a/coderd/database/modelqueries.go b/coderd/database/modelqueries.go
@@ -202,7 +202,7 @@ type getWorkspaceBuildParams struct {
 	WorkspaceID  uuid.UUID `db:"workspace_id"`
 	BuildNumber  int32     `db:"build_number"`
 	LimitOpt     int32     `db:"limit_opt"`
-	Latest       bool      `db:"-"` statu
+	Latest       bool      `db:"-"`
 }
 
 func (q *sqlQuerier) getWorkspaceBuild(ctx context.Context, arg getWorkspaceBuildParams) (WorkspaceBuild, error) {
diff --git a/coderd/database/modelqueries_test.go b/coderd/database/modelqueries_test.go
@@ -81,6 +81,10 @@ func TestGetWorkspaceBuild(t *testing.T) {
 				CreatedAt:         time.Now().Add(time.Hour),
 			}),
 		}
+		orderBuilds = []database.WorkspaceBuildThin{
+			builds[1],
+			builds[0],
+		}
 		ctx = context.Background()
 	)
 
@@ -109,13 +113,13 @@ func TestGetWorkspaceBuild(t *testing.T) {
 
 	t.Run("GetWorkspaceBuildsCreatedAfter", func(t *testing.T) {
 		t.Parallel()
-		builds, err := db.GetWorkspaceBuildsCreatedAfter(ctx, jobs[0].CreatedAt)
+		found, err := db.GetWorkspaceBuildsCreatedAfter(ctx, builds[0].CreatedAt.Add(time.Second))
 		if err != nil {
 			t.Fatal(err)
 		}
 		expected := builds[1]
-		require.Len(t, builds, 1, "should only be one build")
-		require.Equal(t, expected, builds[0], "builds should be equal")
+		require.Len(t, found, 1, "should only be one build")
+		require.Equal(t, expected, found[0].ToThin(), "builds should be equal")
 	})
 
 	t.Run("GetWorkspaceBuildByWorkspaceIDAndBuildNumber", func(t *testing.T) {
@@ -142,11 +146,7 @@ func TestGetWorkspaceBuild(t *testing.T) {
 			t.Fatal(err)
 		}
 		require.Len(t, found, 2, "should be two builds")
-		exp := []database.WorkspaceBuildThin{
-			builds[1],
-			builds[0],
-		}
-		require.Equal(t, exp, toThins(found), "builds should be equal")
+		require.Equal(t, orderBuilds, toThins(found), "builds should be equal")
 	})
 
 	t.Run("GetLatestWorkspaceBuildsByWorkspaceIDs", func(t *testing.T) {
@@ -155,8 +155,8 @@ func TestGetWorkspaceBuild(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
-		require.Len(t, found, 2, "should be two builds")
-		require.Equal(t, builds, found, "builds should be equal")
+		require.Len(t, found, 1, "should be only one build")
+		require.Equal(t, builds[1], found[0].ToThin(), "builds should be equal")
 	})
 
 	t.Run("GetLatestWorkspaceBuilds", func(t *testing.T) {
@@ -166,7 +166,7 @@ func TestGetWorkspaceBuild(t *testing.T) {
 			t.Fatal(err)
 		}
 		require.Len(t, found, 1, "should be only 1 build")
-		require.Equal(t, builds[1], toThins(found), "builds should be equal")
+		require.Equal(t, builds[1], found[0].ToThin(), "builds should be equal")
 	})
 
 	t.Run("GetLatestWorkspaceBuildByWorkspaceID", func(t *testing.T) {
@@ -175,7 +175,7 @@ func TestGetWorkspaceBuild(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
-		require.Equal(t, builds[1], found, "builds should be equal")
+		require.Equal(t, builds[1], found.ToThin(), "builds should be equal")
 	})
 }
 
diff --git a/coderd/database/sqlxqueries/sqlx.go b/coderd/database/sqlxqueries/sqlx.go
@@ -13,16 +13,16 @@ import (
 func SelectContext[RT any](ctx context.Context, q sqlx.QueryerContext, queryName string, argument interface{}) ([]RT, error) {
 	var empty []RT
 
-	query, err := query(queryName, argument)
-	if err != nil {
-		return empty, xerrors.Errorf("get query: %w", err)
-	}
-
 	// No argument was given, use an empty struct.
 	if argument == nil {
 		argument = struct{}{}
 	}
 
+	query, err := query(queryName, argument)
+	if err != nil {
+		return empty, xerrors.Errorf("get query: %w", err)
+	}
+
 	query, args, err := bindNamed(query, argument)
 	if err != nil {
 		return empty, xerrors.Errorf("bind named: %w", err)
@@ -41,6 +41,11 @@ func SelectContext[RT any](ctx context.Context, q sqlx.QueryerContext, queryName
 func GetContext[RT any](ctx context.Context, q sqlx.QueryerContext, queryName string, argument interface{}) (RT, error) {
 	var empty RT
 
+	// No argument was given, use an empty struct.
+	if argument == nil {
+		argument = struct{}{}
+	}
+
 	query, err := query(queryName, argument)
 	if err != nil {
 		return empty, xerrors.Errorf("get query: %w", err)

Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ type getWorkspaceBuildParams struct {`
`202`	`202`	WorkspaceID uuid.UUID `db:"workspace_id"`
`203`	`203`	BuildNumber int32 `db:"build_number"`
`204`	`204`	LimitOpt int32 `db:"limit_opt"`
`205`		- Latest bool `db:"-"` statu
	`205`	+ Latest bool `db:"-"`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`func (q *sqlQuerier) getWorkspaceBuild(ctx context.Context, arg getWorkspaceBuildParams) (WorkspaceBuild, error) {`