updated schemamanger.

Author: jgauffin

src/Server/Coderr.Server.SqlServer.Tests/Helpers/DatabaseManager.cs

@@ -4,6 +4,7 @@
 using System.Data.SqlClient;
 using System.Diagnostics;
 using System.Threading;
+using Coderr.Server.SqlServer.Migrations;
 using Griffin.Data;
 using Griffin.Data.Mapper;
 

src/Server/Coderr.Server.SqlServer.Tests/SchemaManagerTests.cs

@@ -1,4 +1,5 @@
 using System.Threading;
+using Coderr.Server.SqlServer.Migrations;
 using Coderr.Server.SqlServer.Tests.Helpers;
 using FluentAssertions;
 using Xunit;

src/Server/Coderr.Server.SqlServer/Migrations/MigrationScripts.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+
+namespace Coderr.Server.SqlServer.Migrations
+{
+    public class MigrationScripts
+    {
+        internal const string SchemaNamespace = "Coderr.Server.SqlServer.Schema";
+        private readonly Dictionary<int, VersionMigration> _versions = new Dictionary<int, VersionMigration>();
+
+        public void AddScript(int version, string scriptName)
+        {
+            if (scriptName == null) throw new ArgumentNullException(nameof(scriptName));
+            if (version <= 0) throw new ArgumentOutOfRangeException(nameof(version));
+
+            if (!_versions.TryGetValue(version, out var value))
+            {
+                value = new VersionMigration(version);
+                _versions[version] = value;
+            }
+
+            value.Add(scriptName);
+        }
+
+        public IEnumerable<string> GetScripts(int version)
+        {
+            if (version <= 0) throw new ArgumentOutOfRangeException(nameof(version));
+
+            var scriptNames = _versions[version].ScriptsNames;
+            foreach (var scriptName in scriptNames)
+            {
+                var resourceName = $"{SchemaNamespace}.{scriptName}.sql";
+                var res = Assembly.GetExecutingAssembly().GetManifestResourceStream(resourceName);
+                if (res == null)
+                    throw new InvalidOperationException("Failed to find schema " + resourceName);
+
+                yield return new StreamReader(res).ReadToEnd();
+            }
+        }
+    }
+}

…Coderr.Server.SqlServer/SchemaManager.cs …er.SqlServer/Migrations/SchemaManager.cssrc/Server/Coderr.Server.SqlServer/SchemaManager.cs renamed to src/Server/Coderr.Server.SqlServer/Migrations/SchemaManager.cs src/Server/Coderr.Server.SqlServer/SchemaManager.cs renamed to src/Server/Coderr.Server.SqlServer/Migrations/SchemaManager.cs

@@ -6,21 +6,24 @@
 using System.Reflection;
 using log4net;
 
-namespace Coderr.Server.SqlServer
+namespace Coderr.Server.SqlServer.Migrations
 {
     public class SchemaManager
     {
         private readonly Func<IDbConnection> _connectionFactory;
-        private const string SchemaNamespace = "Coderr.Server.SqlServer.Schema";
         private ILog _logger = LogManager.GetLogger(typeof(SchemaManager));
+        private readonly MigrationScripts _migrationScripts = new MigrationScripts();
+        private string[] _scriptOrder = {"Update"};
+
+        private bool invoked;
 
         public SchemaManager(Func<IDbConnection> connectionFactory)
         {
             _connectionFactory = connectionFactory;
         }
 
         /// <summary>
-        /// Check if the current DB schema is out of date compared to the embedded schema resources.
+        ///     Check if the current DB schema is out of date compared to the embedded schema resources.
         /// </summary>
         public bool CanSchemaBeUpgraded()
         {
@@ -29,16 +32,14 @@ public bool CanSchemaBeUpgraded()
             return embeddedSchema > version;
         }
 
-        private bool invoked = false;
-
         public void CreateInitialStructure()
         {
             if (invoked)
                 throw new InvalidOperationException("Invoked");
             invoked = true;
             using (var con = _connectionFactory())
             {
-                var resourceName = $"{SchemaNamespace}.Database.sql";
+                var resourceName = $"{MigrationScripts.SchemaNamespace}.Database.sql";
                 var res = Assembly.GetExecutingAssembly().GetManifestResourceStream(resourceName);
                 var sql = new StreamReader(res).ReadToEnd();
                 using (var transaction = con.BeginTransaction())
@@ -65,7 +66,7 @@ public int GetCurrentSchemaVersion()
                         var sql = "SELECT Version FROM DatabaseSchema";
                         cmd.CommandText = sql;
                         var result = cmd.ExecuteScalar();
-                        version = (int)result;
+                        version = (int) result;
                     }
                     catch (SqlException ex)
                     {
@@ -77,6 +78,7 @@ public int GetCurrentSchemaVersion()
                     }
                 }
             }
+
             return version;
         }
 
@@ -86,21 +88,25 @@ public int GetLatestSchemaVersion()
             var names =
                 Assembly.GetExecutingAssembly()
                     .GetManifestResourceNames()
-                    .Where(x => x.StartsWith(SchemaNamespace) && x.Contains(".Update."));
+                    .Where(x => x.StartsWith(MigrationScripts.SchemaNamespace) && x.Contains(".v"));
             foreach (var name in names)
             {
-                var pos = name.IndexOf("Update") + 8; //2 extra for ".v"
+                var pos = name.IndexOf(".v") + 2; //2 extra for ".v"
                 var endPos = name.IndexOf(".", pos);
                 var versionStr = name.Substring(pos, endPos - pos);
                 var version = int.Parse(versionStr);
+
                 if (version > highestVersion)
                     highestVersion = version;
+
+                _migrationScripts.AddScript(version, name);
             }
+
             return highestVersion;
         }
 
         /// <summary>
-        /// Upgrade schema
+        ///     Upgrade schema
         /// </summary>
         /// <param name="toVersion">-1 = latest version</param>
         public void UpgradeDatabaseSchema(int toVersion = -1)
@@ -113,29 +119,22 @@ public void UpgradeDatabaseSchema(int toVersion = -1)
 
             for (var version = currentSchema + 1; version <= toVersion; version++)
             {
-                var schema = GetSchema(version);
+                var migrationScripts = _migrationScripts.GetScripts(version);
                 using (var con = _connectionFactory())
                 {
-                    using (var transaction = con.BeginTransaction())
-                    using (var cmd = con.CreateCommand())
+                    foreach (var versionScript in migrationScripts)
                     {
-                        cmd.Transaction = transaction;
-                        cmd.CommandText = schema;
-                        cmd.ExecuteNonQuery();
-                        transaction.Commit();
+                        using (var transaction = con.BeginTransaction())
+                        using (var cmd = con.CreateCommand())
+                        {
+                            cmd.Transaction = transaction;
+                            cmd.CommandText = versionScript;
+                            cmd.ExecuteNonQuery();
+                            transaction.Commit();
+                        }
                     }
                 }
             }
         }
-
-        private string GetSchema(int version)
-        {
-            var resourceName = $"{SchemaNamespace}.Update.v{version}.sql";
-            var res = Assembly.GetExecutingAssembly().GetManifestResourceStream(resourceName);
-            if (res == null)
-                throw new InvalidOperationException("Failed to find schema " + resourceName);
-
-            return new StreamReader(res).ReadToEnd();
-        }
     }
 }

src/Server/Coderr.Server.SqlServer/Migrations/VersionMigration.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+
+namespace Coderr.Server.SqlServer.Migrations
+{
+    public class VersionMigration
+    {
+        private readonly List<string> _scriptNames = new List<string>();
+
+        public VersionMigration(int version)
+        {
+            if (version <= 0) throw new ArgumentOutOfRangeException(nameof(version));
+
+            Version = version;
+        }
+
+        public string[] ScriptsNames => _scriptNames.ToArray();
+
+        public int Version { get; private set; }
+
+        public void Add(string scriptName)
+        {
+            if (scriptName == null) throw new ArgumentNullException(nameof(scriptName));
+
+            if (scriptName.StartsWith("Update") && _scriptNames.Count> 0)
+                _scriptNames.Insert(0, scriptName);
+            else
+                _scriptNames.Add(scriptName);
+        }
+    }
+}

src/Server/Coderr.Server.SqlServer/SqlServerTools.cs

@@ -4,6 +4,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Coderr.Server.Abstractions;
 using Coderr.Server.Infrastructure;
+using Coderr.Server.SqlServer.Migrations;
 
 namespace Coderr.Server.SqlServer
 {