Skip to content

Commit 71fa384

Browse files
authored
Remove quirks from main (#26736)
1 parent ae256a1 commit 71fa384

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

src/EFCore.Relational/Extensions/RelationalEntityTypeExtensions.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,7 @@ public static void SetTableName(this IMutableEntityType entityType, string? name
135135
/// <returns>The database schema that contains the mapped table.</returns>
136136
public static string? GetSchema(this IReadOnlyEntityType entityType)
137137
{
138-
if (entityType.GetTableName() == null
139-
&& !(AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue26651", out var enabled) && enabled))
138+
if (entityType.GetTableName() == null)
140139
{
141140
return null;
142141
}

src/EFCore/Metadata/Internal/InternalForeignKeyBuilder.cs

+3-7
Original file line numberDiff line numberDiff line change
@@ -973,15 +973,11 @@ private static bool IsCompatible(
973973
Metadata.DeclaringEntityType.Model.ScopedModelDependencies?.Logger.AmbiguousEndRequiredWarning(Metadata);
974974
}
975975

976-
if (AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue26611", out var enabled) && enabled)
977-
{
978-
Metadata.SetIsRequired(required, configurationSource);
979-
return this;
980-
}
981-
982976
IConventionForeignKey? foreignKey = Metadata;
983-
var result = Metadata.DeclaringEntityType.Model.ConventionDispatcher.Track(
977+
978+
Metadata.DeclaringEntityType.Model.ConventionDispatcher.Track(
984979
() => Metadata.SetIsRequired(required, configurationSource), ref foreignKey);
980+
985981
if (foreignKey != null)
986982
{
987983
return ((ForeignKey)foreignKey).Builder;

0 commit comments

Comments
 (0)