diff --git a/server/src/FilterLists.Data/Constants.cs b/server/src/FilterLists.Data/Constants.cs index 9814d1c4d..24c46409f 100644 --- a/server/src/FilterLists.Data/Constants.cs +++ b/server/src/FilterLists.Data/Constants.cs @@ -7,7 +7,5 @@ namespace FilterLists.Data public static class Constants { public static readonly ServerVersion ServerVersion = new ServerVersion(new Version(10, 4, 12), ServerType.MariaDb); - - public const string MigrationsAssembly = "FilterLists.Data.Migrations"; } } \ No newline at end of file diff --git a/server/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs b/server/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs index a880a8601..17c11a423 100644 --- a/server/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs +++ b/server/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs @@ -21,9 +21,9 @@ public static void AddFilterListsApiServices(this IServiceCollection services, I { services.AddSingleton(c => config); services.AddDbContextPool(o => - o.UseMySql(config.GetConnectionString("FilterListsConnection"), - m => m.MigrationsAssembly(Constants.MigrationsAssembly) - .ServerVersion(Constants.ServerVersion))); + o.UseMySql(config.GetConnectionString("FilterListsConnection"), + m => m.MigrationsAssembly("FilterLists.Data.Migrations") + .ServerVersion(Constants.ServerVersion))); services.TryAddScoped(); services.TryAddScoped(); services.TryAddScoped(); diff --git a/server/tests/FilterLists.Data.Tests/SeedFilterListsDbContextTests.cs b/server/tests/FilterLists.Data.Tests/SeedFilterListsDbContextTests.cs index 1681ffed7..092be7ac7 100644 --- a/server/tests/FilterLists.Data.Tests/SeedFilterListsDbContextTests.cs +++ b/server/tests/FilterLists.Data.Tests/SeedFilterListsDbContextTests.cs @@ -14,15 +14,12 @@ public void Migrate_DoesNotThrowException() Thread.Sleep(20000); const string connString = "Server=mariadb;Database=filterlists;Uid=filterlists;Pwd=filterlists;"; - var options = new DbContextOptionsBuilder() - .UseMySql(connString, m => m.MigrationsAssembly(Constants.MigrationsAssembly) - .ServerVersion(Constants.ServerVersion)) - .Options; + var options = new DbContextOptionsBuilder().UseMySql(connString, + m => m.MigrationsAssembly("FilterLists.Data.Migrations").ServerVersion(Constants.ServerVersion)) + .Options; - using (var context = new FilterListsDbContext(options)) - { - context.Database.Migrate(); - } + using var context = new FilterListsDbContext(options); + context.Database.Migrate(); } } } \ No newline at end of file