Merge pull request #21 from episerver/bugfix/20-fix-schema-updater

Use last migration instead of first

Author: Mark Hall

.github/workflows/ci.yml

@@ -5,11 +5,9 @@ on:
     branches:
       - 'main'
       - 'develop'
-      - 'netcore'
   pull_request:
     branches:
       - '*'
-      - '!main'
 jobs:
   build_test_pack:
     name: Build, test & pack

build/version.props

@@ -1,7 +1,7 @@
 <!-- This file may be overwritten by automation. Only values allowed here are VersionPrefix and VersionSuffix.  -->
 <Project>
   <PropertyGroup>
-    <VersionPrefix>3.1.0</VersionPrefix>
+    <VersionPrefix>3.1.1</VersionPrefix>
     <VersionSuffix></VersionSuffix>
   </PropertyGroup>
 </Project>

src/EPiServer.Marketing.KPI/Dal/BaseRepository.cs

@@ -8,6 +8,7 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using EPiServer.ServiceLocation;
+using Microsoft.Data.SqlClient;
 
 namespace EPiServer.Marketing.KPI.Dal
 {
@@ -127,7 +128,22 @@ public void Delete<T>(T instance) where T : class
 
         public string GetDatabaseVersion(string contextKey)
         {
-            return HistoryRepository.GetAppliedMigrations().Select(r => r.MigrationId).FirstOrDefault();
+            string result = null;
+            using (var connection = new SqlConnection(DatabaseContext.Database.GetConnectionString()))
+            {
+                connection.Open();
+                var command = new SqlCommand("Select top 1 MigrationId from __MigrationHistory where ContextKey = @contextKey order by MigrationId desc ", connection);
+                command.Parameters.Add(new SqlParameter("@contextKey", contextKey));
+                try
+                {
+                    result = (string)command.ExecuteScalar();
+                }
+                catch (Exception)
+                {
+                    return null;
+                }
+            }
+            return result;
         }
 
         /// <summary>

src/EPiServer.Marketing.KPI/Dal/DataAccess/KpiDataAccess.cs

@@ -156,7 +156,10 @@ public long GetDatabaseVersion(string schema, string contextKey)
         private long GetDatabaseVersionHelper(IRepository repo, string contextKey)
         {
             var lastMigration = repo.GetDatabaseVersion(contextKey);
-
+            if (lastMigration == null)
+            {
+                return 0;
+            }
             // we are only interested in the numerical part of the key (i.e. 201609091719244_Initial)
             var version = lastMigration.Split('_')[0];
 

src/EPiServer.Marketing.Testing.Dal/BaseRepository.cs

@@ -8,6 +8,7 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using EPiServer.ServiceLocation;
+using Microsoft.Data.SqlClient;
 
 namespace EPiServer.Marketing.Testing.Dal
 {
@@ -137,7 +138,22 @@ public void Delete<T>(T instance) where T : class
 
         public string GetDatabaseVersion(string contextKey)
         {
-            return HistoryRepository.GetAppliedMigrations().Select(r => r.MigrationId).FirstOrDefault();
+            string result = null;
+            using(var connection = new SqlConnection(DatabaseContext.Database.GetConnectionString()))
+            {
+                connection.Open();
+                var command = new SqlCommand("Select top 1 MigrationId from __MigrationHistory where ContextKey = @contextKey order by MigrationId desc ", connection);
+                command.Parameters.Add(new SqlParameter("@contextKey", contextKey));
+                try
+                {
+                    result = (string)command.ExecuteScalar();
+                }
+                catch(Exception)
+                {
+                    return null;
+                }
+            }
+            return result;
         }
 
         /// <summary>

src/EPiServer.Marketing.Testing.Dal/DataAccess/TestingDataAccess.cs

@@ -108,7 +108,10 @@ public long GetDatabaseVersion(string schema, string contextKey)
         private long GetDatabaseVersionHelper(IRepository repo, string contextKey)
         {
             var lastMigration = repo.GetDatabaseVersion(contextKey);
-
+            if (lastMigration == null)
+            {
+                return 0;
+            }
             // we are only interested in the numerical part of the key (i.e. 201609091719244_Initial)
             var version = lastMigration.Split('_')[0];