From 9db47f05e800e2b579a4dd13b56410002e2b2209 Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Sat, 8 Feb 2020 14:30:16 -0600
Subject: [PATCH] specify MariaDB version to differentiate CHANGE/RENAME COLUMN
 syntax w/MySQL

---
 docker-compose.yml                                          | 3 ++-
 .../Extensions/ConfigureServicesCollection.cs               | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 6128b4a7e..641bdd75e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -37,7 +37,8 @@ services:
       ConnectionStrings__FilterListsConnection: ${API_CONNECTION_STRING}
 
   mariadb:
-    image: mariadb:latest
+    # on update, also update ServerVersion in FilterLists.Services.DependencyInjection.Extensions.ConfigureServicesCollection
+    image: mariadb:10.4.12
     restart: always
     networks:
       - api
diff --git a/server/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs b/server/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs
index c9f8c577c..1344647df 100644
--- a/server/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs
+++ b/server/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs
@@ -12,6 +12,9 @@
 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
 {
@@ -23,7 +26,8 @@ public static void AddFilterListsApiServices(this IServiceCollection services, I
             services.AddEntityFrameworkMySql()
                 .AddDbContextPool<FilterListsDbContext>(o =>
                     o.UseMySql(config.GetConnectionString("FilterListsConnection"),
-                        m => m.MigrationsAssembly("FilterLists.Api")));
+                        m => m.MigrationsAssembly("FilterLists.Api")
+                              .ServerVersion(new ServerVersion(new Version(10, 4, 12), ServerType.MariaDb))));
             services.TryAddScoped<FilterListService>();
             services.TryAddScoped<LanguageService>();
             services.TryAddScoped<LicenseService>();