Coding Style.

Author: msallin

SQLite.CodeFirst/Builder/ColumnStatementCollectionBuilder.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Data.Entity.Core.Metadata.Edm;
+using System.Globalization;
 using System.Linq;
 using SQLite.CodeFirst.Statement;
 using SQLite.CodeFirst.Statement.ColumnConstraint;
@@ -40,7 +41,7 @@ private IEnumerable<ColumnStatement> CreateColumnStatements()
             }
         }
 
-        private void AddMaxLengthConstraintIfNecessary(EdmProperty property, ColumnStatement columnStatement)
+        private static void AddMaxLengthConstraintIfNecessary(EdmProperty property, ColumnStatement columnStatement)
         {
             if (property.MaxLength.HasValue)
             {
@@ -53,7 +54,7 @@ private static void AdjustDatatypeForAutogenerationIfNecessary(EdmProperty prope
             if (property.StoreGeneratedPattern == StoreGeneratedPattern.Identity)
             {
                 // Must be INTEGER else SQLite will not generate the Ids
-                columnStatement.TypeName = columnStatement.TypeName.ToLower() == "int" ? "INTEGER" : columnStatement.TypeName;
+                columnStatement.TypeName = columnStatement.TypeName.ToLower(CultureInfo.InvariantCulture) == "int" ? "INTEGER" : columnStatement.TypeName;
             }
         }
 

SQLite.CodeFirst/Builder/CreateIndexStatementBuilder.cs

@@ -1,8 +1,10 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Data.Entity.Core.Metadata.Edm;
 using System.Data.Entity.Infrastructure.Annotations;
+using System.Globalization;
 using System.Linq;
 using SQLite.CodeFirst.Extensions;
 using SQLite.CodeFirst.Statement;
@@ -57,7 +59,7 @@ public CreateIndexStatementCollection BuildStatement()
 
         private string GetIndexName(IndexAttribute index, EdmProperty property)
         {
-            return index.Name ?? string.Format("IX_{0}_{1}", entitySet.ElementType.GetTableName(), property.Name);
+            return index.Name ?? String.Format(CultureInfo.InvariantCulture, "IX_{0}_{1}", entitySet.ElementType.GetTableName(), property.Name);
         }
     }
 }

SQLite.CodeFirst/Convention/SqliteForeignKeyIndexConvention.cs

@@ -6,6 +6,7 @@
 using System.Data.Entity.Infrastructure;
 using System.Data.Entity.Infrastructure.Annotations;
 using System.Data.Entity.ModelConfiguration.Conventions;
+using System.Globalization;
 using System.Linq;
 
 namespace SQLite.CodeFirst.Convention
@@ -35,31 +36,33 @@ public virtual void Apply(AssociationType item, DbModel model)
                 return;
             }
 
-            for (int i = 0; i < item.Constraint.ToProperties.Count; i++)
+            foreach (var edmProperty in item.Constraint.ToProperties)
             {
-                EdmProperty edmProperty = item.Constraint.ToProperties[i];
                 var annotation = GetAnnotation(edmProperty.MetadataProperties, IndexAnnotationName);
-                if (annotation != null)
+                if (annotation == null)
                 {
-                    // The original attribute is removed. The none-ForeignKeyIndicies will be remained and readded without any modification
-                    // and the foreignKeyIncidies will be readded with the correct name.
-                    edmProperty.RemoveAnnotation(IndexAnnotationName);
+                    continue;
+                }
 
-                    // The schema for the automatically generated index name is "IX_{TableName}_{PropertyName}"
-                    var noneForeignKeyIndicies = annotation.Indexes.Where(index => index.Name != "IX_" + edmProperty.Name);
-                    IndexAnnotation newIndexAnnotation = new IndexAnnotation(noneForeignKeyIndicies);
+                // The original attribute is removed. The none-ForeignKeyIndicies will be remained and readded without any modification
+                // and the foreignKeyIncidies will be readded with the correct name.
+                edmProperty.RemoveAnnotation(IndexAnnotationName);
 
-                    // The schema for a FK index, which is generated by the Entity Framework, is "IX_{PropertyName}"
-                    var foreignKeyIndicies = annotation.Indexes.Where(index => index.Name == "IX_" + edmProperty.Name);
-                    foreach (var foreignKeyIndex in foreignKeyIndicies)
-                    {
-                        var indexAttribute = new IndexAttribute(string.Format("IX_{0}_{1}", item.Constraint.ToRole.GetEntityType().GetTableName(), edmProperty.Name));
-                        IndexAnnotation foreignKeyIndexAnnotation = new IndexAnnotation(indexAttribute);
-                        newIndexAnnotation = (IndexAnnotation)newIndexAnnotation.MergeWith(foreignKeyIndexAnnotation);
-                    }
+                // The schema for the automatically generated index name is "IX_{TableName}_{PropertyName}"
+                var noneForeignKeyIndicies = annotation.Indexes.Where(index => index.Name != "IX_" + edmProperty.Name);
+                IndexAnnotation newIndexAnnotation = new IndexAnnotation(noneForeignKeyIndicies);
 
-                    edmProperty.AddAnnotation(IndexAnnotationName, newIndexAnnotation);
+                // The schema for a FK index, which is generated by the Entity Framework, is "IX_{PropertyName}"
+                var property = edmProperty;
+                var foreignKeyIndicies = annotation.Indexes.Where(index => index.Name == "IX_" + property.Name);
+                foreach (var foreignKeyIndex in foreignKeyIndicies)
+                {
+                    var indexAttribute = new IndexAttribute(String.Format(CultureInfo.InvariantCulture, "IX_{0}_{1}", item.Constraint.ToRole.GetEntityType().GetTableName(), edmProperty.Name));
+                    IndexAnnotation foreignKeyIndexAnnotation = new IndexAnnotation(indexAttribute);
+                    newIndexAnnotation = (IndexAnnotation)newIndexAnnotation.MergeWith(foreignKeyIndexAnnotation);
                 }
+
+                edmProperty.AddAnnotation(IndexAnnotationName, newIndexAnnotation);
             }
         }
 

SQLite.CodeFirst/SqliteConnectionStringParser.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 
 namespace SQLite.CodeFirst
 {
@@ -20,8 +21,9 @@ public static IDictionary<string, string> ParseSqliteConnectionString(string con
             foreach (var keyValuePair in keyValuePairs)
             {
                 string[] keyValue = keyValuePair.Split(KeyValueSeperator);
-                if (keyValue.Length >= 2){
-                    keyValuePairDictionary.Add(keyValue[KeyPosition].ToLower(), keyValue[ValuePosition]);
+                if (keyValue.Length >= 2)
+                {
+                    keyValuePairDictionary.Add(keyValue[KeyPosition].ToLower(CultureInfo.InvariantCulture), keyValue[ValuePosition]);
                 }
             }
 
@@ -47,7 +49,7 @@ private static string ExpandDataDirectory(string path)
 
             // find the replacement path
             object rootFolderObject = AppDomain.CurrentDomain.GetData("DataDirectory");
-            string rootFolderPath = (rootFolderObject as string);
+            string rootFolderPath = rootFolderObject as string;
             if (rootFolderObject != null && rootFolderPath == null)
             {
                 throw new InvalidOperationException("The value stored in the AppDomains 'DataDirectory' variable has to be a string!");
@@ -56,7 +58,7 @@ private static string ExpandDataDirectory(string path)
             {
                 rootFolderPath = AppDomain.CurrentDomain.BaseDirectory;
             }
-            
+
             // We don't know if rootFolderpath ends with '\', and we don't know if the given name starts with onw
             int fileNamePosition = DataDirectoryToken.Length;    // filename starts right after the '|datadirectory|' keyword
             bool rootFolderEndsWith = (0 < rootFolderPath.Length) && rootFolderPath[rootFolderPath.Length - 1] == '\\';

SQLite.CodeFirst/SqliteInitializerBase.cs

@@ -5,13 +5,29 @@
 
 namespace SQLite.CodeFirst
 {
+    /// <summary>
+    /// An basic implementation of the <see cref="IDatabaseInitializer{TContext}"/> interface.
+    /// This class provides common logic which can be used when writing an Sqlite-Initializer.
+    /// The logic provided is: 
+    ///   1. Remove/Add specific Conventions 
+    ///   2. Get the path to the database file  
+    ///   3. Create a new SQLite-Database from the model (Code First)
+    ///   4. Seed data to the new created database
+    /// The following implementations are provided: <see cref="T:SQLite.CodeFirst.SqliteCreateDatabaseIfNotExists`1"/>,  <see cref="T:SQlite.CodeFirst.SqliteDropCreateDatabaseAlways`1"/>.
+    /// </summary>
+    /// <typeparam name="TContext">The type of the context.</typeparam>
     public abstract class SqliteInitializerBase<TContext> : IDatabaseInitializer<TContext>
         where TContext : DbContext
     {
         private readonly DbModelBuilder modelBuilder;
 
         protected SqliteInitializerBase(DbModelBuilder modelBuilder)
         {
+            if (modelBuilder == null)
+            {
+                throw new ArgumentNullException(nameof(modelBuilder));
+            }
+
             this.modelBuilder = modelBuilder;
 
             // This convention will crash the SQLite Provider before "InitializeDatabase" gets called.
@@ -23,6 +39,13 @@ protected SqliteInitializerBase(DbModelBuilder modelBuilder)
             modelBuilder.Conventions.AddAfter<ForeignKeyIndexConvention>(new SqliteForeignKeyIndexConvention());
         }
 
+        /// <summary>
+        /// Initialize the database for the given context.
+        /// Generates the SQLite-DDL from the model and executs it against the database.
+        /// After that the <see cref="Seed"/> method is executed.
+        /// All actions are be executed in transactions.
+        /// </summary>
+        /// <param name="context">The context. </param>
         public virtual void InitializeDatabase(TContext context)
         {
             var model = modelBuilder.Build(context.Database.Connection);
@@ -58,8 +81,18 @@ public virtual void InitializeDatabase(TContext context)
             }
         }
 
+        /// <summary>
+        /// Is executed right after the initialization <seealso cref="InitializeDatabase"/>.
+        /// Use this method to seed data into the empty database.
+        /// </summary>
+        /// <param name="context">The context.</param>
         protected virtual void Seed(TContext context) { }
 
+        /// <summary>
+        /// Gets the database path file path from a <see cref="TContext"/>.
+        /// </summary>
+        /// <param name="context">The context to get the database file path from.</param>
+        /// <returns>The full path to the SQLite database file.</returns>
         protected string GetDatabasePathFromContext(TContext context)
         {
             return SqliteConnectionStringParser.GetDataSource(context.Database.Connection.ConnectionString);

SQLite.CodeFirst/Statement/ColumnConstraint/ColumnConstraintCollection.cs

@@ -9,7 +9,9 @@ internal class ColumnConstraintCollection : Collection<IColumnConstraint>, IColu
     {
         private const string ConstraintStatementSeperator = " ";
 
-        public ColumnConstraintCollection() { }
+        public ColumnConstraintCollection()
+            : this(new List<IColumnConstraint>())
+        { }
 
         public ColumnConstraintCollection(IEnumerable<IColumnConstraint> columnConstraints)
         {