prehistoric-systems/FilterLists
1
0
Fork 0
mirror of https://github.com/collinbarrett/FilterLists.git synced 2026-03-11 09:04:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rm MigrationsAssembly constant (pseudo-circular ref)

Browse source
This commit is contained in:
Collin M. Barrett 2020-02-18 18:47:58 -06:00
parent fa21335e9b
commit 1ef88f2964
3 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/src/FilterLists.Data/Constants.cs
View file

@ -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";
}
}

6
server/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs
View file

@ -21,9 +21,9 @@ public static void AddFilterListsApiServices(this IServiceCollection services, I
{
services.AddSingleton(c => config);
services.AddDbContextPool<FilterListsDbContext>(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<FilterListService>();
services.TryAddScoped<LanguageService>();
services.TryAddScoped<LicenseService>();

13
server/tests/FilterLists.Data.Tests/SeedFilterListsDbContextTests.cs
View file

@ -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<FilterListsDbContext>()
.UseMySql(connString, m => m.MigrationsAssembly(Constants.MigrationsAssembly)
.ServerVersion(Constants.ServerVersion))
.Options;
var options = new DbContextOptionsBuilder<FilterListsDbContext>().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();
}
}
}