Merge pull request #8634 from nzdev/v8/feature/support-sql-server-dev…

…eloper-edition-2019 Support SQL Server 2012 syntax on SQL Server 2019
umbraco · Aug 17, 2020 · 5d93d8e · 5d93d8e
2 parents acb2c20 + 58a8b09
commit 5d93d8e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs b/src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
@@ -30,6 +30,7 @@ internal enum VersionName
             V2014 = 6,
             V2016 = 7,
             V2017 = 8,
+            V2019 = 9,
             Other = 99
         }
 
@@ -38,7 +39,7 @@ internal enum EngineEdition
             Unknown = 0,
             Desktop = 1,
             Standard = 2,
-            Enterprise = 3,
+            Enterprise = 3,// Also developer edition
             Express = 4,
             Azure = 5
         }
@@ -79,6 +80,8 @@ private static VersionName MapProductVersion(string productVersion)
             {
                 case "??":
                     return VersionName.Invalid;
+                case "15":
+                    return VersionName.V2019;
                 case "14":
                     return VersionName.V2017;
                 case "13":

diff --git a/src/Umbraco.Core/Persistence/UmbracoDatabaseFactory.cs b/src/Umbraco.Core/Persistence/UmbracoDatabaseFactory.cs
@@ -156,6 +156,7 @@ private void UpdateSqlServerDatabaseType()
                 case SqlServerSyntaxProvider.VersionName.V2014:
                 case SqlServerSyntaxProvider.VersionName.V2016:
                 case SqlServerSyntaxProvider.VersionName.V2017:
+                case SqlServerSyntaxProvider.VersionName.V2019:
                     _databaseType = DatabaseType.SqlServer2012;
                     break;
                 // else leave unchanged