refactored Migrations

NzbDrone.Core/CentralDispatch.cs

@@ -56,7 +56,7 @@ namespace NzbDrone.Core
 
             LogConfiguration.Setup();
 
-            Migrations.Run();
+            Migrations.Run(Connection.MainConnectionString);
             ForceMigration(_kernel.Get<IRepository>());
 
             SetupDefaultQualityProfiles(_kernel.Get<IRepository>()); //Setup the default QualityProfiles on start-up
@@ -97,9 +97,9 @@ namespace NzbDrone.Core
                 _kernel.Bind<WebTimer>().ToSelf().InSingletonScope();
                 _kernel.Bind<AutoConfigureProvider>().ToSelf().InSingletonScope();
 
-                _kernel.Bind<IRepository>().ToConstant(Connection.MainDataRepository).InSingletonScope();
-                _kernel.Bind<IRepository>().ToConstant(Connection.LogDataRepository).WhenInjectedInto<SubsonicTarget>().InSingletonScope();
-                _kernel.Bind<IRepository>().ToConstant(Connection.LogDataRepository).WhenInjectedInto<LogProvider>().InSingletonScope();
+                _kernel.Bind<IRepository>().ToConstant(Connection.CreateSimpleRepository(Connection.MainConnectionString)).InSingletonScope();
+                _kernel.Bind<IRepository>().ToConstant(Connection.CreateSimpleRepository(Connection.LogConnectionString)).WhenInjectedInto<SubsonicTarget>().InSingletonScope();
+                _kernel.Bind<IRepository>().ToConstant(Connection.CreateSimpleRepository(Connection.LogConnectionString)).WhenInjectedInto<LogProvider>().InSingletonScope();
             }
         }
 

NzbDrone.Core/Datastore/Connection.cs

@@ -18,82 +18,36 @@ namespace NzbDrone.Core.Datastore
         }
 
 
-        public static String MainConnectionString
-        {
-            get
-            {
-                return String.Format("Data Source={0};Version=3;", Path.Combine(AppDataPath.FullName, "nzbdrone.db"));
-            }
-        }
-
-        public static String LogConnectionString
-        {
-            get
+        public static string GetConnectionString(string path)
         {
-                return String.Format("Data Source={0};Version=3;", Path.Combine(AppDataPath.FullName, "log.db"));
-            }
+            return String.Format("Data Source={0};Version=3;", path);
         }
 
-
-        private static IDataProvider _mainDataProvider;
-        public static IDataProvider MainDataProvider
+        public static String MainConnectionString
         {
             get
             {
-                if (_mainDataProvider == null)
-                {
-                    _mainDataProvider = ProviderFactory.GetProvider(Connection.MainConnectionString, "System.Data.SQLite");
+                return GetConnectionString(Path.Combine(AppDataPath.FullName, "nzbdrone.db"));
             }
-                return _mainDataProvider;
         }
 
-        }
-
-        private static IDataProvider _logDataProvider;
-        public static IDataProvider LogDataProvider
+        public static String LogConnectionString
         {
             get
             {
-                if (_logDataProvider == null)
-                {
-                    _logDataProvider = ProviderFactory.GetProvider(Connection.LogConnectionString, "System.Data.SQLite");
+                return GetConnectionString(Path.Combine(AppDataPath.FullName, "log.db"));
             }
-                return _logDataProvider;
         }
 
-        }
-
-
-        private static SimpleRepository _mainDataRepository;
-        public static SimpleRepository MainDataRepository
-        {
-            get
+        public static IDataProvider GetDataProvider(string connectionString)
         {
-                if (_mainDataRepository == null)
-                {
-                    _mainDataRepository = new SimpleRepository(MainDataProvider, SimpleRepositoryOptions.RunMigrations);
-                }
-
-                return _mainDataRepository;
-            }
-
+            return ProviderFactory.GetProvider(connectionString, "System.Data.SQLite");
         }
 
-        private static SimpleRepository _logDataRepository;
-        public static SimpleRepository LogDataRepository
-        {
-            get
+        public static IRepository CreateSimpleRepository(string connectionString)
         {
-                if (_logDataRepository == null)
-                {
-                    _logDataRepository = new SimpleRepository(LogDataProvider, SimpleRepositoryOptions.RunMigrations);
-                }
-                return _logDataRepository;
+            return new SimpleRepository(GetDataProvider(connectionString), SimpleRepositoryOptions.RunMigrations);
         }
 
     }
-
-
-
-    }
 }

NzbDrone.Core/Datastore/Migrations.cs

@@ -16,16 +16,16 @@ namespace NzbDrone.Core.Datastore
     {
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
-        public static void Run()
+        public static void Run(string connetionString)
         {
-            Logger.Info("Preparing to migrate databse");
+            Logger.Info("Preparing run database migration");
 
             try
             {
-                var mig = new Migrator.Migrator("Sqlite", Connection.MainConnectionString,
+                var migrator = new Migrator.Migrator("Sqlite", connetionString,
                                                       Assembly.GetAssembly(typeof(Migrations)), true, new MigrationLogger());
 
-                mig.MigrateToLastVersion();
+                migrator.MigrateToLastVersion();
 
                 Logger.Info("Database migration completed");
             }
@@ -110,11 +110,8 @@ namespace NzbDrone.Core.Datastore
     public class Migration20110603 : Migration
     {
         public override void Up()
-        {
-            if(Database.TableExists("Seasons"))
         {
             Database.RemoveTable("Seasons");
-            }
 
             Migrations.RemoveDeletedColumns(Database);
             Migrations.AddNewColumns(Database);

NzbDrone.Core/Datastore/RepositoryProvider.cs

@@ -26,7 +26,7 @@ namespace NzbDrone.Core.Datastore
 
         public virtual ITable GetSchemaFromType(Type type)
         {
-            return type.ToSchemaTable(Connection.MainDataProvider);
+            return type.ToSchemaTable(Connection.GetDataProvider(Connection.MainConnectionString));
         }
 
         public virtual Column[] GetColumnsFromDatabase(ITransformationProvider database, string tableName)