From 5117eaaf5cfb6f78dd6ba2d7b61b16cb50d22aa9 Mon Sep 17 00:00:00 2001 From: kayone Date: Sat, 30 Nov 2013 13:08:53 -0800 Subject: [PATCH] removed migrationcache --- .../Framework/MigrationController.cs | 52 ++++++++----------- 1 file changed, 21 insertions(+), 31 deletions(-) diff --git a/src/NzbDrone.Core/Datastore/Migration/Framework/MigrationController.cs b/src/NzbDrone.Core/Datastore/Migration/Framework/MigrationController.cs index a930511c3..b5aba8f91 100644 --- a/src/NzbDrone.Core/Datastore/Migration/Framework/MigrationController.cs +++ b/src/NzbDrone.Core/Datastore/Migration/Framework/MigrationController.cs @@ -1,5 +1,4 @@ -using System.Collections.Generic; -using System.Reflection; +using System.Reflection; using FluentMigrator.Runner; using FluentMigrator.Runner.Initialization; using FluentMigrator.Runner.Processors.Sqlite; @@ -17,8 +16,6 @@ namespace NzbDrone.Core.Datastore.Migration.Framework private readonly ISQLiteAlter _sqLiteAlter; private readonly ISqLiteMigrationHelper _migrationHelper; - private static readonly HashSet MigrationCache = new HashSet(); - public MigrationController(IAnnouncer announcer, ISQLiteAlter sqLiteAlter, ISqLiteMigrationHelper migrationHelper) { _announcer = announcer; @@ -28,33 +25,26 @@ namespace NzbDrone.Core.Datastore.Migration.Framework public void MigrateToLatest(string connectionString, MigrationType migrationType) { - lock (MigrationCache) - { - if (MigrationCache.Contains(connectionString.ToLower())) return; - - _announcer.Heading("Migrating " + connectionString); - - var assembly = Assembly.GetExecutingAssembly(); - - var migrationContext = new RunnerContext(_announcer) - { - Namespace = "NzbDrone.Core.Datastore.Migration", - ApplicationContext = new MigrationContext - { - MigrationType = migrationType, - SQLiteAlter = _sqLiteAlter, - MigrationHelper = _migrationHelper, - } - }; - - var options = new MigrationOptions { PreviewOnly = false, Timeout = 60 }; - var factory = new SqliteProcessorFactory(); - var processor = factory.Create(connectionString, _announcer, options); - var runner = new MigrationRunner(assembly, migrationContext, processor); - runner.MigrateUp(true); - - MigrationCache.Add(connectionString.ToLower()); - } + _announcer.Heading("Migrating " + connectionString); + + var assembly = Assembly.GetExecutingAssembly(); + + var migrationContext = new RunnerContext(_announcer) + { + Namespace = "NzbDrone.Core.Datastore.Migration", + ApplicationContext = new MigrationContext + { + MigrationType = migrationType, + SQLiteAlter = _sqLiteAlter, + MigrationHelper = _migrationHelper, + } + }; + + var options = new MigrationOptions { PreviewOnly = false, Timeout = 60 }; + var factory = new SqliteProcessorFactory(); + var processor = factory.Create(connectionString, _announcer, options); + var runner = new MigrationRunner(assembly, migrationContext, processor); + runner.MigrateUp(true); } } }