yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes merge issues

Browse Source
This commit is contained in:
Shannon
2014-03-17 14:01:42 +11:00
parent 154652c896
commit 2bd5e908db
16 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Core/Persistence/Migrations/MigrationRunner.cs
View File

@@ -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;
}

2
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AddIndexToCmsMacroPropertyTable.cs
View File

@@ -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
/// </summary>
[Migration("7.0.0", 5, GlobalSettings.UmbracoMigrationName)]
public class AddIndexToCmsMacroPropertyTable : SchemaMigration
public class AddIndexToCmsMacroPropertyTable : MigrationBase
{
public override void Up()
{

2
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AddIndexToCmsMacroTable.cs
View File

@@ -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
/// </summary>
[Migration("7.0.0", 4, GlobalSettings.UmbracoMigrationName)]
public class AddIndexToCmsMacroTable : SchemaMigration
public class AddIndexToCmsMacroTable : MigrationBase
{
public override void Up()
{

2
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AddPropertyEditorAliasColumn.cs
View File

@@ -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()
{

4
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterCmsMacroPropertyTable.cs
View File

@@ -10,7 +10,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven
/// editorAlias column (and maintaing data so we can reference it)
/// </summary>
[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");
}
}
}

4
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterTagRelationsTable.cs
View File

@@ -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");
}
/// <summary>

4
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterTagsTable.cs
View File

@@ -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");
}
}
}

4
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterUserTable.cs
View File

@@ -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");
}
}
}

4
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/DropControlIdColumn.cs
View File

@@ -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");
}
}
}

4
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/RemoveCmsMacroPropertyTypeTable.cs
View File

@@ -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");
}
}
}

4
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateControlIdToPropertyEditorAlias.cs
View File

@@ -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
/// </summary>
[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");
}
}
}

2
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs
View File

@@ -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");
}
}
}

2
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenOneZero/AssignMissingPrimaryForMySqlKeys.cs
View File

@@ -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()
{

2
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AdditionalIndexesAndKeys.cs
View File

@@ -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()
{

2
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AssignMissingPrimaryForMySqlKeys.cs
View File

@@ -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()
{

2
src/Umbraco.Tests/Migrations/Stubs/AlterUserTableMigrationStub.cs
View File

@@ -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()
{