Remove fks with excluded columns (#2392)

* add Navigation comment to sample * Remove fks that include excluded columns fixes #2391
ErikEJ · Jun 11, 2024 · 7b32fc6 · 7b32fc6
1 parent bfd082d
commit 7b32fc6
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/samples/CodeTemplates/EFCore/EntityType.t4 b/samples/CodeTemplates/EFCore/EntityType.t4
@@ -145,6 +145,16 @@ public partial class <#= EntityType.Name #>
         }
         else
         {
+            var comment = navigation.ForeignKey.Properties.FirstOrDefault()?.GetComment();
+            if (!string.IsNullOrEmpty(comment))
+            {
+#>
+    /// <summary>
+    /// <#= code.XmlComment(comment, indent: 1) #>
+    /// </summary>
+<#
+            }
+
             var needsNullable = Options.UseNullableReferenceTypes && !(navigation.ForeignKey.IsRequired && navigation.IsOnDependent);
             var needsInitializer = Options.UseNullableReferenceTypes && navigation.ForeignKey.IsRequired && navigation.IsOnDependent;
 #>

diff --git a/src/Core/RevEng.Core.60/ColumnRemovingScaffoldingModelFactory.cs b/src/Core/RevEng.Core.60/ColumnRemovingScaffoldingModelFactory.cs
@@ -99,6 +99,23 @@ protected override EntityTypeBuilder VisitTable(ModelBuilder modelBuilder, Datab
                 {
                     table.UniqueConstraints.Remove(constraint);
                 }
+
+                var fksToBeRemoved = new List<DatabaseForeignKey>();
+                foreach (var fk in table.ForeignKeys)
+                {
+                    foreach (var column in fk.Columns)
+                    {
+                        if (excludedColumns.Contains(column))
+                        {
+                            fksToBeRemoved.Add(fk);
+                        }
+                    }
+                }
+
+                foreach (var fk in fksToBeRemoved)
+                {
+                    table.ForeignKeys.Remove(fk);
+                }
             }
 
             return base.VisitTable(modelBuilder, table);