Merge pull request #95 from msallin/#91

msallin · web-flow · commit 456bb639c58b · 2017-07-09T10:47:56.000+02:00
#91
diff --git a/SQLite.CodeFirst.Test/IntegrationTests/SqlGenerationTest.cs b/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)
diff --git a/SQLite.CodeFirst.Test/SQLite.CodeFirst.Test.csproj b/SQLite.CodeFirst.Test/SQLite.CodeFirst.Test.csproj
@@ -90,7 +90,7 @@
     </Compile>
     <Compile Include="IntegrationTests\SqlGenerationTest.cs" />
     <Compile Include="UnitTests\Builder\NameCreators\IndexNameCreatorTest.cs" />
-    <Compile Include="UnitTests\Builder\NameCreators\TableNameCreatorTest.cs" />
+    <Compile Include="UnitTests\Builder\NameCreators\NameCreatorTest.cs" />
     <Compile Include="IntegrationTests\MemoryDbTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="UnitTests\Statement\ColumnConstraint\MaxLengthConstraint.cs" />
diff --git a/SQLite.CodeFirst.Test/UnitTests/Builder/NameCreators/IndexNameCreatorTest.cs b/SQLite.CodeFirst.Test/UnitTests/Builder/NameCreators/IndexNameCreatorTest.cs
@@ -9,14 +9,14 @@ public class IndexNameCreatorTest
         [TestMethod]
         public void CreateIndexName()
         {
-            string result = IndexNameCreator.CreateIndexName("MyTable", "MyProperty");
+            string result = IndexNameCreator.CreateName("MyTable", "MyProperty");
             Assert.AreEqual("\"IX_MyTable_MyProperty\"", result);
         }
 
         [TestMethod]
         public void CreateIndexNameEscaped()
         {
-            string result = IndexNameCreator.CreateIndexName("\"base.MyTable\"", "MyProperty");
+            string result = IndexNameCreator.CreateName("\"base.MyTable\"", "MyProperty");
             Assert.AreEqual("\"IX_base.MyTable_MyProperty\"", result);
         }
     }
diff --git a/SQLite.CodeFirst.Test/UnitTests/Builder/NameCreators/NameCreatorTest.cs b/SQLite.CodeFirst.Test/UnitTests/Builder/NameCreators/NameCreatorTest.cs
@@ -4,12 +4,12 @@
 namespace SQLite.CodeFirst.Test.UnitTests.Builder.NameCreators
 {
     [TestClass]
-    public class TableNameCreatorTest
+    public class NameCreatorTest
     {
         [TestMethod]
         public void CreateTableNameTest()
         {
-            string result = TableNameCreator.CreateTableName("Test");
+            string result = NameCreator.EscapeName("Test");
             Assert.AreEqual("\"Test\"", result);
         }
     }
diff --git a/SQLite.CodeFirst/Internal/Builder/CreateIndexStatementBuilder.cs b/SQLite.CodeFirst/Internal/Builder/CreateIndexStatementBuilder.cs
@@ -29,6 +29,7 @@ public CreateIndexStatementCollection BuildStatement()
                     .Select(x => x.Value)
                     .OfType<IndexAnnotation>();
 
+                string tableName = NameCreator.EscapeName(entitySet.Table);
                 foreach (var index in indexAnnotations.SelectMany(ia => ia.Indexes))
                 {
                     CreateIndexStatement createIndexStatement;
@@ -39,7 +40,7 @@ public CreateIndexStatementCollection BuildStatement()
                         {
                             IsUnique = index.IsUnique,
                             Name = indexName,
-                            Table = TableNameCreator.CreateTableName(entitySet.Table),
+                            Table = tableName,
                             Columns = new Collection<CreateIndexStatement.IndexColumn>()
                         };
                         createIndexStatments.Add(indexName, createIndexStatement);
@@ -58,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);
         }
     }
 }
diff --git a/SQLite.CodeFirst/Internal/Builder/CreateTableStatementBuilder.cs b/SQLite.CodeFirst/Internal/Builder/CreateTableStatementBuilder.cs
@@ -41,7 +41,7 @@ public CreateTableStatement BuildStatement()
 
             return new CreateTableStatement
             {
-                TableName = TableNameCreator.CreateTableName(entitySet.Table),
+                TableName = NameCreator.EscapeName(entitySet.Table),
                 ColumnStatementCollection = new ColumnStatementCollection(columnStatements)
             };
         }
diff --git a/SQLite.CodeFirst/Internal/Builder/NameCreators/IndexNameCreator.cs b/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);
         }
     }
-}
+}
diff --git a/SQLite.CodeFirst/Internal/Builder/NameCreators/NameCreator.cs b/SQLite.CodeFirst/Internal/Builder/NameCreators/NameCreator.cs
@@ -0,0 +1,19 @@
+﻿using System.Globalization;
+
+namespace SQLite.CodeFirst.Builder.NameCreators
+{
+    internal static class NameCreator
+    {
+        public static string EscapeName(string name)
+        {
+            // Ensure that the name is not already escaped.
+            name = name.Trim(SpecialChars.EscapeCharOpen, SpecialChars.EscapeCharClose);
+
+            // Escape the escape chars, if there are some of them in the name.
+            name = name.Replace(SpecialChars.EscapeCharOpen.ToString(), SpecialChars.EscapeCharOpen.ToString() + SpecialChars.EscapeCharOpen);
+
+            // Escape the name.
+            return string.Format(CultureInfo.InvariantCulture, "{0}{1}{2}", SpecialChars.EscapeCharOpen, name, SpecialChars.EscapeCharClose);
+        }
+    }
+}
diff --git a/SQLite.CodeFirst/Internal/Builder/NameCreators/TableNameCreator.cs b/SQLite.CodeFirst/Internal/Builder/NameCreators/TableNameCreator.cs
diff --git a/SQLite.CodeFirst/Internal/Convention/SqliteForeignKeyIndexConvention.cs b/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.
diff --git a/SQLite.CodeFirst/Internal/Extensions/EntityTypeExtension.cs b/SQLite.CodeFirst/Internal/Extensions/EntityTypeExtension.cs
@@ -26,7 +26,7 @@ public static string GetTableName(this EntityType entityType)
             // GetValue() overload with one value was introduces in .net 4.5 so use the overload with two parameters. 
             var name = (string)metadataPropertyValueType.GetProperty("Name").GetValue(metadataPropertyValue, null);
 
-            return TableNameCreator.CreateTableName(name);
+            return NameCreator.EscapeName(name);
         }
     }
 }
diff --git a/SQLite.CodeFirst/Internal/Utility/SqliteAssociationType.cs b/SQLite.CodeFirst/Internal/Utility/SqliteAssociationType.cs
@@ -25,8 +25,8 @@ public SqliteAssociationType(AssociationType associationType, EntityContainer co
                 toTable = container.GetEntitySetByName(ToRoleEntitySetName, true).Table;
             }
 
-            FromTableName = TableNameCreator.CreateTableName(fromTable);
-            ToTableName = TableNameCreator.CreateTableName(toTable);
+            FromTableName = NameCreator.EscapeName(fromTable);
+            ToTableName = NameCreator.EscapeName(toTable);
             ForeignKey = associationType.Constraint.ToProperties.Select(x => x.Name);
             ForeignPrimaryKey = associationType.Constraint.FromProperties.Select(x => x.Name);
             CascadeDelete = associationType.Constraint.FromRole.DeleteBehavior == OperationAction.Cascade;
diff --git a/SQLite.CodeFirst/Public/SqliteDatabaseCreator.cs b/SQLite.CodeFirst/Public/SqliteDatabaseCreator.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Data.Entity;
 using System.Data.Entity.Infrastructure;
+using System.Diagnostics;
 
 namespace SQLite.CodeFirst
 {
@@ -20,6 +21,7 @@ public void Create(Database db, DbModel model)
 
             var sqliteSqlGenerator = new SqliteSqlGenerator();
             string sql = sqliteSqlGenerator.Generate(model.StoreModel);
+            Debug.Write(sql);
             db.ExecuteSqlCommand(TransactionalBehavior.EnsureTransaction, sql);
         }
     }
diff --git a/SQLite.CodeFirst/SQLite.CodeFirst.csproj b/SQLite.CodeFirst/SQLite.CodeFirst.csproj
@@ -87,6 +87,7 @@
     <Compile Include="..\Shared\AssemblySharedInfo.cs">
       <Link>Properties\AssemblySharedInfo.cs</Link>
     </Compile>
+    <Compile Include="Internal\Builder\NameCreators\NameCreator.cs" />
     <Compile Include="Internal\Utility\InMemoryAwareFile.cs" />
     <Compile Include="Internal\Extensions\ListExtensions.cs" />
     <Compile Include="Internal\Statement\ColumnConstraint\PrimaryKeyConstraint.cs" />
@@ -141,7 +142,6 @@
     <Compile Include="Internal\Statement\CreateTableStatement.cs" />
     <Compile Include="Internal\Statement\IStatement.cs" />
     <Compile Include="Internal\Builder\CreateTableStatementBuilder.cs" />
-    <Compile Include="Internal\Builder\NameCreators\TableNameCreator.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

Original file line number	Diff line number	Diff line change
`@@ -9,14 +9,14 @@ public class IndexNameCreatorTest`
`9`	`9`	`[TestMethod]`
`10`	`10`	`public void CreateIndexName()`
`11`	`11`	`{`
`12`		`- string result = IndexNameCreator.CreateIndexName("MyTable", "MyProperty");`
	`12`	`+ string result = IndexNameCreator.CreateName("MyTable", "MyProperty");`
`13`	`13`	`Assert.AreEqual("\"IX_MyTable_MyProperty\"", result);`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`[TestMethod]`
`17`	`17`	`public void CreateIndexNameEscaped()`
`18`	`18`	`{`
`19`		`- string result = IndexNameCreator.CreateIndexName("\"base.MyTable\"", "MyProperty");`
	`19`	`+ string result = IndexNameCreator.CreateName("\"base.MyTable\"", "MyProperty");`
`20`	`20`	`Assert.AreEqual("\"IX_base.MyTable_MyProperty\"", result);`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,12 @@`
`4`	`4`	`namespace SQLite.CodeFirst.Test.UnitTests.Builder.NameCreators`
`5`	`5`	`{`
`6`	`6`	`[TestClass]`
`7`		`- public class TableNameCreatorTest`
	`7`	`+ public class NameCreatorTest`
`8`	`8`	`{`
`9`	`9`	`[TestMethod]`
`10`	`10`	`public void CreateTableNameTest()`
`11`	`11`	`{`
`12`		`- string result = TableNameCreator.CreateTableName("Test");`
	`12`	`+ string result = NameCreator.EscapeName("Test");`
`13`	`13`	`Assert.AreEqual("\"Test\"", result);`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ public CreateIndexStatementCollection BuildStatement()`
`29`	`29`	`.Select(x => x.Value)`
`30`	`30`	`.OfType<IndexAnnotation>();`
`31`	`31`
	`32`	`+ string tableName = NameCreator.EscapeName(entitySet.Table);`
`32`	`33`	`foreach (var index in indexAnnotations.SelectMany(ia => ia.Indexes))`
`33`	`34`	`{`
`34`	`35`	`CreateIndexStatement createIndexStatement;`
`@@ -39,7 +40,7 @@ public CreateIndexStatementCollection BuildStatement()`
`39`	`40`	`{`
`40`	`41`	`IsUnique = index.IsUnique,`
`41`	`42`	`Name = indexName,`
`42`		`- Table = TableNameCreator.CreateTableName(entitySet.Table),`
	`43`	`+ Table = tableName,`
`43`	`44`	`Columns = new Collection<CreateIndexStatement.IndexColumn>()`
`44`	`45`	`};`
`45`	`46`	`createIndexStatments.Add(indexName, createIndexStatement);`
`@@ -58,7 +59,7 @@ public CreateIndexStatementCollection BuildStatement()`
`58`	`59`
`59`	`60`	`private string GetIndexName(IndexAttribute index, EdmProperty property)`
`60`	`61`	`{`
`61`		`- return index.Name ?? IndexNameCreator.CreateIndexName(entitySet.ElementType.GetTableName(), property.Name);`
	`62`	`+ return index.Name == null ? IndexNameCreator.CreateName(entitySet.ElementType.GetTableName(), property.Name) : NameCreator.EscapeName(index.Name);`
`62`	`63`	`}`
`63`	`64`	`}`
`64`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public CreateTableStatement BuildStatement()`
`41`	`41`
`42`	`42`	`return new CreateTableStatement`
`43`	`43`	`{`
`44`		`- TableName = TableNameCreator.CreateTableName(entitySet.Table),`
	`44`	`+ TableName = NameCreator.EscapeName(entitySet.Table),`
`45`	`45`	`ColumnStatementCollection = new ColumnStatementCollection(columnStatements)`
`46`	`46`	`};`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,12 @@ internal static class IndexNameCreator`
`7`	`7`	`{`
`8`	`8`	`public const string IndexNamePrefix = "IX_";`
`9`	`9`
`10`		`- public static string CreateIndexName(string tableName, string propertyName)`
	`10`	`+ public static string CreateName(string tableName, string propertyName)`
`11`	`11`	`{`
`12`	`12`	`// If the tableName is escaped it means that this name contains special chars e.g. a dot (base.myTable)`
`13`	`13`	`// Because the tablename is used to build the index name the index name must also be escaped.`
`14`	`14`	`tableName = tableName.Trim(SpecialChars.EscapeCharOpen, SpecialChars.EscapeCharClose);`
`15`	`15`	`return String.Format(CultureInfo.InvariantCulture, "{0}{1}{2}_{3}{4}", SpecialChars.EscapeCharOpen, IndexNamePrefix, tableName, propertyName, SpecialChars.EscapeCharClose);`
`16`	`16`	`}`
`17`	`17`	`}`
`18`		`-}`
	`18`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public virtual void Apply(AssociationType item, DbModel model)`
`70`	`70`
`71`	`71`	`private static IndexAnnotation CreateIndexAnnotation(string tableName, string propertyName, int count)`
`72`	`72`	`{`
`73`		`- var indexName = IndexNameCreator.CreateIndexName(tableName, propertyName);`
	`73`	`+ var indexName = IndexNameCreator.CreateName(tableName, propertyName);`
`74`	`74`
`75`	`75`	`// If there are two Indicies on the same property, the count is added.`
`76`	`76`	`// In SQLite an Index name must be global unique.`