mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2026-01-18 19:51:45 +08:00
Renamed Data migration column name for SQL Server compatibility
--HG-- branch : dev
This commit is contained in:
@@ -267,7 +267,7 @@ features:
|
|||||||
|
|
||||||
_dataMigrationManager.Update("Feature1");
|
_dataMigrationManager.Update("Feature1");
|
||||||
Assert.That(_repository.Table.Count(), Is.EqualTo(1));
|
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"));
|
Assert.That(_repository.Table.First().DataMigrationClass, Is.EqualTo("Orchard.Tests.DataMigration.DataMigrationTests+DataMigration11Create"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -286,7 +286,7 @@ features:
|
|||||||
|
|
||||||
_dataMigrationManager.Update("Feature1");
|
_dataMigrationManager.Update("Feature1");
|
||||||
Assert.That(_repository.Table.Count(), Is.EqualTo(1));
|
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]
|
[Test]
|
||||||
@@ -302,13 +302,13 @@ features:
|
|||||||
Description: Feature
|
Description: Feature
|
||||||
");
|
");
|
||||||
_repository.Create(new DataMigrationRecord {
|
_repository.Create(new DataMigrationRecord {
|
||||||
Current = 42,
|
Version = 42,
|
||||||
DataMigrationClass = "Orchard.Tests.DataMigration.DataMigrationTests+DataMigrationSameMigrationClassCanEvolve"
|
DataMigrationClass = "Orchard.Tests.DataMigration.DataMigrationTests+DataMigrationSameMigrationClassCanEvolve"
|
||||||
});
|
});
|
||||||
|
|
||||||
_dataMigrationManager.Update("Feature1");
|
_dataMigrationManager.Update("Feature1");
|
||||||
Assert.That(_repository.Table.Count(), Is.EqualTo(1));
|
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]
|
[Test]
|
||||||
@@ -336,7 +336,7 @@ features:
|
|||||||
");
|
");
|
||||||
_dataMigrationManager.Update("Feature1");
|
_dataMigrationManager.Update("Feature1");
|
||||||
Assert.That(_repository.Table.Count(), Is.EqualTo(2));
|
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+DataMigrationDependenciesModule1").Count(), Is.EqualTo(1));
|
||||||
Assert.That(_repository.Fetch(d => d.DataMigrationClass == "Orchard.Tests.DataMigration.DataMigrationTests+DataMigrationDependenciesModule2").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
|
// there is an UpdateFrom42 method, so it should be fired if Current == 42
|
||||||
|
|
||||||
_repository.Create(new DataMigrationRecord {
|
_repository.Create(new DataMigrationRecord {
|
||||||
Current = 42,
|
Version = 42,
|
||||||
DataMigrationClass = "Orchard.Tests.DataMigration.DataMigrationTests+DataMigrationFeatureNeedUpdate3"
|
DataMigrationClass = "Orchard.Tests.DataMigration.DataMigrationTests+DataMigrationFeatureNeedUpdate3"
|
||||||
});
|
});
|
||||||
|
|
||||||
Assert.That(_dataMigrationManager.GetFeaturesThatNeedUpdate().Contains("Feature3"), Is.True);
|
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.Flush();
|
||||||
|
|
||||||
_repository.Create(new DataMigrationRecord {
|
_repository.Create(new DataMigrationRecord {
|
||||||
Current = 43,
|
Version = 43,
|
||||||
DataMigrationClass = "Orchard.Tests.DataMigration.DataMigrationTests+DataMigrationFeatureNeedUpdate3"
|
DataMigrationClass = "Orchard.Tests.DataMigration.DataMigrationTests+DataMigrationFeatureNeedUpdate3"
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -112,7 +112,7 @@ namespace Orchard.Setup.Services {
|
|||||||
schemaBuilder.CreateTable("Orchard_Framework_DataMigrationRecord", table => table
|
schemaBuilder.CreateTable("Orchard_Framework_DataMigrationRecord", table => table
|
||||||
.Column<int>("Id", column => column.PrimaryKey())
|
.Column<int>("Id", column => column.PrimaryKey())
|
||||||
.Column<string>("DataMigrationClass")
|
.Column<string>("DataMigrationClass")
|
||||||
.Column<int>("Current"));
|
.Column<int>("Version"));
|
||||||
|
|
||||||
var dataMigrationManager = environment.Resolve<IDataMigrationManager>();
|
var dataMigrationManager = environment.Resolve<IDataMigrationManager>();
|
||||||
dataMigrationManager.Update("Orchard.Framework");
|
dataMigrationManager.Update("Orchard.Framework");
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ namespace Orchard.Data.Migration {
|
|||||||
|
|
||||||
var current = 0;
|
var current = 0;
|
||||||
if (dataMigrationRecord != null) {
|
if (dataMigrationRecord != null) {
|
||||||
current = dataMigrationRecord.Current;
|
current = dataMigrationRecord.Version;
|
||||||
}
|
}
|
||||||
|
|
||||||
// do we need to call Create() ?
|
// do we need to call Create() ?
|
||||||
@@ -105,7 +105,7 @@ namespace Orchard.Data.Migration {
|
|||||||
|
|
||||||
var current = 0;
|
var current = 0;
|
||||||
if(dataMigrationRecord != null) {
|
if(dataMigrationRecord != null) {
|
||||||
current = dataMigrationRecord.Current;
|
current = dataMigrationRecord.Version;
|
||||||
}
|
}
|
||||||
|
|
||||||
// do we need to call Create() ?
|
// do we need to call Create() ?
|
||||||
@@ -136,10 +136,10 @@ namespace Orchard.Data.Migration {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (dataMigrationRecord == null) {
|
if (dataMigrationRecord == null) {
|
||||||
_dataMigrationRepository.Create(new DataMigrationRecord {Current = current, DataMigrationClass = migration.GetType().FullName});
|
_dataMigrationRepository.Create(new DataMigrationRecord {Version = current, DataMigrationClass = migration.GetType().FullName});
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
dataMigrationRecord.Current = current;
|
dataMigrationRecord.Version = current;
|
||||||
_dataMigrationRepository.Update(dataMigrationRecord);
|
_dataMigrationRepository.Update(dataMigrationRecord);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,6 @@
|
|||||||
public class DataMigrationRecord {
|
public class DataMigrationRecord {
|
||||||
public virtual int Id { get; set; }
|
public virtual int Id { get; set; }
|
||||||
public virtual string DataMigrationClass { get; set; }
|
public virtual string DataMigrationClass { get; set; }
|
||||||
public virtual int Current { get; set; }
|
public virtual int Version { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user