Merge pull request #38 from msallin/Issue_22

Partially fix for Issue 22

Author: msallin

SQLite.CodeFirst.Console/FootballDbContext.cs

@@ -22,7 +22,7 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)
 
             modelBuilder.Conventions.Remove<PluralizingTableNameConvention>();
 
-            var initializer = new FootballDbInitializer(Database.Connection.ConnectionString, modelBuilder);
+            var initializer = new FootballDbInitializer(modelBuilder);
             Database.SetInitializer(initializer);
         }
 
@@ -47,8 +47,8 @@ private static void ConfigurePlayerEntity(DbModelBuilder modelBuilder)
 
     public class FootballDbInitializer : SqliteDropCreateDatabaseAlways<FootballDbContext>
     {
-        public FootballDbInitializer(string connectionString, DbModelBuilder modelBuilder)
-            : base(connectionString, modelBuilder) { }
+        public FootballDbInitializer(DbModelBuilder modelBuilder)
+            : base(modelBuilder) { }
 
         protected override void Seed(FootballDbContext context)
         {

SQLite.CodeFirst/SqliteCreateDatabaseIfNotExists.cs

@@ -6,12 +6,14 @@ namespace SQLite.CodeFirst
     public class SqliteCreateDatabaseIfNotExists<TContext> : SqliteInitializerBase<TContext>
         where TContext : DbContext
     {
-        public SqliteCreateDatabaseIfNotExists(string connectionString, DbModelBuilder modelBuilder)
-            : base(connectionString, modelBuilder) { }
+        public SqliteCreateDatabaseIfNotExists(DbModelBuilder modelBuilder)
+            : base(modelBuilder) { }
 
         public override void InitializeDatabase(TContext context)
         {
-            bool dbExists = File.Exists(DatabaseFilePath);
+            string databseFilePath = GetDatabasePathFromContext(context);
+
+            bool dbExists = File.Exists(databseFilePath);
             if (dbExists)
             {
                 return;

SQLite.CodeFirst/SqliteDropCreateDatabaseAlways.cs

@@ -6,15 +6,17 @@ namespace SQLite.CodeFirst
     public class SqliteDropCreateDatabaseAlways<TContext> : SqliteInitializerBase<TContext>
         where TContext : DbContext
     {
-        public SqliteDropCreateDatabaseAlways(string connectionString, DbModelBuilder modelBuilder)
-            : base(connectionString, modelBuilder) { }
+        public SqliteDropCreateDatabaseAlways(DbModelBuilder modelBuilder)
+            : base(modelBuilder) { }
 
         public override void InitializeDatabase(TContext context)
         {
-            bool dbExists = File.Exists(DatabaseFilePath);
+            string databseFilePath = GetDatabasePathFromContext(context);
+
+            bool dbExists = File.Exists(databseFilePath);
             if (dbExists)
             {
-                File.Delete(DatabaseFilePath);
+                File.Delete(databseFilePath);
             }
 
             base.InitializeDatabase(context);

SQLite.CodeFirst/SqliteInitializerBase.cs

@@ -7,13 +7,11 @@ namespace SQLite.CodeFirst
     public abstract class SqliteInitializerBase<TContext> : IDatabaseInitializer<TContext>
         where TContext : DbContext
     {
-        protected readonly DbModelBuilder ModelBuilder;
-        protected readonly string DatabaseFilePath;
+        private readonly DbModelBuilder modelBuilder;
 
-        protected SqliteInitializerBase(string connectionString, DbModelBuilder modelBuilder)
+        protected SqliteInitializerBase(DbModelBuilder modelBuilder)
         {
-            DatabaseFilePath = SqliteConnectionStringParser.GetDataSource(connectionString);
-            ModelBuilder = modelBuilder;
+            this.modelBuilder = modelBuilder;
 
             // This convention will crash the SQLite Provider before "InitializeDatabase" gets called.
             // See https://github.com/msallin/SQLiteCodeFirst/issues/7 for details.
@@ -22,7 +20,7 @@ protected SqliteInitializerBase(string connectionString, DbModelBuilder modelBui
 
         public virtual void InitializeDatabase(TContext context)
         {
-            var model = ModelBuilder.Build(context.Database.Connection);
+            var model = modelBuilder.Build(context.Database.Connection);
 
             using (var transaction = context.Database.BeginTransaction())
             {
@@ -56,5 +54,10 @@ public virtual void InitializeDatabase(TContext context)
         }
 
         protected virtual void Seed(TContext context) { }
+
+        protected string GetDatabasePathFromContext(TContext context)
+        {
+            return SqliteConnectionStringParser.GetDataSource(context.Database.Connection.ConnectionString);
+        }
     }
 }