From 077b866e8c8e2c0ee7be2c4aed1cd911bab77a52 Mon Sep 17 00:00:00 2001 From: Charles Nurse Date: Tue, 25 May 2021 12:16:10 -0700 Subject: [PATCH] Move Migrations into Master and Tenant folders so its clear what type of Migration is being applied --- .../Migrations/{ => Master}/01000000_InitializeMaster.cs | 6 ++---- .../{ => Master}/01000100_AddAdditionalIndexesInMaster.cs | 6 ++---- .../02010000_AddIndexesForForeignKeyInMaster.cs | 4 +--- .../{ => Master}/02010001_AddDatabaseTypeColumnToTenant.cs | 4 +--- .../Migrations/{ => Tenant}/01000000_InitializeTenant.cs | 5 +---- .../{ => Tenant}/01000100_AddAdditionalIndexesInTenant.cs | 4 +--- .../01000101_AddAdditionColumnToNotifications.cs | 4 +--- .../Migrations/{ => Tenant}/01000201_DropColumnFromPage.cs | 4 +--- .../02000001_AddColumnToProfileAndUpdatePage.cs | 4 +--- .../{ => Tenant}/02000101_UpdateIconColumnInPage.cs | 4 +--- .../Migrations/{ => Tenant}/02000102_AddLanguageTable.cs | 4 +--- .../{ => Tenant}/02000103_UpdatePageAndAddColumnToSite.cs | 4 +--- .../Migrations/{ => Tenant}/02000201_AddSiteGuidToSite.cs | 4 +--- .../02000202_UpdateDefaultContainerTypeInSitePage.cs | 4 +--- .../{ => Tenant}/02000203_DropDefaultLayoutInSite.cs | 4 +--- .../{ => Tenant}/02010000_AddAppVersionsTableInTenant.cs | 4 +--- .../02010001_ChangeFolderNameAndPathColumnsSize.cs} | 5 ++--- 17 files changed, 20 insertions(+), 54 deletions(-) rename Oqtane.Server/Migrations/{ => Master}/01000000_InitializeMaster.cs (94%) rename Oqtane.Server/Migrations/{ => Master}/01000100_AddAdditionalIndexesInMaster.cs (93%) rename Oqtane.Server/Migrations/{ => Master}/02010000_AddIndexesForForeignKeyInMaster.cs (94%) rename Oqtane.Server/Migrations/{ => Master}/02010001_AddDatabaseTypeColumnToTenant.cs (92%) rename Oqtane.Server/Migrations/{ => Tenant}/01000000_InitializeTenant.cs (98%) rename Oqtane.Server/Migrations/{ => Tenant}/01000100_AddAdditionalIndexesInTenant.cs (97%) rename Oqtane.Server/Migrations/{ => Tenant}/01000101_AddAdditionColumnToNotifications.cs (93%) rename Oqtane.Server/Migrations/{ => Tenant}/01000201_DropColumnFromPage.cs (92%) rename Oqtane.Server/Migrations/{ => Tenant}/02000001_AddColumnToProfileAndUpdatePage.cs (95%) rename Oqtane.Server/Migrations/{ => Tenant}/02000101_UpdateIconColumnInPage.cs (91%) rename Oqtane.Server/Migrations/{ => Tenant}/02000102_AddLanguageTable.cs (91%) rename Oqtane.Server/Migrations/{ => Tenant}/02000103_UpdatePageAndAddColumnToSite.cs (94%) rename Oqtane.Server/Migrations/{ => Tenant}/02000201_AddSiteGuidToSite.cs (92%) rename Oqtane.Server/Migrations/{ => Tenant}/02000202_UpdateDefaultContainerTypeInSitePage.cs (96%) rename Oqtane.Server/Migrations/{ => Tenant}/02000203_DropDefaultLayoutInSite.cs (97%) rename Oqtane.Server/Migrations/{ => Tenant}/02010000_AddAppVersionsTableInTenant.cs (97%) rename Oqtane.Server/Migrations/{02010002_ChangeFolderNameAndPathColumnsSize.cs => Tenant/02010001_ChangeFolderNameAndPathColumnsSize.cs} (94%) diff --git a/Oqtane.Server/Migrations/01000000_InitializeMaster.cs b/Oqtane.Server/Migrations/Master/01000000_InitializeMaster.cs similarity index 94% rename from Oqtane.Server/Migrations/01000000_InitializeMaster.cs rename to Oqtane.Server/Migrations/Master/01000000_InitializeMaster.cs index 8fe875fa..dea17336 100644 --- a/Oqtane.Server/Migrations/01000000_InitializeMaster.cs +++ b/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")] diff --git a/Oqtane.Server/Migrations/01000100_AddAdditionalIndexesInMaster.cs b/Oqtane.Server/Migrations/Master/01000100_AddAdditionalIndexesInMaster.cs similarity index 93% rename from Oqtane.Server/Migrations/01000100_AddAdditionalIndexesInMaster.cs rename to Oqtane.Server/Migrations/Master/01000100_AddAdditionalIndexesInMaster.cs index c45c12ea..42330d05 100644 --- a/Oqtane.Server/Migrations/01000100_AddAdditionalIndexesInMaster.cs +++ b/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")] diff --git a/Oqtane.Server/Migrations/02010000_AddIndexesForForeignKeyInMaster.cs b/Oqtane.Server/Migrations/Master/02010000_AddIndexesForForeignKeyInMaster.cs similarity index 94% rename from Oqtane.Server/Migrations/02010000_AddIndexesForForeignKeyInMaster.cs rename to Oqtane.Server/Migrations/Master/02010000_AddIndexesForForeignKeyInMaster.cs index 2d44dc63..fa2444c7 100644 --- a/Oqtane.Server/Migrations/02010000_AddIndexesForForeignKeyInMaster.cs +++ b/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")] diff --git a/Oqtane.Server/Migrations/02010001_AddDatabaseTypeColumnToTenant.cs b/Oqtane.Server/Migrations/Master/02010001_AddDatabaseTypeColumnToTenant.cs similarity index 92% rename from Oqtane.Server/Migrations/02010001_AddDatabaseTypeColumnToTenant.cs rename to Oqtane.Server/Migrations/Master/02010001_AddDatabaseTypeColumnToTenant.cs index 32d84b49..c5a54e5f 100644 --- a/Oqtane.Server/Migrations/02010001_AddDatabaseTypeColumnToTenant.cs +++ b/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")] diff --git a/Oqtane.Server/Migrations/01000000_InitializeTenant.cs b/Oqtane.Server/Migrations/Tenant/01000000_InitializeTenant.cs similarity index 98% rename from Oqtane.Server/Migrations/01000000_InitializeTenant.cs rename to Oqtane.Server/Migrations/Tenant/01000000_InitializeTenant.cs index 03fe36a1..38a348b2 100644 --- a/Oqtane.Server/Migrations/01000000_InitializeTenant.cs +++ b/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")] diff --git a/Oqtane.Server/Migrations/01000100_AddAdditionalIndexesInTenant.cs b/Oqtane.Server/Migrations/Tenant/01000100_AddAdditionalIndexesInTenant.cs similarity index 97% rename from Oqtane.Server/Migrations/01000100_AddAdditionalIndexesInTenant.cs rename to Oqtane.Server/Migrations/Tenant/01000100_AddAdditionalIndexesInTenant.cs index 7ee12264..651159d0 100644 --- a/Oqtane.Server/Migrations/01000100_AddAdditionalIndexesInTenant.cs +++ b/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")] diff --git a/Oqtane.Server/Migrations/01000101_AddAdditionColumnToNotifications.cs b/Oqtane.Server/Migrations/Tenant/01000101_AddAdditionColumnToNotifications.cs similarity index 93% rename from Oqtane.Server/Migrations/01000101_AddAdditionColumnToNotifications.cs rename to Oqtane.Server/Migrations/Tenant/01000101_AddAdditionColumnToNotifications.cs index 961148df..96c56e67 100644 --- a/Oqtane.Server/Migrations/01000101_AddAdditionColumnToNotifications.cs +++ b/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")] diff --git a/Oqtane.Server/Migrations/01000201_DropColumnFromPage.cs b/Oqtane.Server/Migrations/Tenant/01000201_DropColumnFromPage.cs similarity index 92% rename from Oqtane.Server/Migrations/01000201_DropColumnFromPage.cs rename to Oqtane.Server/Migrations/Tenant/01000201_DropColumnFromPage.cs index 5c6ad70d..6f0b001d 100644 --- a/Oqtane.Server/Migrations/01000201_DropColumnFromPage.cs +++ b/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")] diff --git a/Oqtane.Server/Migrations/02000001_AddColumnToProfileAndUpdatePage.cs b/Oqtane.Server/Migrations/Tenant/02000001_AddColumnToProfileAndUpdatePage.cs similarity index 95% rename from Oqtane.Server/Migrations/02000001_AddColumnToProfileAndUpdatePage.cs rename to Oqtane.Server/Migrations/Tenant/02000001_AddColumnToProfileAndUpdatePage.cs index 98a303c6..af2c0166 100644 --- a/Oqtane.Server/Migrations/02000001_AddColumnToProfileAndUpdatePage.cs +++ b/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")] diff --git a/Oqtane.Server/Migrations/02000101_UpdateIconColumnInPage.cs b/Oqtane.Server/Migrations/Tenant/02000101_UpdateIconColumnInPage.cs similarity index 91% rename from Oqtane.Server/Migrations/02000101_UpdateIconColumnInPage.cs rename to Oqtane.Server/Migrations/Tenant/02000101_UpdateIconColumnInPage.cs index ea553b2d..1edbadcc 100644 --- a/Oqtane.Server/Migrations/02000101_UpdateIconColumnInPage.cs +++ b/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")] diff --git a/Oqtane.Server/Migrations/02000102_AddLanguageTable.cs b/Oqtane.Server/Migrations/Tenant/02000102_AddLanguageTable.cs similarity index 91% rename from Oqtane.Server/Migrations/02000102_AddLanguageTable.cs rename to Oqtane.Server/Migrations/Tenant/02000102_AddLanguageTable.cs index 690f41d8..c980cc0c 100644 --- a/Oqtane.Server/Migrations/02000102_AddLanguageTable.cs +++ b/Oqtane.Server/Migrations/Tenant/02000102_AddLanguageTable.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.02")] diff --git a/Oqtane.Server/Migrations/02000103_UpdatePageAndAddColumnToSite.cs b/Oqtane.Server/Migrations/Tenant/02000103_UpdatePageAndAddColumnToSite.cs similarity index 94% rename from Oqtane.Server/Migrations/02000103_UpdatePageAndAddColumnToSite.cs rename to Oqtane.Server/Migrations/Tenant/02000103_UpdatePageAndAddColumnToSite.cs index 8921553f..753a747e 100644 --- a/Oqtane.Server/Migrations/02000103_UpdatePageAndAddColumnToSite.cs +++ b/Oqtane.Server/Migrations/Tenant/02000103_UpdatePageAndAddColumnToSite.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.03")] diff --git a/Oqtane.Server/Migrations/02000201_AddSiteGuidToSite.cs b/Oqtane.Server/Migrations/Tenant/02000201_AddSiteGuidToSite.cs similarity index 92% rename from Oqtane.Server/Migrations/02000201_AddSiteGuidToSite.cs rename to Oqtane.Server/Migrations/Tenant/02000201_AddSiteGuidToSite.cs index 24f1e429..2dab72c4 100644 --- a/Oqtane.Server/Migrations/02000201_AddSiteGuidToSite.cs +++ b/Oqtane.Server/Migrations/Tenant/02000201_AddSiteGuidToSite.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.02.01")] diff --git a/Oqtane.Server/Migrations/02000202_UpdateDefaultContainerTypeInSitePage.cs b/Oqtane.Server/Migrations/Tenant/02000202_UpdateDefaultContainerTypeInSitePage.cs similarity index 96% rename from Oqtane.Server/Migrations/02000202_UpdateDefaultContainerTypeInSitePage.cs rename to Oqtane.Server/Migrations/Tenant/02000202_UpdateDefaultContainerTypeInSitePage.cs index 66365954..ddf30943 100644 --- a/Oqtane.Server/Migrations/02000202_UpdateDefaultContainerTypeInSitePage.cs +++ b/Oqtane.Server/Migrations/Tenant/02000202_UpdateDefaultContainerTypeInSitePage.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.02.02")] diff --git a/Oqtane.Server/Migrations/02000203_DropDefaultLayoutInSite.cs b/Oqtane.Server/Migrations/Tenant/02000203_DropDefaultLayoutInSite.cs similarity index 97% rename from Oqtane.Server/Migrations/02000203_DropDefaultLayoutInSite.cs rename to Oqtane.Server/Migrations/Tenant/02000203_DropDefaultLayoutInSite.cs index 27424547..068c938c 100644 --- a/Oqtane.Server/Migrations/02000203_DropDefaultLayoutInSite.cs +++ b/Oqtane.Server/Migrations/Tenant/02000203_DropDefaultLayoutInSite.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.02.03")] diff --git a/Oqtane.Server/Migrations/02010000_AddAppVersionsTableInTenant.cs b/Oqtane.Server/Migrations/Tenant/02010000_AddAppVersionsTableInTenant.cs similarity index 97% rename from Oqtane.Server/Migrations/02010000_AddAppVersionsTableInTenant.cs rename to Oqtane.Server/Migrations/Tenant/02010000_AddAppVersionsTableInTenant.cs index 7b5f8148..dd787eee 100644 --- a/Oqtane.Server/Migrations/02010000_AddAppVersionsTableInTenant.cs +++ b/Oqtane.Server/Migrations/Tenant/02010000_AddAppVersionsTableInTenant.cs @@ -1,13 +1,11 @@ using System; -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.01.00.00")] diff --git a/Oqtane.Server/Migrations/02010002_ChangeFolderNameAndPathColumnsSize.cs b/Oqtane.Server/Migrations/Tenant/02010001_ChangeFolderNameAndPathColumnsSize.cs similarity index 94% rename from Oqtane.Server/Migrations/02010002_ChangeFolderNameAndPathColumnsSize.cs rename to Oqtane.Server/Migrations/Tenant/02010001_ChangeFolderNameAndPathColumnsSize.cs index b20d9cba..d409154c 100644 --- a/Oqtane.Server/Migrations/02010002_ChangeFolderNameAndPathColumnsSize.cs +++ b/Oqtane.Server/Migrations/Tenant/02010001_ChangeFolderNameAndPathColumnsSize.cs @@ -1,14 +1,13 @@ 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.01.00.02")] + [Migration("Tenant.02.01.00.01")] public class ChangeFolderNameAndPathColumnsSize : MultiDatabaseMigration { public ChangeFolderNameAndPathColumnsSize(IDatabase database) : base(database)