Simply escape all input because entity framework, schema and SQLite does not play well together.

See #47 for more information.

Author: msallin

SQLite.CodeFirst.Console/FootballDbContext.cs

@@ -29,7 +29,7 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)
 
         private static void ConfigureTeamEntity(DbModelBuilder modelBuilder)
         {
-            modelBuilder.Entity<Team>().ToTable("MyTable", "mySchema")
+            modelBuilder.Entity<Team>().ToTable("Base.MyTable")
                 .HasRequired(t => t.Coach)
                 .WithMany()
                 .WillCascadeOnDelete(false);

SQLite.CodeFirst/Builder/CreateDatabaseStatementBuilder.cs

@@ -35,14 +35,11 @@ private IEnumerable<CreateTableStatement> GetCreateTableStatements()
                 IList<AssociationTypeWrapper> associationTypeWrappers = new List<AssociationTypeWrapper>();
                 foreach (var associationType in associationTypes)
                 {
-                    string fromSchema = edmModel.Container.GetEntitySetByName(associationType.Constraint.FromRole.Name, true).Schema;
-                    string fromName = edmModel.Container.GetEntitySetByName(associationType.Constraint.FromRole.Name, true).Table;
+                    string fromTable = edmModel.Container.GetEntitySetByName(associationType.Constraint.FromRole.Name, true).Table;
+                    string toTable = edmModel.Container.GetEntitySetByName(associationType.Constraint.ToRole.Name, true).Table;
 
-                    string toSchema = edmModel.Container.GetEntitySetByName(associationType.Constraint.ToRole.Name, true).Schema;
-                    string toName = edmModel.Container.GetEntitySetByName(associationType.Constraint.ToRole.Name, true).Table;
-
-                    string fromTableName = TableNameCreator.CreateTableName(fromSchema, fromName);
-                    string toTableName = TableNameCreator.CreateTableName(toSchema, toName);
+                    string fromTableName = TableNameCreator.CreateTableName(fromTable);
+                    string toTableName = TableNameCreator.CreateTableName(toTable);
 
                     associationTypeWrappers.Add(new AssociationTypeWrapper
                     {

SQLite.CodeFirst/Builder/CreateIndexStatementBuilder.cs

@@ -41,7 +41,7 @@ public CreateIndexStatementCollection BuildStatement()
                         {
                             IsUnique = index.IsUnique,
                             Name = indexName,
-                            Table = TableNameCreator.CreateTableName(entitySet.Schema, entitySet.Table),
+                            Table = TableNameCreator.CreateTableName(entitySet.Table),
                             Columns = new Collection<CreateIndexStatement.IndexColumn>()
                         };
                         createIndexStatments.Add(indexName, createIndexStatement);

SQLite.CodeFirst/Builder/CreateTableStatementBuilder.cs

@@ -31,7 +31,7 @@ public CreateTableStatement BuildStatement()
 
             return new CreateTableStatement
             {
-                TableName = TableNameCreator.CreateTableName(entitySet.Schema, entitySet.Table),
+                TableName = TableNameCreator.CreateTableName(entitySet.Table),
                 ColumnStatementCollection = new ColumnStatementCollection(columnStatements)
             };
         }

SQLite.CodeFirst/Builder/NameCreators/IndexNameCreator.cs

@@ -11,20 +11,8 @@ public static string CreateIndexName(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.
-            bool escaped = tableName.StartsWith(SpecialChars.EscapeCharOpen.ToString()) &&
-                           tableName.EndsWith(SpecialChars.EscapeCharClose.ToString());
-
             tableName = tableName.Trim(SpecialChars.EscapeCharOpen, SpecialChars.EscapeCharClose);
-
-            string prefixChar = String.Empty;
-            string postfixChar = String.Empty;
-            if (escaped)
-            {
-                prefixChar = SpecialChars.EscapeCharOpen.ToString();
-                postfixChar = SpecialChars.EscapeCharClose.ToString();
-            }
-
-            return String.Format(CultureInfo.InvariantCulture, "{0}{1}{2}_{3}{4}", prefixChar, IndexNamePrefix, tableName, propertyName, postfixChar);
+            return String.Format(CultureInfo.InvariantCulture, "{0}{1}{2}_{3}{4}", SpecialChars.EscapeCharOpen, IndexNamePrefix, tableName, propertyName, SpecialChars.EscapeCharClose);
         }
     }
 }

SQLite.CodeFirst/Builder/NameCreators/TableNameCreator.cs

@@ -5,19 +5,9 @@ namespace SQLite.CodeFirst.Builder.NameCreators
 {
     internal static class TableNameCreator
     {
-        public static string CreateTableName(string entityName)
+        public static string CreateTableName(string tableFromEntitySet)
         {
-            return CreateTableName(null, entityName);
-        }
-
-        public static string CreateTableName(string schema, string entityName)
-        {
-            if (!String.IsNullOrWhiteSpace(schema) && schema != "dbo")
-            {
-                return String.Format(CultureInfo.InvariantCulture, "{0}{1}.{2}{3}", SpecialChars.EscapeCharOpen, schema, entityName, SpecialChars.EscapeCharClose);
-            }
-
-            return entityName;
+            return String.Format(CultureInfo.InvariantCulture, "{0}{1}{2}", SpecialChars.EscapeCharOpen, tableFromEntitySet, SpecialChars.EscapeCharClose);
         }
     }
 }

SQLite.CodeFirst/Extensions/EntityTypeExtension.cs

@@ -24,10 +24,9 @@ public static string GetTableName(this EntityType entityType)
             Type metadataPropertyValueType = metadataProperty.Value.GetType();
 
             // The type DatabaseName is internal. So we need reflection...
-            var schema = (string)metadataPropertyValueType.GetProperty("Schema").GetValue(metadataPropertyValue);
             var name = (string)metadataPropertyValueType.GetProperty("Name").GetValue(metadataPropertyValue);
 
-            return TableNameCreator.CreateTableName(schema, name);
+            return TableNameCreator.CreateTableName(name);
         }
     }
 }