#834 SQLite - Support multiple foreign keys. Thanks to statler

sjh37 · May 28, 2024 · cc8fc96 · cc8fc96
1 parent 184e488
commit cc8fc96
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 17 deletions.
diff --git a/EntityFramework.Reverse.POCO.Generator/EF.Reverse.POCO.v3.ttinclude b/EntityFramework.Reverse.POCO.Generator/EF.Reverse.POCO.v3.ttinclude
@@ -14906,7 +14906,7 @@ SELECT m.name AS FK_Table,
        p.[from] AS FK_Column,
        p.[table] AS PK_Table,
        p.[to] AS PK_Column,
-       'FK_' || TRIM(m.name) || '_' || TRIM(p.[to]) as Constraint_Name,
+       'FK_' || TRIM(m.name) || '_' || TRIM(p.[from]) || '_' || TRIM(p.[to]) as Constraint_Name,
        'main' as fkSchema,
        'main' as pkSchema,
        p.[to] AS primarykey,

diff --git a/Generator.Tests.Integration/SingleDatabaseTestSQLite.cs b/Generator.Tests.Integration/SingleDatabaseTestSQLite.cs
@@ -1,11 +1,11 @@
-using System.IO;
-using System.Threading;
+using System;
 using Efrpg;
+using Efrpg.FileManagement;
 using Efrpg.Templates;
 using Generator.Tests.Common;
-using NUnit.Framework;
-using Efrpg.FileManagement;
 using Microsoft.Data.Sqlite;
+using NUnit.Framework;
+using System.IO;
 
 namespace Generator.Tests.Integration
 {
@@ -77,12 +77,13 @@ CONSTRAINT [PK_Efrpg] PRIMARY KEY (Id)
 
 CREATE TABLE EfrpgItems
 (
-    Id        INTEGER PRIMARY KEY,
-    EfrpgId   INTEGER NOT NULL,
-    Test      INT     NOT NULL,
+    Id INTEGER PRIMARY KEY,
+    EfrpgId INTEGER NOT NULL,
+    ParentEfrpgId INTEGER NULL,
+    Test INT NOT NULL,
     CreatedAt DATETIME DEFAULT CURRENT_TIMESTAMP,
-    FOREIGN KEY (EfrpgId) REFERENCES [Efrpg] (Id)
-        ON DELETE CASCADE ON UPDATE NO ACTION
+    FOREIGN KEY (EfrpgId) REFERENCES [Efrpg] (Id) ON DELETE CASCADE ON UPDATE NO ACTION,
+    FOREIGN KEY (ParentEfrpgId) REFERENCES [Efrpg] (Id) ON DELETE CASCADE ON UPDATE NO ACTION
 );
 
 CREATE INDEX [IX_Efrpg] ON [Efrpg] ([TEXT3]);
@@ -108,6 +109,9 @@ INSERT INTO EfrpgItems (Id, EfrpgId, Test)
 ";
             cmd.ExecuteNonQuery();
             connection.Close();
+
+            Console.WriteLine($"Database: {Filename}");
+            Console.WriteLine($"ConnectionString: {ConnectionString}");
         }
 
         [Test]

diff --git a/Generator.Tests.Integration/TestComparison/EfrpgTest_SQLite_EfCore8_FkLegacy.cs b/Generator.Tests.Integration/TestComparison/EfrpgTest_SQLite_EfCore8_FkLegacy.cs
@@ -869,15 +869,21 @@ public class Efrpg
         // Reverse navigation
 
         /// <summary>
-        /// Child EfrpgItems where [EfrpgItems].[EfrpgId] point to this entity (FK_EfrpgItems_Id)
+        /// Child EfrpgItems where [EfrpgItems].[EfrpgId] point to this entity (FK_EfrpgItems_EfrpgId_Id)
         /// </summary>
-        public virtual ICollection<EfrpgItem> EfrpgItems { get; set; } // EfrpgItems.FK_EfrpgItems_Id
+        public virtual ICollection<EfrpgItem> EfrpgItems_EfrpgId { get; set; } // EfrpgItems.FK_EfrpgItems_EfrpgId_Id
+
+        /// <summary>
+        /// Child EfrpgItems where [EfrpgItems].[ParentEfrpgId] point to this entity (FK_EfrpgItems_ParentEfrpgId_Id)
+        /// </summary>
+        public virtual ICollection<EfrpgItem> EfrpgItems_ParentEfrpgId { get; set; } // EfrpgItems.FK_EfrpgItems_ParentEfrpgId_Id
 
         public Efrpg()
         {
             Text8 = "Hello";
             Int1 = 123;
-            EfrpgItems = new List<EfrpgItem>();
+            EfrpgItems_ParentEfrpgId = new List<EfrpgItem>();
+            EfrpgItems_EfrpgId = new List<EfrpgItem>();
         }
     }
 
@@ -886,15 +892,21 @@ public class EfrpgItem
     {
         public long Id { get; set; } // Id (Primary key)
         public long EfrpgId { get; set; } // EfrpgId
+        public long? ParentEfrpgId { get; set; } // ParentEfrpgId
         public long Test { get; set; } // Test
         public DateTime? CreatedAt { get; set; } // CreatedAt
 
         // Foreign keys
 
         /// <summary>
-        /// Parent Efrpg pointed by [EfrpgItems].([EfrpgId]) (FK_EfrpgItems_Id)
+        /// Parent Efrpg pointed by [EfrpgItems].([EfrpgId]) (FK_EfrpgItems_EfrpgId_Id)
+        /// </summary>
+        public virtual Efrpg Efrpg_EfrpgId { get; set; } // FK_EfrpgItems_EfrpgId_Id
+
+        /// <summary>
+        /// Parent Efrpg pointed by [EfrpgItems].([ParentEfrpgId]) (FK_EfrpgItems_ParentEfrpgId_Id)
         /// </summary>
-        public virtual Efrpg Efrpg { get; set; } // FK_EfrpgItems_Id
+        public virtual Efrpg ParentEfrpg { get; set; } // FK_EfrpgItems_ParentEfrpgId_Id
     }
 
     // ThisIsAView
@@ -967,11 +979,13 @@ public void Configure(EntityTypeBuilder<EfrpgItem> builder)
 
             builder.Property(x => x.Id).HasColumnName(@"Id").HasColumnType("integer").IsRequired().ValueGeneratedOnAdd();
             builder.Property(x => x.EfrpgId).HasColumnName(@"EfrpgId").HasColumnType("integer").IsRequired();
+            builder.Property(x => x.ParentEfrpgId).HasColumnName(@"ParentEfrpgId").HasColumnType("integer").IsRequired(false);
             builder.Property(x => x.Test).HasColumnName(@"Test").HasColumnType("int").IsRequired();
             builder.Property(x => x.CreatedAt).HasColumnName(@"CreatedAt").HasColumnType("datetime").IsRequired(false);
 
             // Foreign keys
-            builder.HasOne(a => a.Efrpg).WithMany(b => b.EfrpgItems).HasForeignKey(c => c.EfrpgId).HasConstraintName("FK_EfrpgItems_Id");
+            builder.HasOne(a => a.Efrpg_EfrpgId).WithMany(b => b.EfrpgItems_EfrpgId).HasForeignKey(c => c.EfrpgId).HasConstraintName("FK_EfrpgItems_EfrpgId_Id");
+            builder.HasOne(a => a.ParentEfrpg).WithMany(b => b.EfrpgItems_ParentEfrpgId).HasForeignKey(c => c.ParentEfrpgId).HasConstraintName("FK_EfrpgItems_ParentEfrpgId_Id");
         }
     }
 

diff --git a/Generator/Readers/SQLiteDatabaseReader.cs b/Generator/Readers/SQLiteDatabaseReader.cs
@@ -90,7 +90,7 @@ protected override string ForeignKeySQL()
        p.[from] AS FK_Column,
        p.[table] AS PK_Table,
        p.[to] AS PK_Column,
-       'FK_' || TRIM(m.name) || '_' || TRIM(p.[to]) as Constraint_Name,
+       'FK_' || TRIM(m.name) || '_' || TRIM(p.[from]) || '_' || TRIM(p.[to]) as Constraint_Name,
        'main' as fkSchema,
        'main' as pkSchema,
        p.[to] AS primarykey,