From 814ff22568d1cfe55b9f11ec0a035c7a81b02952 Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Sat, 8 Feb 2020 19:28:44 -0600
Subject: [PATCH] rollback ef core due to dual-key sort query breaking

---
 server/src/FilterLists.Data/FilterLists.Data.csproj         | 4 ++--
 .../Seed/Extensions/SeedFilterListsDbContext.cs             | 2 +-
 .../Extensions/ConfigureServicesCollection.cs               | 6 +-----
 .../FilterLists.Agent.Tests/FilterLists.Agent.Tests.csproj  | 2 +-
 .../FilterLists.Data.Tests/FilterLists.Data.Tests.csproj    | 2 +-
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/server/src/FilterLists.Data/FilterLists.Data.csproj b/server/src/FilterLists.Data/FilterLists.Data.csproj
index 013abc5ed..897d0e71b 100644
--- a/server/src/FilterLists.Data/FilterLists.Data.csproj
+++ b/server/src/FilterLists.Data/FilterLists.Data.csproj
@@ -21,11 +21,11 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.2.12-alpha" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.6">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.0" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.2.6" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/server/src/FilterLists.Data/Seed/Extensions/SeedFilterListsDbContext.cs b/server/src/FilterLists.Data/Seed/Extensions/SeedFilterListsDbContext.cs
index 875f19dc9..27664536d 100644
--- a/server/src/FilterLists.Data/Seed/Extensions/SeedFilterListsDbContext.cs
+++ b/server/src/FilterLists.Data/Seed/Extensions/SeedFilterListsDbContext.cs
@@ -102,7 +102,7 @@ private static async Task InsertOnDuplicateKeyUpdate<TEntity>(DbContext dbContex
                 return;
             var columns = string.Join(", ", properties.Select(x => x.Name));
             var updates = CreateUpdates(properties);
-            var sql = "INSERT INTO " + entityType.GetTableName() + " (" + columns + ") VALUES " + values +
+            var sql = "INSERT INTO " + entityType.Relational().TableName + " (" + columns + ") VALUES " + values +
                       " ON DUPLICATE KEY UPDATE " + updates;
             await dbContext.Database.ExecuteSqlCommandAsync(sql);
         }
diff --git a/server/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs b/server/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs
index 572b0c19b..70586cd70 100644
--- a/server/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs
+++ b/server/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs
@@ -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
 {
@@ -25,8 +22,7 @@ public static void AddFilterListsApiServices(this IServiceCollection services, I
             services.AddSingleton(c => config);
             services.AddDbContextPool<FilterListsDbContext>(o =>
                     o.UseMySql(config.GetConnectionString("FilterListsConnection"),
-                        m => m.MigrationsAssembly("FilterLists.Api")
-                              .ServerVersion(new ServerVersion(new Version(10, 4, 12), ServerType.MariaDb))));
+                        m => m.MigrationsAssembly("FilterLists.Api")));
             services.TryAddScoped<FilterListService>();
             services.TryAddScoped<LanguageService>();
             services.TryAddScoped<LicenseService>();
diff --git a/server/tests/FilterLists.Agent.Tests/FilterLists.Agent.Tests.csproj b/server/tests/FilterLists.Agent.Tests/FilterLists.Agent.Tests.csproj
index 8e1991526..9c7307727 100644
--- a/server/tests/FilterLists.Agent.Tests/FilterLists.Agent.Tests.csproj
+++ b/server/tests/FilterLists.Agent.Tests/FilterLists.Agent.Tests.csproj
@@ -36,7 +36,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.6">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/server/tests/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj b/server/tests/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj
index eb7f5580a..5325d8ab5 100644
--- a/server/tests/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj
+++ b/server/tests/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj
@@ -35,7 +35,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.6">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>