Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/EfOrderBy/RequiredOrder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ public static void Validate(DbContext context)
return;
}

validated.Add(contextType);

// Check if this DbContext requires ordering for all entities (opt-in feature)
var requireOrdering = context.GetService<IDbContextOptions>()
.FindExtension<OrderRequiredExtension>()
Expand All @@ -23,6 +21,10 @@ public static void Validate(DbContext context)
{
ValidateAllEntitiesHaveOrdering(context.Model);
}

// Marked only after validation succeeds, so a failed validation keeps throwing
// instead of silently passing on every subsequent query
validated.Add(contextType);
}

static void ValidateAllEntitiesHaveOrdering(IModel model)
Expand Down
17 changes: 17 additions & 0 deletions src/Tests/RequireOrderingTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,23 @@ public async Task RequireOrderingForAllEntities_ThrowsWhenEntityMissingOrdering(
Assert.That(ex.Message, Does.Contain("do not have ordering configured"));
}

[Test]
public async Task RequireOrderingForAllEntities_ThrowsOnEveryQueryNotJustTheFirst()
{
await using var database = await sqlInstanceWithMissing.Build();
await using var context = database.NewDbContext();

Assert.ThrowsAsync<Exception>(() => context.EntitiesWithoutDefaultOrder.ToListAsync());

// Validation is cached per DbContext type. A failed validation must not be cached,
// otherwise the error disappears after the first query and later queries silently
// return unordered results
var exception = Assert.ThrowsAsync<Exception>(() => context.EntitiesWithoutDefaultOrder.ToListAsync());

Assert.That(exception!.Message, Does.Contain("EntityWithoutDefaultOrder"));
Assert.That(exception.Message, Does.Contain("do not have ordering configured"));
}

[Test]
public async Task RequireOrderingForAllEntities_SucceedsWhenAllEntitiesHaveOrdering()
{
Expand Down
Loading