Add a check to ShouldUseSameServiceProvider even when the extension h…

…as no options Fixes #26109
dotnet · Sep 20, 2021 · 501c60a · 501c60a
1 parent ccde2d5
commit 501c60a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/src/EFCore.Relational/Infrastructure/RelationalOptionsExtension.cs b/src/EFCore.Relational/Infrastructure/RelationalOptionsExtension.cs
@@ -446,7 +446,7 @@ public override int GetServiceProviderHashCode()
             /// <param name="other"> The other extension. </param>
             /// <returns> A value indicating whether all of the options that require a new service provider are the same. </returns>
             public override bool ShouldUseSameServiceProvider(DbContextOptionsExtensionInfo other)
-                => true;
+                => other is RelationalExtensionInfo;
 
             /// <summary>
             ///     A message fragment for logging typically containing information about

diff --git a/...EFCore.SqlServer.NTS/Infrastructure/Internal/SqlServerNetTopologySuiteOptionsExtension.cs b/...EFCore.SqlServer.NTS/Infrastructure/Internal/SqlServerNetTopologySuiteOptionsExtension.cs
@@ -77,7 +77,7 @@ public override int GetServiceProviderHashCode()
                 => 0;
 
             public override bool ShouldUseSameServiceProvider(DbContextOptionsExtensionInfo other)
-                => true;
+                => other is ExtensionInfo;
 
             public override void PopulateDebugInfo(IDictionary<string, string> debugInfo)
                 => debugInfo["SqlServer:" + nameof(SqlServerNetTopologySuiteDbContextOptionsBuilderExtensions.UseNetTopologySuite)] = "1";

diff --git a/src/EFCore.SqlServer/Infrastructure/Internal/SqlServerOptionsExtension.cs b/src/EFCore.SqlServer/Infrastructure/Internal/SqlServerOptionsExtension.cs
@@ -83,6 +83,9 @@ public ExtensionInfo(IDbContextOptionsExtension extension)
             public override bool IsDatabaseProvider
                 => true;
 
+            public override bool ShouldUseSameServiceProvider(DbContextOptionsExtensionInfo other)
+                => other is ExtensionInfo;
+
             public override string LogFragment
             {
                 get

diff --git a/src/EFCore.Sqlite.Core/Infrastructure/Internal/SqliteOptionsExtension.cs b/src/EFCore.Sqlite.Core/Infrastructure/Internal/SqliteOptionsExtension.cs
@@ -109,6 +109,9 @@ public ExtensionInfo(IDbContextOptionsExtension extension)
             public override bool IsDatabaseProvider
                 => true;
 
+            public override bool ShouldUseSameServiceProvider(DbContextOptionsExtensionInfo other)
+                => other is ExtensionInfo;
+
             public override string LogFragment
             {
                 get

diff --git a/src/EFCore.Sqlite.NTS/Infrastructure/Internal/SqliteNetTopologySuiteOptionsExtension.cs b/src/EFCore.Sqlite.NTS/Infrastructure/Internal/SqliteNetTopologySuiteOptionsExtension.cs
@@ -80,7 +80,7 @@ public override int GetServiceProviderHashCode()
                 => 0;
 
             public override bool ShouldUseSameServiceProvider(DbContextOptionsExtensionInfo other)
-                => true;
+                => other is ExtensionInfo;
 
             public override void PopulateDebugInfo(IDictionary<string, string> debugInfo)
                 => debugInfo["NetTopologySuite"] = "1";