Merge pull request #67 from msallin/topic/Issue-66

Topic/issue 66

Author: msallin

SQLite.CodeFirst.Console/Entity/Set.cs

@@ -0,0 +1,18 @@
+using System.Collections.ObjectModel;
+using System.ComponentModel.DataAnnotations;
+
+namespace SQLite.CodeFirst.Console.Entity
+{
+    /// <summary>
+    /// I agree, that this makes no sense.
+    /// Its just to test the IsSelfReferencing method for table names which are shorter than 4 chars.
+    /// See #66.
+    /// </summary>
+    public class Set
+    {
+        [Key]
+        public string Title { get; set; }
+
+        public virtual Player Player { get; set; }
+    }
+}

SQLite.CodeFirst.Console/FootballDbContext.cs

@@ -18,6 +18,7 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)
             ConfigureStadionEntity(modelBuilder);
             ConfigureCoachEntity(modelBuilder);
             ConfigurePlayerEntity(modelBuilder);
+            ConfigureSetEntity(modelBuilder);
 
             var initializer = new FootballDbInitializer(modelBuilder);
             Database.SetInitializer(initializer);
@@ -56,5 +57,11 @@ private static void ConfigurePlayerEntity(DbModelBuilder modelBuilder)
                 .WithMany(team => team.Players)
                 .WillCascadeOnDelete(true);
         }
+
+        private static void ConfigureSetEntity(DbModelBuilder modelBuilder)
+        {
+            modelBuilder.Entity<Set>()
+                .HasRequired(s => s.Player);
+        }
     }
 }

SQLite.CodeFirst.Console/SQLite.CodeFirst.Console.csproj

@@ -80,6 +80,7 @@
     <Compile Include="Entity\IEntity.cs" />
     <Compile Include="Entity\Person.cs" />
     <Compile Include="Entity\Player.cs" />
+    <Compile Include="Entity\Set.cs" />
     <Compile Include="Entity\Stadion.cs" />
     <Compile Include="Entity\Team.cs" />
     <Compile Include="FootballDbContext.cs" />

SQLite.CodeFirst.Test/SQLite.CodeFirst.Test.csproj

@@ -94,7 +94,7 @@
     <Compile Include="Statement\ColumnStatementTest.cs" />
     <Compile Include="Utility\ConnectionStringParserTest.cs" />
     <Compile Include="Utility\HashCreatorTest.cs" />
-    <Compile Include="Utility\HistoryEntityTypeValidator.cs" />
+    <Compile Include="Utility\HistoryEntityTypeValidatorTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Convention\" />

…st/Utility/HistoryEntityTypeValidator.cs …tility/HistoryEntityTypeValidatorTest.csSQLite.CodeFirst.Test/Utility/HistoryEntityTypeValidator.cs renamed to SQLite.CodeFirst.Test/Utility/HistoryEntityTypeValidatorTest.cs SQLite.CodeFirst.Test/Utility/HistoryEntityTypeValidator.cs renamed to SQLite.CodeFirst.Test/Utility/HistoryEntityTypeValidatorTest.cs

@@ -36,7 +36,15 @@ public SqliteAssociationType(AssociationType associationType, EntityContainer co
 
         private static bool IsSelfReferencing(AssociationType associationType)
         {
-            return associationType.Constraint.ToRole.Name.Remove(associationType.Constraint.ToRole.Name.Length - SelfReferencingPostfix.Length, SelfReferencingPostfix.Length) == associationType.Constraint.FromRole.Name;
+            string to = associationType.Constraint.ToRole.Name;
+            string from = associationType.Constraint.FromRole.Name;
+
+            if (to.Length <= SelfReferencingPostfix.Length)
+            {
+                return false;
+            }
+
+            return to.Remove(to.Length - SelfReferencingPostfix.Length, SelfReferencingPostfix.Length) == from;
         }
 
         public string ToRoleEntitySetName { get; set; }