Skip to content

Align startup check with actual migrations table name #6066

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rbev merged 1 commit into from
Oct 30, 2026
Merged

Align startup check with actual migrations table name #6066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/ServiceControl.Audit.Persistence.EFCore/DbContexts/AuditDbContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ public abstract class AuditDbContext(DbContextOptions options) : DbContext(optio
{
public const string MigrationsHistoryTableName = "__AuditMigrationsHistory";

// EF Core's default history table name, which identifies a primary instance that wrongly shares this schema.
const string PrimaryMigrationsHistoryTableName = "__EFMigrationsHistory";
// The primary instance's migrations history table name, identified by ServiceControlDbContext.MigrationsHistoryTableName.
const string PrimaryMigrationsHistoryTableName = "__ErrorMigrationsHistory";

public string? Schema { get; } = options.FindExtension<SchemaOptionsExtension>()?.Schema;

Expand Down
6 changes: 3 additions & 3 deletions src/ServiceControl.Audit.Persistence.Tests/EFCore/SchemaSetupTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ public async Task Setup_fails_when_the_schema_holds_the_primary_migrations_histo

try
{
await TestSchema.CreateTable(connectionString, schema, "__EFMigrationsHistory");
await TestSchema.CreateTable(connectionString, schema, "__ErrorMigrationsHistory");

var exception = Assert.ThrowsAsync<InvalidOperationException>(() => Setup(testsConfiguration, connectionString, schema));

Assert.That(exception.Message, Does.Contain(schema).And.Contain("__EFMigrationsHistory"));
Assert.That(exception.Message, Does.Contain(schema).And.Contain("__ErrorMigrationsHistory"));
}
finally
{
Expand All @@ -62,7 +62,7 @@ public async Task Setup_ignores_the_primary_migrations_history_table_in_another_

try
{
await TestSchema.CreateTable(connectionString, primarySchema, "__EFMigrationsHistory");
await TestSchema.CreateTable(connectionString, primarySchema, "__ErrorMigrationsHistory");

Assert.DoesNotThrowAsync(() => Setup(testsConfiguration, connectionString, schema));
}
Expand Down
Loading