Adjustments:

- Renamed CollationData to Collation.
- Removed the ICollationData interface.
- Moved Collation and CollationFunction out of Attributes.
- Changed the way the default collation is passed around to use the Collation class.

Author: magnusbakken-zetadisplay

SQLite.CodeFirst.Test/IntegrationTests/SqlGenerationDefaultCollationTest.cs

@@ -57,7 +57,7 @@ public void SqliteSqlGeneratorWithDefaultCollationTest()
                 // This is important! Else the in memory database will not work.
                 connection.Open();
 
-                var defaultCollation = new CollationData() { Collation = CollationFunction.Custom, Function = "custom_collate" };
+                var defaultCollation = new Collation() { CollationFunction = CollationFunction.Custom, Function = "custom_collate" };
                 using (var context = new DummyDbContext(connection, defaultCollation))
                 {
                     // ReSharper disable once UnusedVariable
@@ -77,9 +77,9 @@ private static string RemoveLineEndings(string input)
 
         private class DummyDbContext : DbContext
         {
-            private readonly ICollationData defaultCollation;
+            private readonly Collation defaultCollation;
 
-            public DummyDbContext(DbConnection connection, ICollationData defaultCollation = null)
+            public DummyDbContext(DbConnection connection, Collation defaultCollation = null)
                 : base(connection, false)
             {
                 this.defaultCollation = defaultCollation;
@@ -97,9 +97,9 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)
 
             private class AssertInitializer : SqliteInitializerBase<DummyDbContext>
             {
-                private readonly ICollationData defaultCollation;
+                private readonly Collation defaultCollation;
 
-                public AssertInitializer(DbModelBuilder modelBuilder, ICollationData defaultCollation)
+                public AssertInitializer(DbModelBuilder modelBuilder, Collation defaultCollation)
                     : base(modelBuilder)
                 {
                     this.defaultCollation = defaultCollation;

SQLite.CodeFirst/Internal/Builder/ColumnStatementCollectionBuilder.cs

@@ -11,9 +11,9 @@ internal class ColumnStatementCollectionBuilder : IStatementBuilder<ColumnStatem
     {
         private readonly IEnumerable<EdmProperty> properties;
         private readonly IEnumerable<EdmProperty> keyMembers;
-        private readonly ICollationData defaultCollation;
+        private readonly Collation defaultCollation;
 
-        public ColumnStatementCollectionBuilder(IEnumerable<EdmProperty> properties, IEnumerable<EdmProperty> keyMembers, ICollationData defaultCollation)
+        public ColumnStatementCollectionBuilder(IEnumerable<EdmProperty> properties, IEnumerable<EdmProperty> keyMembers, Collation defaultCollation)
         {
             this.properties = properties;
             this.keyMembers = keyMembers;
@@ -75,18 +75,19 @@ private static void AddNullConstraintIfNecessary(EdmProperty property, ColumnSta
             }
         }
 
-        private static void AddCollationConstraintIfNecessary(EdmProperty property, ColumnStatement columnStatement, ICollationData defaultCollation)
+        private static void AddCollationConstraintIfNecessary(EdmProperty property, ColumnStatement columnStatement, Collation defaultCollation)
         {
-            ICollationData value = property.GetCustomAnnotation<CollateAttribute>();
-            if (value == null && defaultCollation != null && property.PrimitiveType.PrimitiveTypeKind == PrimitiveTypeKind.String)
+            if (property.PrimitiveType.PrimitiveTypeKind != PrimitiveTypeKind.String)
             {
-                // Use default collation if one is given and the property is a string.
-                value = defaultCollation;
+                return;
             }
 
+            var collateAttribute = property.GetCustomAnnotation<CollateAttribute>();
+            var value = collateAttribute == null ? defaultCollation : collateAttribute.CollationData;
+
             if (value != null)
             {
-                columnStatement.ColumnConstraints.Add(new CollateConstraint { CollationFunction = value.Collation, CustomCollationFunction = value.Function });
+                columnStatement.ColumnConstraints.Add(new CollateConstraint { CollationFunction = value.CollationFunction, CustomCollationFunction = value.Function });
             }
         }
 

SQLite.CodeFirst/Internal/Builder/CreateDatabaseStatementBuilder.cs

@@ -9,9 +9,9 @@ namespace SQLite.CodeFirst.Builder
     internal class CreateDatabaseStatementBuilder : IStatementBuilder<CreateDatabaseStatement>
     {
         private readonly EdmModel edmModel;
-        private readonly ICollationData defaultCollation;
+        private readonly Collation defaultCollation;
 
-        public CreateDatabaseStatementBuilder(EdmModel edmModel, ICollationData defaultCollation)
+        public CreateDatabaseStatementBuilder(EdmModel edmModel, Collation defaultCollation)
         {
             this.edmModel = edmModel;
             this.defaultCollation = defaultCollation;

SQLite.CodeFirst/Internal/Builder/CreateTableStatementBuilder.cs

@@ -12,9 +12,9 @@ internal class CreateTableStatementBuilder : IStatementBuilder<CreateTableStatem
     {
         private readonly EntitySet entitySet;
         private readonly AssociationTypeContainer associationTypeContainer;
-        private readonly ICollationData defaultCollation;
+        private readonly Collation defaultCollation;
 
-        public CreateTableStatementBuilder(EntitySet entitySet, AssociationTypeContainer associationTypeContainer, ICollationData defaultCollation)
+        public CreateTableStatementBuilder(EntitySet entitySet, AssociationTypeContainer associationTypeContainer, Collation defaultCollation)
         {
             this.entitySet = entitySet;
             this.associationTypeContainer = associationTypeContainer;

SQLite.CodeFirst/Public/Attributes/CollateAttribute.cs

@@ -8,22 +8,18 @@ namespace SQLite.CodeFirst
     /// It is possible to specify a custom collating function. Set  <see cref="CollationFunction"/> to <see cref="CollationFunction.Custom"/> and specify the name using the function parameter.
     /// </summary>
     [AttributeUsage(AttributeTargets.Property)]
-    public sealed class CollateAttribute : Attribute, ICollationData
+    public sealed class CollateAttribute : Attribute
     {
         public CollateAttribute()
+            : this(CollationFunction.None)
         {
-            Collation = CollationFunction.None;
         }
 
         public CollateAttribute(CollationFunction collation)
+            : this(collation, null)
         {
-            if (collation == CollationFunction.Custom)
-            {
-                throw new ArgumentException("If the collation is set to CollationFunction.Custom a function must be specified.", nameof(collation));
-            }
-
-            Collation = collation;
         }
+
         public CollateAttribute(CollationFunction collation, string function)
         {
             if (collation != CollationFunction.Custom && !string.IsNullOrEmpty(function))
@@ -38,6 +34,7 @@ public CollateAttribute(CollationFunction collation, string function)
 
             Collation = collation;
             Function = function;
+            CollationData = new Collation() { CollationFunction = collation, Function = function };
         }
 
         public CollationFunction Collation { get; }
@@ -46,5 +43,7 @@ public CollateAttribute(CollationFunction collation, string function)
         /// The name of the custom collating function to use (CollationFunction.Custom).
         /// </summary>
         public string Function { get; }
+
+        public Collation CollationData { get; }
     }
 }

SQLite.CodeFirst/Public/Attributes/CollationData.cs

@@ -0,0 +1,18 @@
+namespace SQLite.CodeFirst
+{
+    /// <summary>
+    /// This class can be used to specify the default collation for the database. Explicit Collate attributes will take precendence.
+    /// When SQLite compares two strings, it uses a collating sequence or collating function (two words for the same thing)
+    /// to determine which string is greater or if the two strings are equal. SQLite has three built-in collating functions (see <see cref="CollationFunction"/>).
+    /// Set  <see cref="CollationFunction"/> to <see cref="CollationFunction.Custom"/> and specify the name using the function parameter.
+    /// </summary>
+    public class Collation
+    {
+        public CollationFunction CollationFunction { get; set; }
+
+        /// <summary>
+        /// The name of the custom collating function to use (CollationFunction.Custom).
+        /// </summary>
+        public string Function { get; set; }
+    }
+}

SQLite.CodeFirst/Public/Attributes/ICollationData.cs

@@ -2,7 +2,7 @@
 {
     /// <summary>
     /// The collation function to use for this column.
-    /// Is used together with the <see cref="CollateAttribute" />.
+    /// Is used together with the <see cref="CollateAttribute" />, and when setting a default collation for the database.
     /// </summary>
     public enum CollationFunction
     {

SQLite.CodeFirst/Public/Collation.cs

@@ -24,9 +24,10 @@ namespace SQLite.CodeFirst
     public abstract class SqliteInitializerBase<TContext> : IDatabaseInitializer<TContext>
         where TContext : DbContext
     {
-        protected SqliteInitializerBase(DbModelBuilder modelBuilder)
+        protected SqliteInitializerBase(DbModelBuilder modelBuilder, Collation defaultCollation = null)
         {
             ModelBuilder = modelBuilder ?? throw new ArgumentNullException(nameof(modelBuilder));
+            DefaultCollation = defaultCollation;
 
             // This convention will crash the SQLite Provider before "InitializeDatabase" gets called.
             // See https://github.com/msallin/SQLiteCodeFirst/issues/7 for details.
@@ -55,7 +56,7 @@ protected SqliteInitializerBase(DbModelBuilder modelBuilder)
             }
         }
 
-        public ICollationData DefaultCollation { get; set; }
+        public Collation DefaultCollation { get; }
 
         protected DbModelBuilder ModelBuilder { get; }