#91: Renamed TableNameCreator to NameCreator and CreateTableName to EscapeName.

Author: msallin

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" />

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);
         }
     }

…der/NameCreators/TableNameCreatorTest.cs …/Builder/NameCreators/NameCreatorTest.csSQLite.CodeFirst.Test/UnitTests/Builder/NameCreators/TableNameCreatorTest.cs renamed to SQLite.CodeFirst.Test/UnitTests/Builder/NameCreators/NameCreatorTest.cs SQLite.CodeFirst.Test/UnitTests/Builder/NameCreators/TableNameCreatorTest.cs renamed to 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);
         }
     }

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);

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)
             };
         }

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);
+        }
+    }
+}

SQLite.CodeFirst/Internal/Builder/NameCreators/TableNameCreator.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);
         }
     }
 }

SQLite.CodeFirst/Internal/Extensions/EntityTypeExtension.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;

SQLite.CodeFirst/Internal/Utility/SqliteAssociationType.cs

@@ -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" />