#91: Use NameCreator.EscapeName if an indexname was specified manually.

Author: msallin

SQLite.CodeFirst.Test/IntegrationTests/SqlGenerationTest.cs

@@ -22,12 +22,11 @@ public class SqlGenerationTest
 CREATE TABLE ""FooSelves"" ([FooSelfId] INTEGER PRIMARY KEY, [FooId] int NOT NULL, [Number] int NOT NULL, FOREIGN KEY (FooId) REFERENCES ""Foos""(FooId) ON DELETE CASCADE);
 CREATE TABLE ""FooSteps"" ([FooStepId] INTEGER PRIMARY KEY, [FooId] int NOT NULL, [Number] int NOT NULL, FOREIGN KEY (FooId) REFERENCES ""Foos""(FooId) ON DELETE CASCADE);
 CREATE  INDEX ""IX_MyTable_Id"" ON ""MyTable"" (Id);
-CREATE  INDEX IX_Team_TeamsName ON ""MyTable"" (Name);
-
+CREATE  INDEX ""IX_Team_TeamsName"" ON ""MyTable"" (Name);
 CREATE  INDEX ""IX_TeamPlayer_Number"" ON ""TeamPlayer"" (Number);
-CREATE UNIQUE INDEX IX_TeamPlayer_NumberPerTeam ON ""TeamPlayer"" (Number, TeamId);
+CREATE UNIQUE INDEX ""IX_TeamPlayer_NumberPerTeam"" ON ""TeamPlayer"" (Number, TeamId);
 CREATE  INDEX ""IX_TeamPlayer_Mentor_Id"" ON ""TeamPlayer"" (Mentor_Id);
-CREATE UNIQUE INDEX IX_Stadion_Main ON ""Stadions"" (Street, Name);
+CREATE UNIQUE INDEX ""IX_Stadion_Main"" ON ""Stadions"" (Street, Name);
 CREATE  INDEX ""IX_Stadion_Team_Id"" ON ""Stadions"" (Team_Id);
 CREATE  INDEX ""IX_Foo_FooSelf1Id"" ON ""Foos"" (FooSelf1Id);
 CREATE  INDEX ""IX_Foo_FooSelf2Id"" ON ""Foos"" (FooSelf2Id);
@@ -52,11 +51,18 @@ public void SqliteSqlGeneratorTest()
                     // ReSharper disable once UnusedVariable
                     Player fo = context.Set<Player>().FirstOrDefault();
 
-                    Assert.IsTrue(string.Equals(ReferenceSql.Trim(), generatedSql.Trim(), StringComparison.OrdinalIgnoreCase));
+                    Assert.IsTrue(string.Equals(RemoveLineEndings(ReferenceSql), RemoveLineEndings(generatedSql)));
                 }
             }
         }
 
+        private static string RemoveLineEndings(string input)
+        {
+            string lineSeparator = ((char)0x2028).ToString();
+            string paragraphSeparator = ((char)0x2029).ToString();
+            return input.Replace("\r\n", string.Empty).Replace("\n", string.Empty).Replace("\r", string.Empty).Replace(lineSeparator, string.Empty).Replace(paragraphSeparator, string.Empty);
+        }
+
         private class DummyDbContext : DbContext
         {
             public DummyDbContext(DbConnection connection)

SQLite.CodeFirst/Internal/Builder/CreateIndexStatementBuilder.cs

@@ -59,7 +59,7 @@ public CreateIndexStatementCollection BuildStatement()
 
         private string GetIndexName(IndexAttribute index, EdmProperty property)
         {
-            return index.Name ?? IndexNameCreator.CreateIndexName(entitySet.ElementType.GetTableName(), property.Name);
+            return index.Name == null ? IndexNameCreator.CreateName(entitySet.ElementType.GetTableName(), property.Name) : NameCreator.EscapeName(index.Name);
         }
     }
 }

SQLite.CodeFirst/Internal/Builder/NameCreators/IndexNameCreator.cs

@@ -7,12 +7,12 @@ internal static class IndexNameCreator
     {
         public const string IndexNamePrefix = "IX_";
 
-        public static string CreateIndexName(string tableName, string propertyName)
+        public static string CreateName(string tableName, string propertyName)
         {
             // If the tableName is escaped it means that this name contains special chars e.g. a dot (base.myTable)
             // Because the tablename is used to build the index name the index name must also be escaped.
             tableName = tableName.Trim(SpecialChars.EscapeCharOpen, SpecialChars.EscapeCharClose);
             return String.Format(CultureInfo.InvariantCulture, "{0}{1}{2}_{3}{4}", SpecialChars.EscapeCharOpen, IndexNamePrefix, tableName, propertyName, SpecialChars.EscapeCharClose);
         }
     }
-}
+}

SQLite.CodeFirst/Internal/Convention/SqliteForeignKeyIndexConvention.cs

@@ -70,7 +70,7 @@ public virtual void Apply(AssociationType item, DbModel model)
 
         private static IndexAnnotation CreateIndexAnnotation(string tableName, string propertyName, int count)
         {
-            var indexName = IndexNameCreator.CreateIndexName(tableName, propertyName);
+            var indexName = IndexNameCreator.CreateName(tableName, propertyName);
 
             // If there are two Indicies on the same property, the count is added.
             // In SQLite an Index name must be global unique.