lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-19 01:57:55 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Don't recreate tables if an error occured during the second phase setup (homepage creation)

Browse Source 
--HG--
branch : dev
This commit is contained in:
Sebastien Ros
2010-07-19 13:27:16 -07:00
parent 3bf8517cb2
commit 5fee44ffb3
1 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
View File

@@ -8,6 +8,7 @@ using Orchard.Core.Common.Models;
using Orchard.Core.Common.Settings; using Orchard.Core.Common.Settings;
using Orchard.Core.Navigation.Models; using Orchard.Core.Navigation.Models;
using Orchard.Core.Routable.Models; using Orchard.Core.Routable.Models;
using Orchard.Core.Settings.Descriptor.Records;
using Orchard.Core.Settings.Models; using Orchard.Core.Settings.Models;
using Orchard.Data; using Orchard.Data;
using Orchard.Data.Migration.Interpreters; using Orchard.Data.Migration.Interpreters;
@@ -108,28 +109,36 @@ namespace Orchard.Setup.Services {
// initialize database explicitly, and store shell descriptor // initialize database explicitly, and store shell descriptor
var bootstrapLifetimeScope = _shellContainerFactory.CreateContainer(shellSettings, shellToplogy); var bootstrapLifetimeScope = _shellContainerFactory.CreateContainer(shellSettings, shellToplogy);
using (var environment = new StandaloneEnvironment(bootstrapLifetimeScope)) { using ( var environment = new StandaloneEnvironment(bootstrapLifetimeScope) ) {
var schemaBuilder = new SchemaBuilder(environment.Resolve<IDataMigrationInterpreter>() ); // check if the database is already created (in case an exception occured in the second phase)
var reportsCoordinator = environment.Resolve<IReportsCoordinator>(); var shellDescriptorRepository = environment.Resolve<IRepository<ShellDescriptorRecord>>();
try {
shellDescriptorRepository.Get(x => true);
}
catch {
var schemaBuilder = new SchemaBuilder(environment.Resolve<IDataMigrationInterpreter>());
var reportsCoordinator = environment.Resolve<IReportsCoordinator>();
reportsCoordinator.Register("Data Migration", "Setup", "Orchard installation"); reportsCoordinator.Register("Data Migration", "Setup", "Orchard installation");
schemaBuilder.CreateTable("Orchard_Framework_DataMigrationRecord", table => table schemaBuilder.CreateTable("Orchard_Framework_DataMigrationRecord",
.Column<int>("Id", column => column.PrimaryKey().Identity()) table => table
.Column<string>("DataMigrationClass") .Column<int>("Id", column => column.PrimaryKey().Identity())
.Column<int>("Version")); .Column<string>("DataMigrationClass")
.Column<int>("Version"));
var dataMigrationManager = environment.Resolve<IDataMigrationManager>(); var dataMigrationManager = environment.Resolve<IDataMigrationManager>();
foreach ( var feature in context.EnabledFeatures ) { foreach ( var feature in context.EnabledFeatures ) {
dataMigrationManager.Update(feature); dataMigrationManager.Update(feature);
} }
environment.Resolve<IShellDescriptorManager>().UpdateShellDescriptor( environment.Resolve<IShellDescriptorManager>().UpdateShellDescriptor(
0, 0,
shellDescriptor.Features, shellDescriptor.Features,
shellDescriptor.Parameters); shellDescriptor.Parameters);
}
} }
// in effect "pump messages" see PostMessage circa 1980 // in effect "pump messages" see PostMessage circa 1980