Refactoring and additional flexibility for the "SqliteContextInitializer"-class.

Author: msallin

SQLiteEfCodeFirstDbCreator/SQLiteEfCodeFirstDbCreator.csproj

@@ -9,12 +9,13 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SQLiteEfCodeFirstDbCreator</RootNamespace>
     <AssemblyName>SQLiteEfCodeFirstDbCreator</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <NuGetPackageImportStamp>b4e826ae</NuGetPackageImportStamp>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -68,6 +69,7 @@
     <Compile Include="Builder\ForeignKeyCollectionBuilder.cs" />
     <Compile Include="Builder\CreateDatabaseStatementBuilder.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SqliteConnectionStringParser.cs" />
     <Compile Include="SqliteContextInitializer.cs" />
     <Compile Include="Builder\IStatementBuilder.cs" />
     <Compile Include="SqliteDatabaseCreator.cs" />

SQLiteEfCodeFirstDbCreator/SqliteConnectionStringParser.cs

@@ -0,0 +1,32 @@
+using System.Collections.Generic;
+
+namespace SQLiteEfCodeFirstDbCreator
+{
+    internal static class SqliteConnectionStringParser
+    {
+        private const char KeyValuePairSeperator = ';';
+        private const char KeyValueSeperator = '=';
+        private const int KeyPosition = 0;
+        private const int ValuePosition = 1;
+
+        public static IDictionary<string, string> ParseSqliteConnectionString(string connectionString)
+        {
+            connectionString = connectionString.Trim();
+            string[] keyValuePairs = connectionString.Split(KeyValuePairSeperator);
+
+            IDictionary<string, string> keyValuePairDictionary = new Dictionary<string, string>();
+            foreach (var keyValuePair in keyValuePairs)
+            {
+                string[] keyValue = keyValuePair.Split(KeyValueSeperator);
+                keyValuePairDictionary.Add(keyValue[KeyPosition], keyValue[ValuePosition]);
+            }
+
+            return keyValuePairDictionary;
+        }
+
+        public static string GetDataSource(string connectionString)
+        {
+            return ParseSqliteConnectionString(connectionString)["data source"];
+        }
+    }
+}

SQLiteEfCodeFirstDbCreator/SqliteContextInitializer.cs

@@ -1,35 +1,28 @@
 using System;
 using System.Data.Entity;
 using System.IO;
-using System.Linq;
 
 namespace SQLiteEfCodeFirstDbCreator
 {
-    public class SqliteContextInitializer<T> : IDatabaseInitializer<T>
-        where T : DbContext
+    public class SqliteContextInitializer<TDbContext> : IDatabaseInitializer<TDbContext>
+        where TDbContext : DbContext
     {
-        private readonly bool dbExists;
-        private readonly DbModelBuilder modelBuilder;
+        protected readonly bool dbExists;
+        protected readonly DbModelBuilder modelBuilder;
 
         public SqliteContextInitializer(string connectionString, DbModelBuilder modelBuilder)
         {
-            string path = GetPathFromConnectionString(connectionString);
+            string path = SqliteConnectionStringParser.GetDataSource(connectionString);
             dbExists = File.Exists(path);
             this.modelBuilder = modelBuilder;
         }
 
-        private string GetPathFromConnectionString(string connectionString)
-        {
-            string[] keyValuePairs = connectionString.Split(';');
-            string dataSourceKeyValuePair = keyValuePairs.Single(s => s.ToLower().StartsWith("data source"));
-            string dataSourceValue = dataSourceKeyValuePair.Split('=')[1];
-            return dataSourceValue;
-        }
-
-        public void InitializeDatabase(T context)
+        public virtual void InitializeDatabase(TDbContext context)
         {
             if (dbExists)
+            {
                 return;
+            }
 
             var model = modelBuilder.Build(context.Database.Connection);
 
@@ -47,6 +40,22 @@ public void InitializeDatabase(T context)
                     throw;
                 }
             }
+
+            using (var transaction = context.Database.BeginTransaction())
+            {
+                try
+                {
+                    Seed(context);
+                    transaction.Commit();
+                }
+                catch (Exception)
+                {
+                    transaction.Rollback();
+                    throw;
+                }
+            }
         }
+
+        protected virtual void Seed(TDbContext context) { }
     }
-}
+}