coderrio
diff --git a/‎src/Server/Coderr.Server.SqlServer/Migrations/MigrationScripts.cs
Lines changed: 9 additions & 0 deletions b/‎src/Server/Coderr.Server.SqlServer/Migrations/MigrationScripts.cs
Lines changed: 9 additions & 0 deletions
diff --git a/‎src/Server/Coderr.Server.SqlServer/Migrations/SchemaManager.cs
Lines changed: 4 additions & 0 deletions b/‎src/Server/Coderr.Server.SqlServer/Migrations/SchemaManager.cs
Lines changed: 4 additions & 0 deletions
diff --git a/‎src/Server/Coderr.Server.SqlServer/Schema/Update.v14.sql
Lines changed: 2 additions & 2 deletions b/‎src/Server/Coderr.Server.SqlServer/Schema/Update.v14.sql
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Server/Coderr.Server.Web/Boot/Cqs/RegisterCqsServices.cs
Lines changed: 4 additions & 0 deletions b/‎src/Server/Coderr.Server.Web/Boot/Cqs/RegisterCqsServices.cs
Lines changed: 4 additions & 0 deletions
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 
 namespace Coderr.Server.SqlServer.Migrations
@@ -9,6 +10,9 @@ public class MigrationScripts
     {
         internal const string SchemaNamespace = "Coderr.Server.SqlServer.Schema";
         private readonly Dictionary<int, VersionMigration> _versions = new Dictionary<int, VersionMigration>();
+        private bool _isEmpty;
+
+        public bool IsEmpty => _versions.Count == 0;
 
         public void AddScript(int version, string scriptName)
         {
@@ -38,5 +42,10 @@ public IEnumerable<string> GetScripts(int version)
                 yield return new StreamReader(res).ReadToEnd();
             }
         }
+
+        public int GetHighestVersion()
+        {
+            return _versions.Max(x => x.Key);
+        }
     }
 }
@@ -78,6 +78,10 @@ public int GetCurrentSchemaVersion()
 
         public int GetLatestSchemaVersion()
         {
+            if (!_migrationScripts.IsEmpty)
+            {
+                return _migrationScripts.GetHighestVersion();
+            }
             var highestVersion = 0;
             var names =
                 Assembly.GetExecutingAssembly()
 
@@ -1,3 +1,3 @@
---alter table ApplicationVersions alter column Version varchar(20) not null;
+alter table ApplicationVersions alter column Version varchar(20) not null;
 
---UPDATE DatabaseSchema SET Version = 14;
+UPDATE DatabaseSchema SET Version = 14;
@@ -88,6 +88,10 @@ public void Stop()
             {
                 _log.Debug("Shutting down");
                 _messagingQueueListenerTask.Wait(10000);
+            }
+            catch (TaskCanceledException)
+            {
+                
             }
             catch (Exception ex)
             {
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.IO;`
	`4`	`+using System.Linq;`
`4`	`5`	`using System.Reflection;`
`5`	`6`
`6`	`7`	`namespace Coderr.Server.SqlServer.Migrations`
`@@ -9,6 +10,9 @@ public class MigrationScripts`
`9`	`10`	`{`
`10`	`11`	`internal const string SchemaNamespace = "Coderr.Server.SqlServer.Schema";`
`11`	`12`	`private readonly Dictionary<int, VersionMigration> _versions = new Dictionary<int, VersionMigration>();`
	`13`	`+ private bool _isEmpty;`
	`14`	`+`
	`15`	`+ public bool IsEmpty => _versions.Count == 0;`
`12`	`16`
`13`	`17`	`public void AddScript(int version, string scriptName)`
`14`	`18`	`{`
`@@ -38,5 +42,10 @@ public IEnumerable<string> GetScripts(int version)`
`38`	`42`	`yield return new StreamReader(res).ReadToEnd();`
`39`	`43`	`}`
`40`	`44`	`}`
	`45`	`+`
	`46`	`+ public int GetHighestVersion()`
	`47`	`+ {`
	`48`	`+ return _versions.Max(x => x.Key);`
	`49`	`+ }`
`41`	`50`	`}`
`42`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,10 @@ public void Stop()`
`88`	`88`	`{`
`89`	`89`	`_log.Debug("Shutting down");`
`90`	`90`	`_messagingQueueListenerTask.Wait(10000);`
	`91`	`+ }`
	`92`	`+ catch (TaskCanceledException)`
	`93`	`+ {`
	`94`	`+`
`91`	`95`	`}`
`92`	`96`	`catch (Exception ex)`
`93`	`97`	`{`