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

Updating schema result to account for foreign tables when determining the current schema.

Browse Source
This commit is contained in:
Morten Christensen
2013-02-05 08:41:10 -01:00
parent f64d4c9272
commit c828c6ede3
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseSchemaResult.cs
View File

@@ -42,8 +42,10 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
if(ValidTables.Count == 0)
return new Version(0, 0, 0);
//If Errors is empty then we're at current version
if (Errors.Any() == false)
//If Errors is empty or if TableDefinitions tables + columns correspond to valid tables + columns then we're at current version
if (Errors.Any() == false ||
TableDefinitions.Any(x => ValidTables.Contains(x.Name) == false) == false &&
TableDefinitions.SelectMany(definition => definition.Columns).Any(x => ValidColumns.Contains(x.Name) == false) == false)
return UmbracoVersion.Current;
//If Errors contains umbracoApp or umbracoAppTree its pre-6.0.0 -> new Version(4, 10, 0);
@@ -64,7 +66,7 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
return new Version(4, 9, 0);
}
return new Version(0, 0, 0);
return UmbracoVersion.Current;
}
/// <summary>