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

extract ServerVersion to constant

Browse source
This commit is contained in:
Collin M. Barrett 2020-02-10 07:39:46 -06:00
parent 50cece12fc
commit d4db6cf11f
4 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docker-compose.data.tests.yml
View file

@ -15,7 +15,7 @@ services:
- mariadb
mariadb:
# on update, also update ServerVersion in FilterLists.Services.DependencyInjection.Extensions.ConfigureServicesCollection
# on update, also update ServerVersion in FilterLists.Data.Constants.ServerVersion
image: mariadb:10.4.12
networks:
- test-data

2
docker-compose.yml
View file

@ -37,7 +37,7 @@ services:
ConnectionStrings__FilterListsConnection: ${API_CONNECTION_STRING}
mariadb:
# on update, also update ServerVersion in FilterLists.Services.DependencyInjection.Extensions.ConfigureServicesCollection
# on update, also update ServerVersion in FilterLists.Data.Constants.ServerVersion
image: mariadb:10.4.12
restart: always
networks:

11
server/src/FilterLists.Data/Constants.cs Normal file
View file

@ -0,0 +1,11 @@
using Pomelo.EntityFrameworkCore.MySql.Infrastructure;
using Pomelo.EntityFrameworkCore.MySql.Storage;
using System;
namespace FilterLists.Data
{
public static class Constants
{
public static readonly ServerVersion ServerVersion = new ServerVersion(new Version(10, 4, 12), ServerType.MariaDb);
}
}

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

@ -12,9 +12,6 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Pomelo.EntityFrameworkCore.MySql.Infrastructure;
using Pomelo.EntityFrameworkCore.MySql.Storage;
using System;
namespace FilterLists.Services.DependencyInjection.Extensions
{
@ -26,7 +23,7 @@ public static void AddFilterListsApiServices(this IServiceCollection services, I
services.AddDbContextPool<FilterListsDbContext>(o =>
o.UseMySql(config.GetConnectionString("FilterListsConnection"),
m => m.MigrationsAssembly("FilterLists.Data")
.ServerVersion(new ServerVersion(new Version(10, 4, 12), ServerType.MariaDb))));
.ServerVersion(Constants.ServerVersion)));
services.TryAddScoped<FilterListService>();
services.TryAddScoped<LanguageService>();
services.TryAddScoped<LicenseService>();