From 199c462d4d574a65bc753fc8df16d5aa9131c8a8 Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Thu, 8 Jul 2010 11:35:34 -0700 Subject: [PATCH] Renamed Data migration column name for SQL Server compatibility --HG-- branch : dev --- .../DataMigration/DataMigrationTests.cs | 16 ++++++++-------- .../Orchard.Setup/Services/SetupService.cs | 2 +- .../Data/Migration/DataMigrationManager.cs | 8 ++++---- .../Migration/Records/DataMigrationRecord.cs | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Orchard.Tests/DataMigration/DataMigrationTests.cs b/src/Orchard.Tests/DataMigration/DataMigrationTests.cs index 53b69a822..dfef89ca1 100644 --- a/src/Orchard.Tests/DataMigration/DataMigrationTests.cs +++ b/src/Orchard.Tests/DataMigration/DataMigrationTests.cs @@ -267,7 +267,7 @@ features: _dataMigrationManager.Update("Feature1"); Assert.That(_repository.Table.Count(), Is.EqualTo(1)); - Assert.That(_repository.Table.First().Current, Is.EqualTo(999)); + Assert.That(_repository.Table.First().Version, Is.EqualTo(999)); Assert.That(_repository.Table.First().DataMigrationClass, Is.EqualTo("Orchard.Tests.DataMigration.DataMigrationTests+DataMigration11Create")); } @@ -286,7 +286,7 @@ features: _dataMigrationManager.Update("Feature1"); Assert.That(_repository.Table.Count(), Is.EqualTo(1)); - Assert.That(_repository.Table.First().Current, Is.EqualTo(666)); + Assert.That(_repository.Table.First().Version, Is.EqualTo(666)); } [Test] @@ -302,13 +302,13 @@ features: Description: Feature "); _repository.Create(new DataMigrationRecord { - Current = 42, + Version = 42, DataMigrationClass = "Orchard.Tests.DataMigration.DataMigrationTests+DataMigrationSameMigrationClassCanEvolve" }); _dataMigrationManager.Update("Feature1"); Assert.That(_repository.Table.Count(), Is.EqualTo(1)); - Assert.That(_repository.Table.First().Current, Is.EqualTo(999)); + Assert.That(_repository.Table.First().Version, Is.EqualTo(999)); } [Test] @@ -336,7 +336,7 @@ features: "); _dataMigrationManager.Update("Feature1"); Assert.That(_repository.Table.Count(), Is.EqualTo(2)); - Assert.That(_repository.Fetch(d => d.Current == 999).Count(), Is.EqualTo(2)); + Assert.That(_repository.Fetch(d => d.Version == 999).Count(), Is.EqualTo(2)); Assert.That(_repository.Fetch(d => d.DataMigrationClass == "Orchard.Tests.DataMigration.DataMigrationTests+DataMigrationDependenciesModule1").Count(), Is.EqualTo(1)); Assert.That(_repository.Fetch(d => d.DataMigrationClass == "Orchard.Tests.DataMigration.DataMigrationTests+DataMigrationDependenciesModule2").Count(), Is.EqualTo(1)); } @@ -390,17 +390,17 @@ features: // there is an UpdateFrom42 method, so it should be fired if Current == 42 _repository.Create(new DataMigrationRecord { - Current = 42, + Version = 42, DataMigrationClass = "Orchard.Tests.DataMigration.DataMigrationTests+DataMigrationFeatureNeedUpdate3" }); Assert.That(_dataMigrationManager.GetFeaturesThatNeedUpdate().Contains("Feature3"), Is.True); - _repository.Delete(_repository.Fetch(m => m.Current == 42).First()); + _repository.Delete(_repository.Fetch(m => m.Version == 42).First()); _repository.Flush(); _repository.Create(new DataMigrationRecord { - Current = 43, + Version = 43, DataMigrationClass = "Orchard.Tests.DataMigration.DataMigrationTests+DataMigrationFeatureNeedUpdate3" }); diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs index b4c7569f8..9273479e7 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs +++ b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs @@ -112,7 +112,7 @@ namespace Orchard.Setup.Services { schemaBuilder.CreateTable("Orchard_Framework_DataMigrationRecord", table => table .Column("Id", column => column.PrimaryKey()) .Column("DataMigrationClass") - .Column("Current")); + .Column("Version")); var dataMigrationManager = environment.Resolve(); dataMigrationManager.Update("Orchard.Framework"); diff --git a/src/Orchard/Data/Migration/DataMigrationManager.cs b/src/Orchard/Data/Migration/DataMigrationManager.cs index e4f7bf2c3..0cff7912a 100644 --- a/src/Orchard/Data/Migration/DataMigrationManager.cs +++ b/src/Orchard/Data/Migration/DataMigrationManager.cs @@ -48,7 +48,7 @@ namespace Orchard.Data.Migration { var current = 0; if (dataMigrationRecord != null) { - current = dataMigrationRecord.Current; + current = dataMigrationRecord.Version; } // do we need to call Create() ? @@ -105,7 +105,7 @@ namespace Orchard.Data.Migration { var current = 0; if(dataMigrationRecord != null) { - current = dataMigrationRecord.Current; + current = dataMigrationRecord.Version; } // do we need to call Create() ? @@ -136,10 +136,10 @@ namespace Orchard.Data.Migration { continue; } if (dataMigrationRecord == null) { - _dataMigrationRepository.Create(new DataMigrationRecord {Current = current, DataMigrationClass = migration.GetType().FullName}); + _dataMigrationRepository.Create(new DataMigrationRecord {Version = current, DataMigrationClass = migration.GetType().FullName}); } else { - dataMigrationRecord.Current = current; + dataMigrationRecord.Version = current; _dataMigrationRepository.Update(dataMigrationRecord); } } diff --git a/src/Orchard/Data/Migration/Records/DataMigrationRecord.cs b/src/Orchard/Data/Migration/Records/DataMigrationRecord.cs index 2635e8cd5..40c7ca372 100644 --- a/src/Orchard/Data/Migration/Records/DataMigrationRecord.cs +++ b/src/Orchard/Data/Migration/Records/DataMigrationRecord.cs @@ -2,6 +2,6 @@ public class DataMigrationRecord { public virtual int Id { get; set; } public virtual string DataMigrationClass { get; set; } - public virtual int Current { get; set; } + public virtual int Version { get; set; } } } \ No newline at end of file