Skip to content

Commit

Permalink
Update tests for expiration filtering
Browse files Browse the repository at this point in the history
  • Loading branch information
@josephschorr
josephschorr committed Dec 16, 2024
1 parent 201e3b4 commit 842a360
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
38 changes: 19 additions & 19 deletions internal/datastore/common/sql_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -611,39 +611,39 @@ func TestExecuteQuery(t *testing.T) {
run: func(filterer SchemaQueryFilterer) SchemaQueryFilterer {
return filterer.FilterToResourceType("sometype")
},
expectedSQL: "SELECT object_id, relation, subject_ns, subject_object_id, subject_relation, caveat, caveat_context FROM relationtuples WHERE ns = ?",
expectedSQL: "SELECT object_id, relation, subject_ns, subject_object_id, subject_relation, caveat, caveat_context, expiration FROM relationtuples WHERE (expiration IS NULL OR expiration > NOW()) AND ns = ?",
expectedArgs: []any{"sometype"},
},
{
name: "filter by static resource type and resource ID",
run: func(filterer SchemaQueryFilterer) SchemaQueryFilterer {
return filterer.FilterToResourceType("sometype").FilterToResourceID("someobj")
},
expectedSQL: "SELECT relation, subject_ns, subject_object_id, subject_relation, caveat, caveat_context FROM relationtuples WHERE ns = ? AND object_id = ?",
expectedSQL: "SELECT relation, subject_ns, subject_object_id, subject_relation, caveat, caveat_context, expiration FROM relationtuples WHERE (expiration IS NULL OR expiration > NOW()) AND ns = ? AND object_id = ?",
expectedArgs: []any{"sometype", "someobj"},
},
{
name: "filter by static resource type and resource ID prefix",
run: func(filterer SchemaQueryFilterer) SchemaQueryFilterer {
return filterer.FilterToResourceType("sometype").MustFilterWithResourceIDPrefix("someprefix")
},
expectedSQL: "SELECT object_id, relation, subject_ns, subject_object_id, subject_relation, caveat, caveat_context FROM relationtuples WHERE ns = ? AND object_id LIKE ?",
expectedSQL: "SELECT object_id, relation, subject_ns, subject_object_id, subject_relation, caveat, caveat_context, expiration FROM relationtuples WHERE (expiration IS NULL OR expiration > NOW()) AND ns = ? AND object_id LIKE ?",
expectedArgs: []any{"sometype", "someprefix%"},
},
{
name: "filter by static resource type and resource IDs",
run: func(filterer SchemaQueryFilterer) SchemaQueryFilterer {
return filterer.FilterToResourceType("sometype").MustFilterToResourceIDs([]string{"someobj", "anotherobj"})
},
expectedSQL: "SELECT object_id, relation, subject_ns, subject_object_id, subject_relation, caveat, caveat_context FROM relationtuples WHERE ns = ? AND object_id IN (?,?)",
expectedSQL: "SELECT object_id, relation, subject_ns, subject_object_id, subject_relation, caveat, caveat_context, expiration FROM relationtuples WHERE (expiration IS NULL OR expiration > NOW()) AND ns = ? AND object_id IN (?,?)",
expectedArgs: []any{"sometype", "someobj", "anotherobj"},
},
{
name: "filter by static resource type, resource ID and relation",
run: func(filterer SchemaQueryFilterer) SchemaQueryFilterer {
return filterer.FilterToResourceType("sometype").FilterToResourceID("someobj").FilterToRelation("somerel")
},
expectedSQL: "SELECT subject_ns, subject_object_id, subject_relation, caveat, caveat_context FROM relationtuples WHERE ns = ? AND object_id = ? AND relation = ?",
expectedSQL: "SELECT subject_ns, subject_object_id, subject_relation, caveat, caveat_context, expiration FROM relationtuples WHERE (expiration IS NULL OR expiration > NOW()) AND ns = ? AND object_id = ? AND relation = ?",
expectedArgs: []any{"sometype", "someobj", "somerel"},
},
{
Expand All @@ -653,7 +653,7 @@ func TestExecuteQuery(t *testing.T) {
SubjectType: "subns",
})
},
expectedSQL: "SELECT subject_object_id, subject_relation, caveat, caveat_context FROM relationtuples WHERE ns = ? AND object_id = ? AND relation = ? AND subject_ns = ?",
expectedSQL: "SELECT subject_object_id, subject_relation, caveat, caveat_context, expiration FROM relationtuples WHERE (expiration IS NULL OR expiration > NOW()) AND ns = ? AND object_id = ? AND relation = ? AND subject_ns = ?",
expectedArgs: []any{"sometype", "someobj", "somerel", "subns"},
},
{
Expand All @@ -664,7 +664,7 @@ func TestExecuteQuery(t *testing.T) {
OptionalSubjectId: "subid",
})
},
expectedSQL: "SELECT subject_relation, caveat, caveat_context FROM relationtuples WHERE ns = ? AND object_id = ? AND relation = ? AND subject_ns = ? AND subject_object_id = ?",
expectedSQL: "SELECT subject_relation, caveat, caveat_context, expiration FROM relationtuples WHERE (expiration IS NULL OR expiration > NOW()) AND ns = ? AND object_id = ? AND relation = ? AND subject_ns = ? AND subject_object_id = ?",
expectedArgs: []any{"sometype", "someobj", "somerel", "subns", "subid"},
},
{
Expand All @@ -678,7 +678,7 @@ func TestExecuteQuery(t *testing.T) {
},
})
},
expectedSQL: "SELECT caveat, caveat_context FROM relationtuples WHERE ns = ? AND object_id = ? AND relation = ? AND subject_ns = ? AND subject_object_id = ? AND subject_relation = ?",
expectedSQL: "SELECT caveat, caveat_context, expiration FROM relationtuples WHERE (expiration IS NULL OR expiration > NOW()) AND ns = ? AND object_id = ? AND relation = ? AND subject_ns = ? AND subject_object_id = ? AND subject_relation = ?",
expectedArgs: []any{"sometype", "someobj", "somerel", "subns", "subid", "subrel"},
},
{
Expand All @@ -696,8 +696,8 @@ func TestExecuteQuery(t *testing.T) {
options.WithSkipCaveats(true),
},
expectedSkipCaveats: true,
expectedSelectingNoColumns: true,
expectedSQL: "SELECT 1 FROM relationtuples WHERE ns = ? AND object_id = ? AND relation = ? AND subject_ns = ? AND subject_object_id = ? AND subject_relation = ?",
expectedSelectingNoColumns: false,
expectedSQL: "SELECT expiration FROM relationtuples WHERE (expiration IS NULL OR expiration > NOW()) AND ns = ? AND object_id = ? AND relation = ? AND subject_ns = ? AND subject_object_id = ? AND subject_relation = ?",
expectedArgs: []any{"sometype", "someobj", "somerel", "subns", "subid", "subrel"},
},
{
Expand All @@ -715,7 +715,7 @@ func TestExecuteQuery(t *testing.T) {
options.WithSkipCaveats(true),
},
expectedSkipCaveats: true,
expectedSQL: "SELECT object_id FROM relationtuples WHERE ns = ? AND object_id IN (?,?) AND relation = ? AND subject_ns = ? AND subject_object_id = ? AND subject_relation = ?",
expectedSQL: "SELECT object_id, expiration FROM relationtuples WHERE (expiration IS NULL OR expiration > NOW()) AND ns = ? AND object_id IN (?,?) AND relation = ? AND subject_ns = ? AND subject_object_id = ? AND subject_relation = ?",
expectedArgs: []any{"sometype", "someobj", "anotherobj", "somerel", "subns", "subid", "subrel"},
},
{
Expand All @@ -727,7 +727,7 @@ func TestExecuteQuery(t *testing.T) {
options.WithSkipCaveats(true),
},
expectedSkipCaveats: true,
expectedSQL: "SELECT object_id, relation, subject_ns, subject_object_id, subject_relation FROM relationtuples WHERE ns = ?",
expectedSQL: "SELECT object_id, relation, subject_ns, subject_object_id, subject_relation, expiration FROM relationtuples WHERE (expiration IS NULL OR expiration > NOW()) AND ns = ?",
expectedArgs: []any{"sometype"},
},
{
Expand All @@ -737,7 +737,7 @@ func TestExecuteQuery(t *testing.T) {
SubjectType: "subns",
})
},
expectedSQL: "SELECT ns, object_id, relation, subject_object_id, subject_relation, caveat, caveat_context FROM relationtuples WHERE subject_ns = ?",
expectedSQL: "SELECT ns, object_id, relation, subject_object_id, subject_relation, caveat, caveat_context, expiration FROM relationtuples WHERE (expiration IS NULL OR expiration > NOW()) AND subject_ns = ?",
expectedArgs: []any{"subns"},
},
{
Expand All @@ -748,7 +748,7 @@ func TestExecuteQuery(t *testing.T) {
OptionalSubjectId: "subid",
})
},
expectedSQL: "SELECT ns, object_id, relation, subject_relation, caveat, caveat_context FROM relationtuples WHERE subject_ns = ? AND subject_object_id = ?",
expectedSQL: "SELECT ns, object_id, relation, subject_relation, caveat, caveat_context, expiration FROM relationtuples WHERE (expiration IS NULL OR expiration > NOW()) AND subject_ns = ? AND subject_object_id = ?",
expectedArgs: []any{"subns", "subid"},
},
{
Expand All @@ -761,7 +761,7 @@ func TestExecuteQuery(t *testing.T) {
},
})
},
expectedSQL: "SELECT ns, object_id, relation, subject_object_id, caveat, caveat_context FROM relationtuples WHERE subject_ns = ? AND subject_relation = ?",
expectedSQL: "SELECT ns, object_id, relation, subject_object_id, caveat, caveat_context, expiration FROM relationtuples WHERE (expiration IS NULL OR expiration > NOW()) AND subject_ns = ? AND subject_relation = ?",
expectedArgs: []any{"subns", "subrel"},
},
{
Expand All @@ -775,7 +775,7 @@ func TestExecuteQuery(t *testing.T) {
},
})
},
expectedSQL: "SELECT ns, object_id, relation, caveat, caveat_context FROM relationtuples WHERE subject_ns = ? AND subject_object_id = ? AND subject_relation = ?",
expectedSQL: "SELECT ns, object_id, relation, caveat, caveat_context, expiration FROM relationtuples WHERE (expiration IS NULL OR expiration > NOW()) AND subject_ns = ? AND subject_object_id = ? AND subject_relation = ?",
expectedArgs: []any{"subns", "subid", "subrel"},
},
{
Expand All @@ -789,7 +789,7 @@ func TestExecuteQuery(t *testing.T) {
OptionalSubjectId: "subid",
})
},
expectedSQL: "SELECT ns, object_id, relation, subject_ns, subject_relation, caveat, caveat_context FROM relationtuples WHERE subject_ns = ? AND subject_object_id = ? AND subject_ns = ? AND subject_object_id = ?",
expectedSQL: "SELECT ns, object_id, relation, subject_ns, subject_relation, caveat, caveat_context, expiration FROM relationtuples WHERE (expiration IS NULL OR expiration > NOW()) AND subject_ns = ? AND subject_object_id = ? AND subject_ns = ? AND subject_object_id = ?",
expectedArgs: []any{"subns", "subid", "anothersubns", "subid"},
},
{
Expand All @@ -801,7 +801,7 @@ func TestExecuteQuery(t *testing.T) {
OptionalSubjectType: "anothersubjectype",
})
},
expectedSQL: "SELECT ns, object_id, relation, subject_ns, subject_object_id, subject_relation, caveat, caveat_context FROM relationtuples WHERE ((subject_ns = ?) OR (subject_ns = ?))",
expectedSQL: "SELECT ns, object_id, relation, subject_ns, subject_object_id, subject_relation, caveat, caveat_context, expiration FROM relationtuples WHERE (expiration IS NULL OR expiration > NOW()) AND ((subject_ns = ?) OR (subject_ns = ?))",
expectedArgs: []any{"somesubjectype", "anothersubjectype"},
},
{
Expand All @@ -813,7 +813,7 @@ func TestExecuteQuery(t *testing.T) {
OptionalSubjectType: "anothersubjectype",
}).FilterToResourceType("sometype")
},
expectedSQL: "SELECT object_id, relation, subject_ns, subject_object_id, subject_relation, caveat, caveat_context FROM relationtuples WHERE ((subject_ns = ?) OR (subject_ns = ?)) AND ns = ?",
expectedSQL: "SELECT object_id, relation, subject_ns, subject_object_id, subject_relation, caveat, caveat_context, expiration FROM relationtuples WHERE (expiration IS NULL OR expiration > NOW()) AND ((subject_ns = ?) OR (subject_ns = ?)) AND ns = ?",
expectedArgs: []any{"somesubjectype", "anothersubjectype", "sometype"},
},
}
Expand Down
8 changes: 4 additions & 4 deletions internal/datastore/mysql/datastore.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -435,12 +435,12 @@ type querier interface {
QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error)
}

type wrappedTX struct {
type asQueryableTx struct {
tx querier
}

func (wtx wrappedTX) QueryFunc(ctx context.Context, f func(context.Context, common.Rows) error, sql string, args ...any) error {
rows, err := wtx.tx.QueryContext(ctx, sql, args...)
func (aqt asQueryableTx) QueryFunc(ctx context.Context, f func(context.Context, common.Rows) error, sql string, args ...any) error {
rows, err := aqt.tx.QueryContext(ctx, sql, args...)
if err != nil {
return err
}
Expand Down Expand Up @@ -470,7 +470,7 @@ func newMySQLExecutor(tx querier) common.ExecuteReadRelsQueryFunc {
// short lifetime (e.g. to gracefully handle load-balancer connection drain)
return func(ctx context.Context, queryInfo common.QueryInfo, sqlQuery string, args []interface{}) (datastore.RelationshipIterator, error) {
span := trace.SpanFromContext(ctx)
return common.QueryRelationships[common.Rows, structpbWrapper](ctx, queryInfo, sqlQuery, args, span, wrappedTX{tx}, false)
return common.QueryRelationships[common.Rows, structpbWrapper](ctx, queryInfo, sqlQuery, args, span, asQueryableTx{tx}, false)
}
}

Expand Down

0 comments on commit 842a360

Please sign in to comment.