Fix for #109.

Author: msallin

SQLite.CodeFirst.Console/Entity/FooCompositeKey.cs

@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace SQLite.CodeFirst.Console.Entity
+{
+	/// <summary>
+	/// See https://github.com/msallin/SQLiteCodeFirst/issues/109
+	/// </summary>
+	public class FooCompositeKey
+	{
+		[Key, Column(Order = 1)]
+		public int Id { get; set; }
+
+		[Key, Column(Order = 2), StringLength(20)]
+		public string Version { get; set; }
+
+		[StringLength(255)]
+		public string Name { get; set; }
+
+		public virtual ICollection<FooRelationshipA> FooeyACollection { get; set; }
+
+		public virtual ICollection<FooRelationshipB> FooeyBCollection { get; set; }
+	}
+}

SQLite.CodeFirst.Console/Entity/FooRelationshipA.cs

@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+
+namespace SQLite.CodeFirst.Console.Entity
+{
+	/// <summary>
+	/// See https://github.com/msallin/SQLiteCodeFirst/issues/109
+	/// </summary>
+	public class FooRelationshipA
+	{
+		public int Id { get; set; }
+
+		[StringLength(255)]
+		public string Name { get; set; }
+
+		public virtual ICollection<FooCompositeKey> Fooey { get; set; }
+	}
+}

SQLite.CodeFirst.Console/Entity/FooRelationshipB.cs

@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+
+namespace SQLite.CodeFirst.Console.Entity
+{
+	/// <summary>
+	/// See https://github.com/msallin/SQLiteCodeFirst/issues/109
+	/// </summary>
+	public class FooRelationshipB
+	{
+		public int Id { get; set; }
+
+		[StringLength(255)]
+		public string Name { get; set; }
+
+		public virtual ICollection<FooCompositeKey> Fooey { get; set; }
+	}
+}

SQLite.CodeFirst.Console/ModelConfiguration.cs

@@ -12,6 +12,7 @@ public static void Configure(DbModelBuilder modelBuilder)
             ConfigureCoachEntity(modelBuilder);
             ConfigurePlayerEntity(modelBuilder);
             ConfigureSelfReferencingEntities(modelBuilder);
+            ConfigureCompositeKeyEntities(modelBuilder);
         }
 
         private static void ConfigureTeamEntity(DbModelBuilder modelBuilder)
@@ -54,5 +55,12 @@ private static void ConfigureSelfReferencingEntities(DbModelBuilder modelBuilder
             modelBuilder.Entity<FooSelf>();
             modelBuilder.Entity<FooStep>();
         }
+
+        private static void ConfigureCompositeKeyEntities(DbModelBuilder modelBuilder)
+        {
+            modelBuilder.Entity<FooCompositeKey>();
+            modelBuilder.Entity<FooRelationshipA>();
+            modelBuilder.Entity<FooRelationshipB>();
+        }
     }
 }

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

@@ -74,6 +74,9 @@
     </Compile>
     <Compile Include="Entity\Coach.cs" />
     <Compile Include="Entity\CustomHistory.cs" />
+    <Compile Include="Entity\FooCompositeKey.cs" />
+    <Compile Include="Entity\FooRelationshipA.cs" />
+    <Compile Include="Entity\FooRelationshipB.cs" />
     <Compile Include="Entity\IEntity.cs" />
     <Compile Include="Entity\Person.cs" />
     <Compile Include="Entity\Player.cs" />

SQLite.CodeFirst.Test/IntegrationTests/SqlGenerationTest.cs

@@ -21,6 +21,11 @@ public class SqlGenerationTest
 CREATE TABLE ""Foos"" ([FooId] INTEGER PRIMARY KEY, [Name] nvarchar, [FooSelf1Id] int, [FooSelf2Id] int, [FooSelf3Id] int, FOREIGN KEY (FooSelf1Id) REFERENCES ""Foos""(FooId), FOREIGN KEY (FooSelf2Id) REFERENCES ""Foos""(FooId), FOREIGN KEY (FooSelf3Id) REFERENCES ""Foos""(FooId));
 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 TABLE ""FooCompositeKeys"" ([Id] int NOT NULL, [Version] nvarchar (20) NOT NULL, [Name] nvarchar (255), PRIMARY KEY(Id, Version));
+CREATE TABLE ""FooRelationshipAs"" ([Id] INTEGER PRIMARY KEY, [Name] nvarchar (255));
+CREATE TABLE ""FooRelationshipBs"" ([Id] INTEGER PRIMARY KEY, [Name] nvarchar (255));
+CREATE TABLE ""FooRelationshipAFooCompositeKeys"" ([FooRelationshipA_Id] int NOT NULL, [FooCompositeKey_Id] int NOT NULL, [FooCompositeKey_Version] nvarchar (20) NOT NULL, PRIMARY KEY(FooRelationshipA_Id, FooCompositeKey_Id, FooCompositeKey_Version), FOREIGN KEY (FooRelationshipA_Id) REFERENCES ""FooRelationshipAs""(Id) ON DELETE CASCADE, FOREIGN KEY (FooCompositeKey_Id, FooCompositeKey_Version) REFERENCES ""FooCompositeKeys""(Id, Version) ON DELETE CASCADE);
+CREATE TABLE ""FooRelationshipBFooCompositeKeys"" ([FooRelationshipB_Id] int NOT NULL, [FooCompositeKey_Id] int NOT NULL, [FooCompositeKey_Version] nvarchar (20) NOT NULL, PRIMARY KEY(FooRelationshipB_Id, FooCompositeKey_Id, FooCompositeKey_Version), FOREIGN KEY (FooRelationshipB_Id) REFERENCES ""FooRelationshipBs""(Id) ON DELETE CASCADE, FOREIGN KEY (FooCompositeKey_Id, FooCompositeKey_Version) REFERENCES ""FooCompositeKeys""(Id, Version) ON DELETE CASCADE);
 CREATE  INDEX ""IX_MyTable_Id"" ON ""MyTable"" (Id);
 CREATE  INDEX ""IX_Team_TeamsName"" ON ""MyTable"" (Name);
 CREATE  INDEX ""IX_TeamPlayer_Number"" ON ""TeamPlayer"" (Number);
@@ -32,7 +37,11 @@ public class SqlGenerationTest
 CREATE  INDEX ""IX_Foo_FooSelf2Id"" ON ""Foos"" (FooSelf2Id);
 CREATE  INDEX ""IX_Foo_FooSelf3Id"" ON ""Foos"" (FooSelf3Id);
 CREATE  INDEX ""IX_FooSelf_FooId"" ON ""FooSelves"" (FooId);
-CREATE  INDEX ""IX_FooStep_FooId"" ON ""FooSteps"" (FooId);";
+CREATE  INDEX ""IX_FooStep_FooId"" ON ""FooSteps"" (FooId);
+CREATE  INDEX ""IX_FooRelationshipAFooCompositeKey_FooRelationshipA_Id"" ON ""FooRelationshipAFooCompositeKeys"" (FooRelationshipA_Id);
+CREATE  INDEX ""IX_FooRelationshipAFooCompositeKey_FooCompositeKey_Id_FooCompositeKey_Version"" ON ""FooRelationshipAFooCompositeKeys"" (FooCompositeKey_Id, FooCompositeKey_Version);
+CREATE  INDEX ""IX_FooRelationshipBFooCompositeKey_FooRelationshipB_Id"" ON ""FooRelationshipBFooCompositeKeys"" (FooRelationshipB_Id);
+CREATE  INDEX ""IX_FooRelationshipBFooCompositeKey_FooCompositeKey_Id_FooCompositeKey_Version"" ON ""FooRelationshipBFooCompositeKeys"" (FooCompositeKey_Id, FooCompositeKey_Version);";
 
         private static string generatedSql;
 

SQLite.CodeFirst/Internal/Convention/SqliteForeignKeyIndexConvention.cs

@@ -46,7 +46,11 @@ public virtual void Apply(AssociationType item, DbModel model)
                 }
 
                 string tableName = item.Constraint.ToRole.GetEntityType().GetTableName();
-                string propertyName = edmProperty.Name;
+
+                // Special treatment for composite primary keys
+                string propertyName = item.Constraint.FromProperties.Count > 1 
+                    ? String.Join("_", item.Constraint.ToProperties) 
+                    : edmProperty.Name;
 
                 // The original attribute is removed. The none-ForeignKeyIndicies will be remained and readded without any modification
                 // and the foreignKeyIncidies will be readded with the correct name.