Fix parent child relation renames, fix sqlite relation renames

Author: pwelter34

src/EntityFrameworkCore.Generator.Core/Extensions/EnumerableExtensions.cs

@@ -0,0 +1,58 @@
+using System.Text;
+
+namespace EntityFrameworkCore.Generator.Extensions;
+
+public static class EnumerableExtensions
+{
+    public static string ToDelimitedString<T>(this IEnumerable<T> values)
+    {
+        return values.ToDelimitedString(",");
+    }
+
+    public static string ToDelimitedString<T>(this IEnumerable<T> values, string delimiter)
+    {
+        if (values is null)
+            return null;
+
+        var sb = new StringBuilder();
+        foreach (var i in values)
+        {
+            if (sb.Length > 0)
+                sb.Append(delimiter ?? ",");
+            sb.Append(i.ToString());
+        }
+
+        return sb.ToString();
+    }
+
+    public static string ToDelimitedString(this IEnumerable<string> values)
+    {
+        return values.ToDelimitedString(",");
+    }
+
+    public static string ToDelimitedString(this IEnumerable<string> values, string delimiter)
+    {
+        return values.ToDelimitedString(delimiter, null);
+    }
+
+    public static string ToDelimitedString(this IEnumerable<string> values, string delimiter, Func<string, string> escapeDelimiter)
+    {
+        if (values is null)
+            return null;
+
+        var sb = new StringBuilder();
+        foreach (var value in values)
+        {
+            if (sb.Length > 0)
+                sb.Append(delimiter);
+
+            var v = escapeDelimiter != null
+                ? escapeDelimiter(value ?? string.Empty)
+                : value ?? string.Empty;
+
+            sb.Append(v);
+        }
+
+        return sb.ToString();
+    }
+}

src/EntityFrameworkCore.Generator.Core/ModelGenerator.cs

@@ -323,9 +323,6 @@ private void CreateRelationship(EntityContext entityContext, Entity foreignEntit
         string primaryName = primaryEntity.EntityClass;
         string foreignName = foreignEntity.EntityClass;
 
-        string relationshipName = tableKeySchema.Name;
-        relationshipName = _namer.UniqueRelationshipName(relationshipName);
-
         var foreignMembers = GetKeyMembers(foreignEntity, tableKeySchema.Columns, tableKeySchema.Name);
         bool foreignMembersRequired = foreignMembers.Any(c => c.IsRequired);
 
@@ -336,6 +333,14 @@ private void CreateRelationship(EntityContext entityContext, Entity foreignEntit
         if (foreignMembers.Count == 0 || primaryMembers.Count == 0)
             return;
 
+        string relationshipName = tableKeySchema.Name;
+
+        // ensure relationship name for sync support
+        if (relationshipName.IsNullOrEmpty())
+            relationshipName = $"FK_{foreignName}_{primaryName}_{primaryMembers.Select(p => p.PropertyName).ToDelimitedString("_")}";
+
+        relationshipName = _namer.UniqueRelationshipName(relationshipName);
+
         Relationship foreignRelationship = foreignEntity.Relationships
             .FirstOrDefault(r => r.RelationshipName == relationshipName && r.IsForeignKey);
 

src/EntityFrameworkCore.Generator.Core/Parsing/SourceSynchronizer.cs

@@ -138,7 +138,7 @@ private void UpdateFromMapping(EntityContext generatedContext, string mappingDir
             // sync releationships
             foreach (var parsedRelationship in parsedEntity.Relationships)
             {
-                var relationship = entity.Relationships.FirstOrDefault(r => r.RelationshipName == parsedRelationship.RelationshipName);
+                var relationship = entity.Relationships.FirstOrDefault(r => r.RelationshipName == parsedRelationship.RelationshipName && r.IsForeignKey);
                 if (relationship == null)
                     continue;
 
@@ -195,7 +195,7 @@ private void RenameRelationship(ParsedRelationship parsedRelationship, Relations
         }
 
         var primaryEntity = relationship.PrimaryEntity;
-        var primaryRelationship = primaryEntity.Relationships.FirstOrDefault(r => r.RelationshipName == parsedRelationship.RelationshipName);
+        var primaryRelationship = primaryEntity.Relationships.FirstOrDefault(r => r.RelationshipName == parsedRelationship.RelationshipName && !r.IsForeignKey);
 
         if (primaryRelationship == null)
             return;