Remove navigation renaming (ErikEJ#954)

* Remove Navigation renaming for now * Update tools * fix up * fix tests
sdrig · May 2, 2021 · f9e962d · f9e962d
1 parent c9580d8
commit f9e962d
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 109 deletions.
diff --git a/src/GUI/EFCorePowerTools/ViewModels/ObjectTreeViewModel.cs b/src/GUI/EFCorePowerTools/ViewModels/ObjectTreeViewModel.cs
@@ -101,11 +101,7 @@ public IEnumerable<Schema> GetRenamedObjects()
                         .SelectMany(o => o.Columns.Where(c => c.Name != null && c.Name.Equals(c.NewName)))
                         .ToList();
 
-                    var originalNavigationReplacers = originalReplacers
-                        .Where(o => o.Navigations != null)
-                        .SelectMany(o => o.Navigations).ToList();
-
-                    if (objectIsRenamed || renamedColumns.Any() || ignoredReplacers.Any() || originalNavigationReplacers.Any())
+                    if (objectIsRenamed || renamedColumns.Any() || ignoredReplacers.Any())
                     {
                         var columnRenamers = renamedColumns
                             .Select(c => new ColumnNamer { Name = c.Name, NewName = c.NewName })
@@ -119,7 +115,6 @@ public IEnumerable<Schema> GetRenamedObjects()
                             Name = obj.Name,
                             NewName = obj.NewName,
                             Columns = columnRenamers.ToList(),
-                            Navigations = originalNavigationReplacers,
                         });
                     }
                 }

diff --git a/src/GUI/RevEng.Core/ReplacingCandidateNamingService.cs b/src/GUI/RevEng.Core/ReplacingCandidateNamingService.cs
@@ -120,79 +120,6 @@ public override string GenerateCandidateIdentifier(DatabaseColumn originalColumn
             return base.GenerateCandidateIdentifier(originalColumn);
         }
 
-//TODO Maybe re-enable navigation renaming ?
-#if CORE60
-#else
-        public override string GetPrincipalEndCandidateNavigationPropertyName(IForeignKey foreignKey, string dependentEndNavigationPropertyName)
-        {
-            var baseName = base.GetPrincipalEndCandidateNavigationPropertyName(foreignKey, dependentEndNavigationPropertyName);
-            var tableName = foreignKey.PrincipalEntityType.GetTableName();
-            var schemaName = foreignKey.PrincipalEntityType.GetSchema();
-
-            var schema = _customNameOptions
-                .Where(o => o.SchemaName == schemaName
-                    && o.Tables != null && o.Tables.Any())
-                .SingleOrDefault();
-
-            if (schema != null)
-            {
-                var table = schema.Tables
-                    .Where(t => t.Name == tableName
-                        && t.Navigations != null)
-                    .SingleOrDefault();
-
-                if (table != null)
-                {
-                    var navigationRenamer = table.Navigations
-                        .Where(n => n.Name == baseName)
-                        .SingleOrDefault();
-
-                    if (navigationRenamer != null && navigationRenamer.NewName != null)
-                    {
-                        return navigationRenamer.NewName;
-                    }
-                }
-            }
-
-            return baseName;
-        }
-
-        public override string GetDependentEndCandidateNavigationPropertyName(IForeignKey foreignKey)
-        {
-            var baseName = base.GetDependentEndCandidateNavigationPropertyName(foreignKey);
-
-            var tableName = foreignKey.DeclaringEntityType.GetTableName();
-            var schemaName = foreignKey.DeclaringEntityType.GetSchema();
-
-            var schema = _customNameOptions
-                .Where(o => o.SchemaName == schemaName
-                    && o.Tables != null && o.Tables.Any())
-                .SingleOrDefault();
-
-            if (schema != null)
-            {
-                var table = schema.Tables
-                    .Where(t => t.Name == tableName
-                        && t.Navigations != null)
-                    .SingleOrDefault();
-
-                if (table != null)
-                {
-                    var navigationRenamer = table.Navigations
-                        .Where(n => n.Name == baseName)
-                        .SingleOrDefault();
-
-                    if (navigationRenamer != null && navigationRenamer.NewName != null)
-                    {
-                        return navigationRenamer.NewName;
-                    }
-                }
-            }
-
-            return baseName;
-        }
-#endif
-
         private Schema GetSchema(string originalSchema)
             => _customNameOptions?
                     .FirstOrDefault(x => x.SchemaName == originalSchema);

diff --git a/src/GUI/RevEng.Shared/NavigationRenamer.cs b/src/GUI/RevEng.Shared/NavigationRenamer.cs
diff --git a/src/GUI/RevEng.Shared/TableRenamer.cs b/src/GUI/RevEng.Shared/TableRenamer.cs
@@ -14,8 +14,5 @@ public class TableRenamer
 
         [DataMember(EmitDefaultValue = false, IsRequired = false)]
         public List<ColumnNamer> Columns { get; set; }
-
-        [DataMember(EmitDefaultValue = false, IsRequired = false)]
-        public List<NavigationRenamer> Navigations { get; set; }
     }
 }
diff --git a/src/GUI/UnitTests/ViewModels/ObjectTreeViewModelTests.cs b/src/GUI/UnitTests/ViewModels/ObjectTreeViewModelTests.cs
@@ -150,20 +150,12 @@ public void AddObjects_Replacers_Issue679()
                             new ColumnNamer { Name = "EMPCode", NewName = "EMPCode" },
 
                         },
-                        Navigations = new List<NavigationRenamer>
-                        {
-                            new NavigationRenamer { Name = "First", NewName = "Second" },
-                        },
                     },
                     new TableRenamer
                     {
                         Name = "same",
                         NewName = "same",
                         Columns = new List<ColumnNamer>(),
-                        Navigations = new List<NavigationRenamer>
-                        {
-                            new NavigationRenamer { Name = "SameFirst", NewName = "SameSecond" },
-                        },
                     },
                 },
             };
@@ -174,13 +166,9 @@ public void AddObjects_Replacers_Issue679()
             var renamers = vm.GetRenamedObjects().ToList();
 
             // Assert
-            Assert.AreEqual(3, renamers[0].Tables.Count);
+            Assert.AreEqual(2, renamers[0].Tables.Count);
             Assert.AreEqual(1, renamers[0].Tables[0].Columns.Count);
-            Assert.AreEqual(0, renamers[0].Tables[0].Navigations.Count);
             Assert.AreEqual(1, renamers[0].Tables[1].Columns.Count);
-            Assert.AreEqual(1, renamers[0].Tables[1].Navigations.Count);
-            Assert.AreEqual(0, renamers[0].Tables[2].Columns.Count);
-            Assert.AreEqual(1, renamers[0].Tables[1].Navigations.Count);
         }
 
         [Test]

diff --git a/src/GUI/lib/efreveng.exe.zip b/src/GUI/lib/efreveng.exe.zip
diff --git a/src/GUI/lib/efreveng50.exe.zip b/src/GUI/lib/efreveng50.exe.zip
diff --git a/src/GUI/lib/efreveng60.exe.zip b/src/GUI/lib/efreveng60.exe.zip