From 93038668b726b1b859d168fff39401ed238ef323 Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Fri, 23 Sep 2011 19:43:35 -0700 Subject: [PATCH] #18116, #18082: Fixing Version column mapping The Version column is auto-mapped as a Versioning value. FLuent has a bug which prevents from altering this mapping. The simples solution is to change the type to int?. --HG-- branch : 1.x --- src/Orchard/Data/Migration/DataMigrationManager.cs | 4 ++-- src/Orchard/Data/Migration/Records/DataMigrationRecord.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Orchard/Data/Migration/DataMigrationManager.cs b/src/Orchard/Data/Migration/DataMigrationManager.cs index dc76d400c..a850594a8 100644 --- a/src/Orchard/Data/Migration/DataMigrationManager.cs +++ b/src/Orchard/Data/Migration/DataMigrationManager.cs @@ -44,7 +44,7 @@ namespace Orchard.Data.Migration { var outOfDateMigrations = _dataMigrations.Where(dataMigration => { DataMigrationRecord record; if (currentVersions.TryGetValue(dataMigration.GetType().FullName, out record)) - return CreateUpgradeLookupTable(dataMigration).ContainsKey(record.Version); + return CreateUpgradeLookupTable(dataMigration).ContainsKey(record.Version.Value); return (GetCreateMethod(dataMigration) != null); }); @@ -84,7 +84,7 @@ namespace Orchard.Data.Migration { var current = 0; if(dataMigrationRecord != null) { - current = dataMigrationRecord.Version; + current = dataMigrationRecord.Version.Value; } // do we need to call Create() ? diff --git a/src/Orchard/Data/Migration/Records/DataMigrationRecord.cs b/src/Orchard/Data/Migration/Records/DataMigrationRecord.cs index 40c7ca372..3d1be309f 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 Version { get; set; } + public virtual int? Version { get; set; } } } \ No newline at end of file