Be consistent about OnModelCreating as the terminology for fluent API

Use "navigation" rather than "navigation property"
Check usage of {foreignKey} and for correct quoting and use foreignKeyProperties where appropriate
Fix AnnotationNotFound, BadFilterDerivedType, CircularDependency
Update DisplayName for shared-type entity types to include the entity type name

Part of #7201
Fixes #22310

src/EFCore.Cosmos/Properties/CosmosStrings.resx

@@ -175,7 +175,7 @@
     <value>There is no string-based representation of this query as it's executed using 'ReadItemQueryAsync({resourceId}, {partitionKey})'.</value>
   </data>
   <data name="NullTypeMappingInSqlTree" xml:space="preserve">
-    <value>Null TypeMapping in Sql Tree.</value>
+    <value>Null TypeMapping in SQL tree.</value>
   </data>
   <data name="OffsetRequiresLimit" xml:space="preserve">
     <value>Offset is not supported without Limit.</value>

src/EFCore.Design/Properties/DesignStrings.resx

@@ -196,7 +196,7 @@
     <value>Could not scaffold the foreign key '{foreignKeyName}'. The referenced table could not be found. This most likely occurred because the referenced table was excluded from scaffolding.</value>
   </data>
   <data name="ForeignKeyScaffoldErrorPrincipalTableScaffoldingError" xml:space="preserve">
-    <value>Could not scaffold the foreign key '{foreignKeyName}'. The referenced table '{principaltableName}' could not be scaffolded.</value>
+    <value>Could not scaffold the foreign key '{foreignKeyName}'. The referenced table '{principalTableName}' could not be scaffolded.</value>
   </data>
   <data name="ForeignKeyScaffoldErrorPropertyNotFound" xml:space="preserve">
     <value>Could not scaffold the foreign key '{foreignKeyName}'.  The following columns in the foreign key could not be scaffolded: {columnNames}.</value>

src/EFCore.Relational/Extensions/Internal/TupleExtensions.cs

@@ -24,7 +24,7 @@ public static class TupleExtensions
         /// </summary>
         public static string FormatTables([NotNull] this IEnumerable<(string Table, string Schema)> tables)
             => "{"
-                + string.Join(", ", tables.Select(FormatTable))
+                + string.Join(", ", tables.Select(t => "'" + FormatTable(t) + "'"))
                 + "}";
 
         /// <summary>
@@ -34,8 +34,6 @@ public static string FormatTables([NotNull] this IEnumerable<(string Table, stri
         ///     doing so can result in application failures when updating to a new Entity Framework Core release.
         /// </summary>
         public static string FormatTable(this (string Table, string Schema) table)
-            => "'"
-                + (table.Schema == null ? table.Table : table.Schema + "." + table.Table)
-                + "'";
+            => table.Schema == null ? table.Table : table.Schema + "." + table.Table;
     }
 }

src/EFCore.Relational/Update/ColumnModification.cs

@@ -384,7 +384,7 @@ public virtual void AddSharedColumnModification([NotNull] ColumnModification mod
                             Entry.BuildCurrentValuesString(Entry.EntityType.FindPrimaryKey().Properties),
                             Entry.BuildCurrentValuesString(new[] { Property }),
                             modification.Entry.BuildCurrentValuesString(new[] { modification.Property }),
-                            "{'" + ColumnName + "'}"));
+                            ColumnName));
                 }
 
                 throw new InvalidOperationException(
@@ -393,7 +393,7 @@ public virtual void AddSharedColumnModification([NotNull] ColumnModification mod
                         modification.Entry.EntityType.DisplayName(),
                         new[] { Property }.Format(),
                         new[] { modification.Property }.Format(),
-                        "{'" + ColumnName + "'}"));
+                        ColumnName));
             }
 
             if (UseOriginalValueParameter
@@ -416,7 +416,7 @@ public virtual void AddSharedColumnModification([NotNull] ColumnModification mod
                                 Entry.BuildCurrentValuesString(Entry.EntityType.FindPrimaryKey().Properties),
                                 Entry.BuildOriginalValuesString(new[] { Property }),
                                 modification.Entry.BuildOriginalValuesString(new[] { modification.Property }),
-                                "{'" + ColumnName + "'}"));
+                                ColumnName));
                     }
 
                     throw new InvalidOperationException(
@@ -425,7 +425,7 @@ public virtual void AddSharedColumnModification([NotNull] ColumnModification mod
                             modification.Entry.EntityType.DisplayName(),
                             new[] { Property }.Format(),
                             new[] { modification.Property }.Format(),
-                            "{'" + ColumnName + "'}"));
+                            ColumnName));
                 }
             }
 

src/EFCore.Relational/Update/Internal/CommandBatchPreparer.cs

@@ -316,6 +316,11 @@ private string FormatCycle(IReadOnlyList<Tuple<ModificationCommand, Modification
                 }
             }
 
+            if (!_sensitiveLoggingEnabled)
+            {
+                builder.Append(CoreStrings.SensitiveDataDisabled);
+            }
+
             return builder.ToString();
         }
 
@@ -359,10 +364,13 @@ private void Format(IForeignKey foreignKey, ModificationCommand source, Modifica
             var reverseDependency = !source.Entries.Any(e => foreignKey.DeclaringEntityType.IsAssignableFrom(e.EntityType));
             if (reverseDependency)
             {
-                builder.Append(" <-");
+                builder.AppendLine(" <-");
+            }
+            else
+            {
+                builder.Append(" ");
             }
 
-            builder.Append(" ");
             if (foreignKey.DependentToPrincipal != null
                 || foreignKey.PrincipalToDependent != null)
             {
@@ -416,7 +424,7 @@ private void Format(IForeignKey foreignKey, ModificationCommand source, Modifica
 
             if (!reverseDependency)
             {
-                builder.Append("<- ");
+                builder.AppendLine("<-");
             }
         }
 
@@ -425,10 +433,14 @@ private void Format(IIndex index, ModificationCommand source, ModificationComman
             var reverseDependency = source.EntityState != EntityState.Deleted;
             if (reverseDependency)
             {
-                builder.Append(" <-");
+                builder.AppendLine(" <-");
+            }
+            else
+            {
+                builder.Append(" ");
             }
 
-            builder.Append(" Index ");
+            builder.Append("Index ");
 
             var dependentCommand = reverseDependency ? target : source;
             var dependentEntry = dependentCommand.Entries.First(e => index.DeclaringEntityType.IsAssignableFrom(e.EntityType));
@@ -455,7 +467,7 @@ private void Format(IIndex index, ModificationCommand source, ModificationComman
 
             if (!reverseDependency)
             {
-                builder.Append("<- ");
+                builder.AppendLine("<-");
             }
         }