Avoid reduntant looping in property metadata

Fixes #29642
dotnet · Dec 12, 2022 · 1f12a1e · 1f12a1e
1 parent 4a2118f
commit 1f12a1e
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 10 deletions.
diff --git a/src/EFCore.Design/Scaffolding/Internal/CSharpRuntimeModelCodeGenerator.cs b/src/EFCore.Design/Scaffolding/Internal/CSharpRuntimeModelCodeGenerator.cs
@@ -858,29 +858,37 @@ private void Create(
         var principalProperty = property;
         for (var i = 0; i < 10000; i++)
         {
+            IProperty? nextProperty = null;
             foreach (var foreignKey in principalProperty.GetContainingForeignKeys())
             {
                 for (var propertyIndex = 0; propertyIndex < foreignKey.Properties.Count; propertyIndex++)
                 {
                     if (principalProperty == foreignKey.Properties[propertyIndex])
                     {
                         var newPrincipalProperty = foreignKey.PrincipalKey.Properties[propertyIndex];
-                        if (property == principalProperty
+                        if (newPrincipalProperty == property
                             || newPrincipalProperty == principalProperty)
                         {
                             break;
                         }
 
-                        principalProperty = newPrincipalProperty;
-
-                        type = (Type?)principalProperty[CoreAnnotationNames.ValueConverterType];
+                        type = (Type?)newPrincipalProperty[CoreAnnotationNames.ValueConverterType];
                         if (type != null)
                         {
                             return type;
                         }
+
+                        nextProperty = newPrincipalProperty;
                     }
                 }
             }
+
+            if (nextProperty == null)
+            {
+                break;
+            }
+
+            principalProperty = nextProperty;
         }
 
         return null;

diff --git a/src/EFCore/Metadata/Internal/Property.cs b/src/EFCore/Metadata/Internal/Property.cs
@@ -670,6 +670,7 @@ public virtual PropertySaveBehavior GetAfterSaveBehavior()
         var property = this;
         for (var i = 0; i < 10000; i++)
         {
+            Property? nextProperty = null;
             foreach (var foreignKey in property.GetContainingForeignKeys())
             {
                 for (var propertyIndex = 0; propertyIndex < foreignKey.Properties.Count; propertyIndex++)
@@ -683,16 +684,23 @@ public virtual PropertySaveBehavior GetAfterSaveBehavior()
                             break;
                         }
 
-                        property = principalProperty;
-
-                        converter = (ValueConverter?)property[CoreAnnotationNames.ValueConverter];
+                        converter = (ValueConverter?)principalProperty[CoreAnnotationNames.ValueConverter];
                         if (converter != null)
                         {
                             return converter;
                         }
+
+                        nextProperty = principalProperty;
                     }
                 }
             }
+
+            if (nextProperty == null)
+            {
+                break;
+            }
+
+            property = nextProperty;
         }
 
         return null;
@@ -749,6 +757,7 @@ public virtual PropertySaveBehavior GetAfterSaveBehavior()
         var property = this;
         for (var i = 0; i < 10000; i++)
         {
+            Property? nextProperty = null;
             foreach (var foreignKey in property.GetContainingForeignKeys())
             {
                 for (var propertyIndex = 0; propertyIndex < foreignKey.Properties.Count; propertyIndex++)
@@ -762,16 +771,23 @@ public virtual PropertySaveBehavior GetAfterSaveBehavior()
                             break;
                         }
 
-                        property = principalProperty;
-
-                        type = (Type?)property[CoreAnnotationNames.ProviderClrType];
+                        type = (Type?)principalProperty[CoreAnnotationNames.ProviderClrType];
                         if (type != null)
                         {
                             return type;
                         }
+
+                        nextProperty = principalProperty;
                     }
                 }
             }
+
+            if (nextProperty == null)
+            {
+                break;
+            }
+
+            property = nextProperty;
         }
 
         return null;