From 2bd5e908db7608859f1a41eeee2074fa1746dfe2 Mon Sep 17 00:00:00 2001 From: Shannon Date: Mon, 17 Mar 2014 14:01:42 +1100 Subject: [PATCH] Fixes merge issues --- src/Umbraco.Core/Persistence/Migrations/MigrationRunner.cs | 4 ++-- .../TargetVersionSeven/AddIndexToCmsMacroPropertyTable.cs | 2 +- .../Upgrades/TargetVersionSeven/AddIndexToCmsMacroTable.cs | 2 +- .../TargetVersionSeven/AddPropertyEditorAliasColumn.cs | 2 +- .../Upgrades/TargetVersionSeven/AlterCmsMacroPropertyTable.cs | 4 ++-- .../Upgrades/TargetVersionSeven/AlterTagRelationsTable.cs | 4 ++-- .../Migrations/Upgrades/TargetVersionSeven/AlterTagsTable.cs | 4 ++-- .../Migrations/Upgrades/TargetVersionSeven/AlterUserTable.cs | 4 ++-- .../Upgrades/TargetVersionSeven/DropControlIdColumn.cs | 4 ++-- .../TargetVersionSeven/RemoveCmsMacroPropertyTypeTable.cs | 4 ++-- .../UpdateControlIdToPropertyEditorAlias.cs | 4 ++-- .../Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs | 2 +- .../AssignMissingPrimaryForMySqlKeys.cs | 2 +- .../TargetVersionSixTwoZero/AdditionalIndexesAndKeys.cs | 2 +- .../AssignMissingPrimaryForMySqlKeys.cs | 2 +- .../Migrations/Stubs/AlterUserTableMigrationStub.cs | 2 +- 16 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/Umbraco.Core/Persistence/Migrations/MigrationRunner.cs b/src/Umbraco.Core/Persistence/Migrations/MigrationRunner.cs index 3ab415e455..cacfd87fbd 100644 --- a/src/Umbraco.Core/Persistence/Migrations/MigrationRunner.cs +++ b/src/Umbraco.Core/Persistence/Migrations/MigrationRunner.cs @@ -54,7 +54,7 @@ namespace Umbraco.Core.Persistence.Migrations : OrderedDowngradeMigrations(foundMigrations).ToList(); //SD: Why do we want this? - if (Migrating.IsRaisedEventCancelled(new MigrationEventArgs(migrations, _configuredVersion, _targetVersion, true), this)) + if (Migrating.IsRaisedEventCancelled(new MigrationEventArgs(migrations, _currentVersion, _targetVersion, true), this)) return false; //Loop through migrations to generate sql @@ -81,7 +81,7 @@ namespace Umbraco.Core.Persistence.Migrations throw; } - Migrated.RaiseEvent(new MigrationEventArgs(migrations, migrationContext, _configuredVersion, _targetVersion, false), this); + Migrated.RaiseEvent(new MigrationEventArgs(migrations, migrationContext, _currentVersion, _targetVersion, false), this); return true; } diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AddIndexToCmsMacroPropertyTable.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AddIndexToCmsMacroPropertyTable.cs index 6da9fa553c..4349cd2f13 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AddIndexToCmsMacroPropertyTable.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AddIndexToCmsMacroPropertyTable.cs @@ -10,7 +10,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven /// Creats a unique index across two columns so we cannot have duplicate property aliases for one macro /// [Migration("7.0.0", 5, GlobalSettings.UmbracoMigrationName)] - public class AddIndexToCmsMacroPropertyTable : SchemaMigration + public class AddIndexToCmsMacroPropertyTable : MigrationBase { public override void Up() { diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AddIndexToCmsMacroTable.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AddIndexToCmsMacroTable.cs index 20508ce3a1..746a0da3bc 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AddIndexToCmsMacroTable.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AddIndexToCmsMacroTable.cs @@ -10,7 +10,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven /// Creates a unique index on the macro alias so we cannot have duplicates by alias /// [Migration("7.0.0", 4, GlobalSettings.UmbracoMigrationName)] - public class AddIndexToCmsMacroTable : SchemaMigration + public class AddIndexToCmsMacroTable : MigrationBase { public override void Up() { diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AddPropertyEditorAliasColumn.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AddPropertyEditorAliasColumn.cs index dcaa8fdbfd..06fe7456d9 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AddPropertyEditorAliasColumn.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AddPropertyEditorAliasColumn.cs @@ -5,7 +5,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven { [Migration("7.0.0", 0, GlobalSettings.UmbracoMigrationName)] - public class AddPropertyEditorAliasColumn : SchemaMigration + public class AddPropertyEditorAliasColumn : MigrationBase { public override void Up() { diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterCmsMacroPropertyTable.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterCmsMacroPropertyTable.cs index 11cde4b7fc..93afeee7bb 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterCmsMacroPropertyTable.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterCmsMacroPropertyTable.cs @@ -10,7 +10,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven /// editorAlias column (and maintaing data so we can reference it) /// [Migration("7.0.0", 6, GlobalSettings.UmbracoMigrationName)] - public class AlterCmsMacroPropertyTable : SchemaMigration + public class AlterCmsMacroPropertyTable : MigrationBase { public override void Up() { @@ -52,7 +52,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven public override void Down() { - throw new CatastrophicDataLossException("Cannot downgrade from a version 7 database to a prior version, the database schema has already been modified"); + throw new DataLossException("Cannot downgrade from a version 7 database to a prior version, the database schema has already been modified"); } } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterTagRelationsTable.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterTagRelationsTable.cs index f4daa4f9fa..07c2a02475 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterTagRelationsTable.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterTagRelationsTable.cs @@ -10,7 +10,7 @@ using Umbraco.Core.Persistence.SqlSyntax; namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven { [Migration("7.0.0", 8, GlobalSettings.UmbracoMigrationName)] - public class AlterTagRelationsTable : SchemaMigration + public class AlterTagRelationsTable : MigrationBase { public override void Up() { @@ -133,7 +133,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven public override void Down() { - throw new CatastrophicDataLossException("Cannot downgrade from a version 7 database to a prior version, the database schema has already been modified"); + throw new DataLossException("Cannot downgrade from a version 7 database to a prior version, the database schema has already been modified"); } /// diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterTagsTable.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterTagsTable.cs index e909454df0..b52dd4baed 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterTagsTable.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterTagsTable.cs @@ -8,7 +8,7 @@ using Umbraco.Core.Persistence.SqlSyntax; namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven { [Migration("7.0.0", 9, GlobalSettings.UmbracoMigrationName)] - public class AlterTagsTable : SchemaMigration + public class AlterTagsTable : MigrationBase { public override void Up() { @@ -41,7 +41,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven public override void Down() { - throw new CatastrophicDataLossException("Cannot downgrade from a version 7 database to a prior version, the database schema has already been modified"); + throw new DataLossException("Cannot downgrade from a version 7 database to a prior version, the database schema has already been modified"); } } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterUserTable.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterUserTable.cs index 0e6f47b02e..a9b8e382d0 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterUserTable.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterUserTable.cs @@ -4,7 +4,7 @@ using Umbraco.Core.Configuration; namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven { [Migration("7.0.0", 3, GlobalSettings.UmbracoMigrationName)] - public class AlterUserTable : SchemaMigration + public class AlterUserTable : MigrationBase { public override void Up() { @@ -17,7 +17,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven public override void Down() { - throw new CatastrophicDataLossException("Cannot downgrade from a version 7 database to a prior version, the database schema has already been modified"); + throw new DataLossException("Cannot downgrade from a version 7 database to a prior version, the database schema has already been modified"); } } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/DropControlIdColumn.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/DropControlIdColumn.cs index 7292175d08..2148b0ccbc 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/DropControlIdColumn.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/DropControlIdColumn.cs @@ -4,7 +4,7 @@ using Umbraco.Core.Configuration; namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven { [Migration("7.0.0", 2, GlobalSettings.UmbracoMigrationName)] - public class DropControlIdColumn : SchemaMigration + public class DropControlIdColumn : MigrationBase { public override void Up() { @@ -15,7 +15,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven public override void Down() { - throw new CatastrophicDataLossException("Cannot downgrade from a version 7 database to a prior version, the database schema has already been modified"); + throw new DataLossException("Cannot downgrade from a version 7 database to a prior version, the database schema has already been modified"); } } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/RemoveCmsMacroPropertyTypeTable.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/RemoveCmsMacroPropertyTypeTable.cs index 4b499ffa29..9264fdc646 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/RemoveCmsMacroPropertyTypeTable.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/RemoveCmsMacroPropertyTypeTable.cs @@ -4,7 +4,7 @@ using Umbraco.Core.Configuration; namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven { [Migration("7.0.0", 7, GlobalSettings.UmbracoMigrationName)] - public class RemoveCmsMacroPropertyTypeTable : SchemaMigration + public class RemoveCmsMacroPropertyTypeTable : MigrationBase { public override void Up() { @@ -13,7 +13,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven public override void Down() { - throw new CatastrophicDataLossException("Cannot downgrade from a version 7 database to a prior version, the database schema has already been modified"); + throw new DataLossException("Cannot downgrade from a version 7 database to a prior version, the database schema has already been modified"); } } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateControlIdToPropertyEditorAlias.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateControlIdToPropertyEditorAlias.cs index c1d021c3ab..12ad0b4f34 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateControlIdToPropertyEditorAlias.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateControlIdToPropertyEditorAlias.cs @@ -8,7 +8,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven /// Updates the data in the changed propertyEditorAlias column after it has been changed by ChangeControlIdColumn /// [Migration("7.0.0", 1, GlobalSettings.UmbracoMigrationName)] - public class UpdateControlIdToPropertyEditorAlias : SchemaMigration + public class UpdateControlIdToPropertyEditorAlias : MigrationBase { public override void Up() { @@ -55,7 +55,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven public override void Down() { - throw new CatastrophicDataLossException("Cannot downgrade from a version 7 database to a prior version, the database schema has already been modified"); + throw new DataLossException("Cannot downgrade from a version 7 database to a prior version, the database schema has already been modified"); } } } \ No newline at end of file diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs index 4cdee61d3a..5d28cf9119 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs @@ -100,7 +100,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven public override void Down() { - throw new CatastrophicDataLossException("Cannot downgrade from a version 7 database to a prior version, the database schema has already been modified"); + throw new DataLossException("Cannot downgrade from a version 7 database to a prior version, the database schema has already been modified"); } } } diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenOneZero/AssignMissingPrimaryForMySqlKeys.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenOneZero/AssignMissingPrimaryForMySqlKeys.cs index 9d75e7a739..bb5bf56386 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenOneZero/AssignMissingPrimaryForMySqlKeys.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenOneZero/AssignMissingPrimaryForMySqlKeys.cs @@ -11,7 +11,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenOneZero // we will get exceptions because it is trying to create the PK two times. [Migration("7.0.0", "7.1.0", 0, GlobalSettings.UmbracoMigrationName)] - public class AssignMissingPrimaryForMySqlKeys : SchemaMigration + public class AssignMissingPrimaryForMySqlKeys : MigrationBase { public override void Up() { diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AdditionalIndexesAndKeys.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AdditionalIndexesAndKeys.cs index aac2db246a..446c35d3ad 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AdditionalIndexesAndKeys.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AdditionalIndexesAndKeys.cs @@ -9,7 +9,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSixTwoZero { [Migration("7.1.0", 1, GlobalSettings.UmbracoMigrationName)] [Migration("6.2.0", 1, GlobalSettings.UmbracoMigrationName)] - public class AdditionalIndexesAndKeys : SchemaMigration + public class AdditionalIndexesAndKeys : MigrationBase { public override void Up() { diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AssignMissingPrimaryForMySqlKeys.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AssignMissingPrimaryForMySqlKeys.cs index 2f8b4ffa54..a972b7eeb0 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AssignMissingPrimaryForMySqlKeys.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AssignMissingPrimaryForMySqlKeys.cs @@ -8,7 +8,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSixTwoZero //see: http://issues.umbraco.org/issue/U4-4430 [Migration("7.1.0", 0, GlobalSettings.UmbracoMigrationName)] [Migration("6.2.0", 0, GlobalSettings.UmbracoMigrationName)] - public class AssignMissingPrimaryForMySqlKeys : SchemaMigration + public class AssignMissingPrimaryForMySqlKeys : MigrationBase { public override void Up() { diff --git a/src/Umbraco.Tests/Migrations/Stubs/AlterUserTableMigrationStub.cs b/src/Umbraco.Tests/Migrations/Stubs/AlterUserTableMigrationStub.cs index f1b679faea..7312d2cc7e 100644 --- a/src/Umbraco.Tests/Migrations/Stubs/AlterUserTableMigrationStub.cs +++ b/src/Umbraco.Tests/Migrations/Stubs/AlterUserTableMigrationStub.cs @@ -20,7 +20,7 @@ namespace Umbraco.Tests.Migrations.Stubs [MigrationAttribute("6.0.0", 0, "Test")] - public class DropForeignKeyMigrationStub : SchemaMigration + public class DropForeignKeyMigrationStub : MigrationBase { public override void Up() {