Merge AppVersions Information into __EFMigrationsHistory table

Oqtane.Database.PostgreSQL/OqtaneHistoryRepository.cs

@@ -0,0 +1,51 @@
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Migrations.Internal;
+using Oqtane.Migrations.Framework;
+using Oqtane.Models;
+using Oqtane.Shared;
+
+// ReSharper disable ClassNeverInstantiated.Global
+
+namespace Oqtane.Database.PostgreSQL
+{
+    public class OqtaneHistoryRepository : NpgsqlHistoryRepository
+    {
+        private string _appliedDateColumnName = "applied_date";
+        private string _appliedVersionColumnName = "applied_version";
+        private MigrationHistoryTable _migrationHistoryTable;
+
+        public OqtaneHistoryRepository(HistoryRepositoryDependencies dependencies) : base(dependencies)
+        {
+            _migrationHistoryTable = new MigrationHistoryTable
+            {
+                TableName = TableName,
+                TableSchema = TableSchema,
+                MigrationIdColumnName = MigrationIdColumnName,
+                ProductVersionColumnName = ProductVersionColumnName,
+                AppliedVersionColumnName = _appliedVersionColumnName,
+                AppliedDateColumnName = _appliedDateColumnName
+            };
+
+        }
+
+        protected override void ConfigureTable(EntityTypeBuilder<HistoryRow> history)
+        {
+            base.ConfigureTable(history);
+            history.Property<string>(_appliedVersionColumnName).HasMaxLength(10);
+            history.Property<DateTime>(_appliedDateColumnName);
+        }
+
+        public override string GetInsertScript(HistoryRow row)
+        {
+            if (row == null)
+            {
+                throw new ArgumentNullException(nameof(row));
+            }
+
+            return MigrationUtils.BuildInsertScript(row, Dependencies, _migrationHistoryTable);
+        }
+    }
+}

Oqtane.Database.PostgreSQL/PostgreSQLDatabase.cs

@@ -119,7 +119,9 @@ public override void UpdateIdentityStoreTableNames(ModelBuilder builder)
 
         public override DbContextOptionsBuilder UseDatabase(DbContextOptionsBuilder optionsBuilder, string connectionString)
         {
-            return optionsBuilder.UseNpgsql(connectionString).UseSnakeCaseNamingConvention();
+            return optionsBuilder.UseNpgsql(connectionString)
+                .UseSnakeCaseNamingConvention()
+                .ReplaceService<IHistoryRepository, OqtaneHistoryRepository>();
         }
 
         private void PrepareCommand(NpgsqlConnection conn, NpgsqlCommand cmd, string query)

Oqtane.Database.SqlServer/OqtaneHistoryRepository.cs

@@ -0,0 +1,53 @@
+using System;
+using System.Text;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.SqlServer.Migrations.Internal;
+using Microsoft.EntityFrameworkCore.Storage;
+using Oqtane.Migrations.Framework;
+using Oqtane.Models;
+using Oqtane.Shared;
+
+// ReSharper disable ClassNeverInstantiated.Global
+
+namespace Oqtane.Database.SqlServer
+{
+    public class OqtaneHistoryRepository : SqlServerHistoryRepository
+    {
+        private string _appliedDateColumnName = "AppliedDate";
+        private string _appliedVersionColumnName = "AppliedVersion";
+        private MigrationHistoryTable _migrationHistoryTable;
+
+        public OqtaneHistoryRepository(HistoryRepositoryDependencies dependencies) : base(dependencies)
+        {
+            _migrationHistoryTable = new MigrationHistoryTable
+            {
+                TableName = TableName,
+                TableSchema = TableSchema,
+                MigrationIdColumnName = MigrationIdColumnName,
+                ProductVersionColumnName = ProductVersionColumnName,
+                AppliedVersionColumnName = _appliedVersionColumnName,
+                AppliedDateColumnName = _appliedDateColumnName
+            };
+
+        }
+
+        protected override void ConfigureTable(EntityTypeBuilder<HistoryRow> history)
+        {
+            base.ConfigureTable(history);
+            history.Property<string>(_appliedVersionColumnName).HasMaxLength(10);
+            history.Property<DateTime>(_appliedDateColumnName);
+        }
+
+        public override string GetInsertScript(HistoryRow row)
+        {
+            if (row == null)
+            {
+                throw new ArgumentNullException(nameof(row));
+            }
+
+            return MigrationUtils.BuildInsertScript(row, Dependencies, _migrationHistoryTable);
+        }
+    }
+}

Oqtane.Database.SqlServer/SqlServerDatabase.cs

@@ -64,7 +64,8 @@ public override IDataReader ExecuteReader(string connectionString, string query)
 
         public override DbContextOptionsBuilder UseDatabase(DbContextOptionsBuilder optionsBuilder, string connectionString)
         {
-            return optionsBuilder.UseSqlServer(connectionString);
+            return optionsBuilder.UseSqlServer(connectionString)
+                .ReplaceService<IHistoryRepository, OqtaneHistoryRepository>();
         }
 
         private string FormatConnectionString(string connectionString)

Oqtane.Database.Sqlite/OqtaneHistoryRepository.cs

@@ -0,0 +1,51 @@
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Sqlite.Migrations.Internal;
+using Oqtane.Migrations.Framework;
+using Oqtane.Models;
+using Oqtane.Shared;
+
+// ReSharper disable ClassNeverInstantiated.Global
+
+namespace Oqtane.Database.Sqlite
+{
+    public class OqtaneHistoryRepository : SqliteHistoryRepository
+    {
+        private string _appliedDateColumnName = "AppliedDate";
+        private string _appliedVersionColumnName = "AppliedVersion";
+        private MigrationHistoryTable _migrationHistoryTable;
+
+        public OqtaneHistoryRepository(HistoryRepositoryDependencies dependencies) : base(dependencies)
+        {
+            _migrationHistoryTable = new MigrationHistoryTable
+            {
+                TableName = TableName,
+                TableSchema = TableSchema,
+                MigrationIdColumnName = MigrationIdColumnName,
+                ProductVersionColumnName = ProductVersionColumnName,
+                AppliedVersionColumnName = _appliedVersionColumnName,
+                AppliedDateColumnName = _appliedDateColumnName
+            };
+
+        }
+
+        protected override void ConfigureTable(EntityTypeBuilder<HistoryRow> history)
+        {
+            base.ConfigureTable(history);
+            history.Property<string>(_appliedVersionColumnName).HasMaxLength(10);
+            history.Property<DateTime>(_appliedDateColumnName);
+        }
+
+        public override string GetInsertScript(HistoryRow row)
+        {
+            if (row == null)
+            {
+                throw new ArgumentNullException(nameof(row));
+            }
+
+            return MigrationUtils.BuildInsertScript(row, Dependencies, _migrationHistoryTable);
+        }
+    }
+}

Oqtane.Database.Sqlite/SqliteDatabase.cs

@@ -77,7 +77,8 @@ public override IDataReader ExecuteReader(string connectionString, string query)
 
         public override DbContextOptionsBuilder UseDatabase(DbContextOptionsBuilder optionsBuilder, string connectionString)
         {
-            return optionsBuilder.UseSqlite(connectionString);
+            return optionsBuilder.UseSqlite(connectionString)
+                .ReplaceService<IHistoryRepository, OqtaneHistoryRepository>();
         }
 
         private void PrepareCommand(SqliteConnection conn, SqliteCommand cmd, string query)

Oqtane.Server/Infrastructure/DatabaseManager.cs

@@ -726,7 +726,10 @@ public void UpgradeSqlServer(ISqlRepository sql, string connectionString, string
         {
             var script = (isMaster) ? "MigrateMaster.sql" : "MigrateTenant.sql";
 
-            sql.ExecuteScript(connectionString, databaseType, Assembly.GetExecutingAssembly(), script);
+            var query = sql.GetScriptFromAssembly(Assembly.GetExecutingAssembly(), script);
+            query = query.Replace("{{Version}}", Constants.Version);
+
+            sql.ExecuteNonQuery(connectionString, databaseType, query);
         }
     }
 }

Oqtane.Server/Migrations/Framework/MigrationUtils.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Text;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage;
+using Oqtane.Models;
+using Oqtane.Shared;
+
+namespace Oqtane.Migrations.Framework
+{
+    public static class MigrationUtils
+    {
+        public static string BuildInsertScript(HistoryRow row, HistoryRepositoryDependencies dependencies, MigrationHistoryTable historyTable )
+        {
+            var sqlGenerationHelper = dependencies.SqlGenerationHelper;
+            var stringTypeMapping = dependencies.TypeMappingSource.GetMapping(typeof(string));
+
+            return new StringBuilder().Append("INSERT INTO ")
+                .Append(sqlGenerationHelper.DelimitIdentifier(historyTable.TableName, historyTable.TableSchema))
+                .Append(" (")
+                .Append(sqlGenerationHelper.DelimitIdentifier(historyTable.MigrationIdColumnName))
+                .Append(", ")
+                .Append(sqlGenerationHelper.DelimitIdentifier(historyTable.ProductVersionColumnName))
+                .Append(", ")
+                .Append(sqlGenerationHelper.DelimitIdentifier(historyTable.AppliedVersionColumnName))
+                .Append(", ")
+                .Append(sqlGenerationHelper.DelimitIdentifier(historyTable.AppliedDateColumnName))
+                .AppendLine(")")
+                .Append("VALUES (")
+                .Append(stringTypeMapping.GenerateSqlLiteral(row.MigrationId))
+                .Append(", ")
+                .Append(stringTypeMapping.GenerateSqlLiteral(row.ProductVersion))
+                .Append(", ")
+                .Append(stringTypeMapping.GenerateSqlLiteral(Constants.Version))
+                .Append(", ")
+                .Append(stringTypeMapping.GenerateSqlLiteral(DateTime.Now.ToString("yyyy'-'MM'-'dd' 'HH':'mm':'ss'.'fffffffK")))
+                .Append(")")
+                .AppendLine(sqlGenerationHelper.StatementTerminator)
+                .ToString();
+        }
+
+    }
+}

Oqtane.Server/Migrations/01000000_InitializeMaster.cs → Oqtane.Server/Migrations/Master/01000000_InitializeMaster.cs

@@ -1,12 +1,10 @@
-using System.Collections.Generic;
-using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Oqtane.Databases.Interfaces;
-using Oqtane.Interfaces;
 using Oqtane.Migrations.EntityBuilders;
 using Oqtane.Repository;
 
-namespace Oqtane.Migrations
+namespace Oqtane.Migrations.Master
 {
     [DbContext(typeof(MasterDBContext))]
     [Migration("Master.01.00.00.00")]

Oqtane.Server/Migrations/01000100_AddAdditionalIndexesInMaster.cs → Oqtane.Server/Migrations/Master/01000100_AddAdditionalIndexesInMaster.cs

@@ -1,12 +1,10 @@
-using System.Collections.Generic;
-using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Oqtane.Databases.Interfaces;
-using Oqtane.Interfaces;
 using Oqtane.Migrations.EntityBuilders;
 using Oqtane.Repository;
 
-namespace Oqtane.Migrations
+namespace Oqtane.Migrations.Master
 {
     [DbContext(typeof(MasterDBContext))]
     [Migration("Master.01.00.01.00")]

Oqtane.Server/Migrations/02010000_AddIndexesForForeignKeyInMaster.cs → Oqtane.Server/Migrations/Master/02010000_AddIndexesForForeignKeyInMaster.cs

@@ -1,12 +1,10 @@
-using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Oqtane.Databases.Interfaces;
-using Oqtane.Interfaces;
 using Oqtane.Migrations.EntityBuilders;
 using Oqtane.Repository;
 
-namespace Oqtane.Migrations
+namespace Oqtane.Migrations.Master
 {
     [DbContext(typeof(MasterDBContext))]
     [Migration("Master.02.01.00.00")]

Oqtane.Server/Migrations/02010001_AddDatabaseTypeColumnToTenant.cs → Oqtane.Server/Migrations/Master/02010001_AddDatabaseTypeColumnToTenant.cs

@@ -1,12 +1,10 @@
-using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Oqtane.Databases.Interfaces;
-using Oqtane.Interfaces;
 using Oqtane.Migrations.EntityBuilders;
 using Oqtane.Repository;
 
-namespace Oqtane.Migrations
+namespace Oqtane.Migrations.Master
 {
     [DbContext(typeof(MasterDBContext))]
     [Migration("Master.02.01.00.01")]

Oqtane.Server/Migrations/01000000_InitializeTenant.cs → Oqtane.Server/Migrations/Tenant/01000000_InitializeTenant.cs

@@ -1,13 +1,10 @@
-using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Oqtane.Databases.Interfaces;
-using Oqtane.Interfaces;
 using Oqtane.Migrations.EntityBuilders;
 using Oqtane.Repository;
 
-
-namespace Oqtane.Migrations
+namespace Oqtane.Migrations.Tenant
 {
     [DbContext(typeof(TenantDBContext))]
     [Migration("Tenant.01.00.00.00")]

Oqtane.Server/Migrations/01000100_AddAdditionalIndexesInTenant.cs → Oqtane.Server/Migrations/Tenant/01000100_AddAdditionalIndexesInTenant.cs

@@ -1,12 +1,10 @@
-using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Oqtane.Databases.Interfaces;
-using Oqtane.Interfaces;
 using Oqtane.Migrations.EntityBuilders;
 using Oqtane.Repository;
 
-namespace Oqtane.Migrations
+namespace Oqtane.Migrations.Tenant
 {
     [DbContext(typeof(TenantDBContext))]
     [Migration("Tenant.01.00.01.00")]

Oqtane.Server/Migrations/01000101_AddAdditionColumnToNotifications.cs → Oqtane.Server/Migrations/Tenant/01000101_AddAdditionColumnToNotifications.cs

@@ -1,12 +1,10 @@
-using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Oqtane.Databases.Interfaces;
-using Oqtane.Interfaces;
 using Oqtane.Migrations.EntityBuilders;
 using Oqtane.Repository;
 
-namespace Oqtane.Migrations
+namespace Oqtane.Migrations.Tenant
 {
     [DbContext(typeof(TenantDBContext))]
     [Migration("Tenant.01.00.01.01")]

Oqtane.Server/Migrations/01000201_DropColumnFromPage.cs → Oqtane.Server/Migrations/Tenant/01000201_DropColumnFromPage.cs

@@ -1,12 +1,10 @@
-using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Oqtane.Databases.Interfaces;
-using Oqtane.Interfaces;
 using Oqtane.Migrations.EntityBuilders;
 using Oqtane.Repository;
 
-namespace Oqtane.Migrations
+namespace Oqtane.Migrations.Tenant
 {
     [DbContext(typeof(TenantDBContext))]
     [Migration("Tenant.01.00.02.01")]

Oqtane.Server/Migrations/02000001_AddColumnToProfileAndUpdatePage.cs → Oqtane.Server/Migrations/Tenant/02000001_AddColumnToProfileAndUpdatePage.cs

@@ -1,12 +1,10 @@
-using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Oqtane.Databases.Interfaces;
-using Oqtane.Interfaces;
 using Oqtane.Migrations.EntityBuilders;
 using Oqtane.Repository;
 
-namespace Oqtane.Migrations
+namespace Oqtane.Migrations.Tenant
 {
     [DbContext(typeof(TenantDBContext))]
     [Migration("Tenant.02.00.00.01")]

Oqtane.Server/Migrations/02000101_UpdateIconColumnInPage.cs → Oqtane.Server/Migrations/Tenant/02000101_UpdateIconColumnInPage.cs

@@ -1,12 +1,10 @@
-using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Oqtane.Databases.Interfaces;
-using Oqtane.Interfaces;
 using Oqtane.Migrations.EntityBuilders;
 using Oqtane.Repository;
 
-namespace Oqtane.Migrations
+namespace Oqtane.Migrations.Tenant
 {
     [DbContext(typeof(TenantDBContext))]
     [Migration("Tenant.02.00.01.01")]