Remove ISingletonUpdateSqlGenerator and make IUpdateSqlGenerator singleton (#14610)

Issue #10651

Author: ajcvickers

src/EFCore.Relational/Infrastructure/EntityFrameworkRelationalServicesBuilder.cs

@@ -73,8 +73,7 @@ public static readonly IDictionary<Type, ServiceCharacteristics> RelationalServi
                 { typeof(ISelectExpressionFactory), new ServiceCharacteristics(ServiceLifetime.Singleton) },
                 { typeof(IExpressionFragmentTranslator), new ServiceCharacteristics(ServiceLifetime.Singleton) },
                 { typeof(ISqlTranslatingExpressionVisitorFactory), new ServiceCharacteristics(ServiceLifetime.Singleton) },
-                { typeof(IUpdateSqlGenerator), new ServiceCharacteristics(ServiceLifetime.Scoped) },
-                { typeof(ISingletonUpdateSqlGenerator), new ServiceCharacteristics(ServiceLifetime.Singleton) },
+                { typeof(IUpdateSqlGenerator), new ServiceCharacteristics(ServiceLifetime.Singleton) },
                 { typeof(IMemberTranslator), new ServiceCharacteristics(ServiceLifetime.Singleton) },
                 { typeof(ICompositeMethodCallTranslator), new ServiceCharacteristics(ServiceLifetime.Singleton) },
                 { typeof(IQuerySqlGeneratorFactory), new ServiceCharacteristics(ServiceLifetime.Singleton) },
@@ -169,15 +168,6 @@ public override EntityFrameworkServicesBuilder TryAddCoreServices()
             TryAdd<IEvaluatableExpressionFilter, RelationalEvaluatableExpressionFilter>();
             TryAdd<IRelationalTransactionFactory, RelationalTransactionFactory>();
 
-            TryAdd<ISingletonUpdateSqlGenerator>(
-                p =>
-                {
-                    using (var scope = p.CreateScope())
-                    {
-                        return scope.ServiceProvider.GetService<IUpdateSqlGenerator>();
-                    }
-                });
-
             ServiceCollectionMap.GetInfrastructure()
                 .AddDependencySingleton<RelationalCompositeMemberTranslatorDependencies>()
                 .AddDependencySingleton<RelationalSqlGenerationHelperDependencies>()

src/EFCore.Relational/Migrations/MigrationsSqlGenerator.cs

@@ -84,7 +84,7 @@ public MigrationsSqlGenerator([NotNull] MigrationsSqlGeneratorDependencies depen
         ///     The <see cref="IUpdateSqlGenerator" />.
         /// </summary>
         protected virtual IUpdateSqlGenerator SqlGenerator
-            => (IUpdateSqlGenerator)Dependencies.UpdateSqlGenerator;
+            => Dependencies.UpdateSqlGenerator;
 
         /// <summary>
         ///     Gets a comparer that can be used to compare two product versions.

src/EFCore.Relational/Migrations/MigrationsSqlGeneratorDependencies.cs

@@ -3,6 +3,7 @@
 
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.EntityFrameworkCore.Update;
 using Microsoft.EntityFrameworkCore.Update.Internal;
 using Microsoft.EntityFrameworkCore.Utilities;
 
@@ -50,7 +51,7 @@ public sealed class MigrationsSqlGeneratorDependencies
         /// <param name="typeMappingSource"> The type mapper. </param>
         public MigrationsSqlGeneratorDependencies(
             [NotNull] IRelationalCommandBuilderFactory commandBuilderFactory,
-            [NotNull] ISingletonUpdateSqlGenerator updateSqlGenerator,
+            [NotNull] IUpdateSqlGenerator updateSqlGenerator,
             [NotNull] ISqlGenerationHelper sqlGenerationHelper,
             [NotNull] IRelationalTypeMappingSource typeMappingSource)
         {
@@ -73,7 +74,7 @@ public MigrationsSqlGeneratorDependencies(
         /// <summary>
         ///     High level SQL generator.
         /// </summary>
-        public ISingletonUpdateSqlGenerator UpdateSqlGenerator { get; }
+        public IUpdateSqlGenerator UpdateSqlGenerator { get; }
 
         /// <summary>
         ///     Helpers for SQL generation.
@@ -102,7 +103,7 @@ public MigrationsSqlGeneratorDependencies With([NotNull] IRelationalCommandBuild
         /// </summary>
         /// <param name="updateSqlGenerator"> A replacement for the current dependency of this type. </param>
         /// <returns> A new parameter object with the given service replaced. </returns>
-        public MigrationsSqlGeneratorDependencies With([NotNull] ISingletonUpdateSqlGenerator updateSqlGenerator)
+        public MigrationsSqlGeneratorDependencies With([NotNull] IUpdateSqlGenerator updateSqlGenerator)
             => new MigrationsSqlGeneratorDependencies(
                 CommandBuilderFactory,
                 updateSqlGenerator,

src/EFCore.Relational/Update/IUpdateSqlGenerator.cs

@@ -16,7 +16,7 @@ namespace Microsoft.EntityFrameworkCore.Update
     ///         This type is typically used by database providers; it is generally not used in application code.
     ///     </para>
     /// </summary>
-    public interface IUpdateSqlGenerator : ISingletonUpdateSqlGenerator
+    public interface IUpdateSqlGenerator
     {
         /// <summary>
         ///     Generates SQL that will obtain the next value in the given sequence.

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

@@ -52,7 +52,7 @@ public static class SqlServerServiceCollectionExtensions
         ///            public void ConfigureServices(IServiceCollection services)
         ///            {
         ///                var connectionString = "connection string to database";
-        /// 
+        ///
         ///                services
         ///                    .AddEntityFrameworkSqlServer()
         ///                    .AddDbContext<MyContext>((serviceProvider, options) =>
@@ -78,7 +78,6 @@ public static IServiceCollection AddEntityFrameworkSqlServer([NotNull] this ISer
                 .TryAdd<IModelValidator, SqlServerModelValidator>()
                 .TryAdd<IConventionSetBuilder, SqlServerConventionSetBuilder>()
                 .TryAdd<IUpdateSqlGenerator>(p => p.GetService<ISqlServerUpdateSqlGenerator>())
-                .TryAdd<ISingletonUpdateSqlGenerator>(p => p.GetService<ISqlServerUpdateSqlGenerator>())
                 .TryAdd<IModificationCommandBatchFactory, SqlServerModificationCommandBatchFactory>()
                 .TryAdd<IValueGeneratorSelector, SqlServerValueGeneratorSelector>()
                 .TryAdd<IRelationalConnection>(p => p.GetService<ISqlServerConnection>())

src/EFCore.SqlServer/Extensions/SqlServerServiceCollectionExtensions.cs

@@ -50,7 +50,7 @@ public static class SqliteServiceCollectionExtensions
         ///           public void ConfigureServices(IServiceCollection services)
         ///           {
         ///               var connectionString = "connection string to database";
-        /// 
+        ///
         ///               services
         ///                   .AddEntityFrameworkSqlite()
         ///                   .AddDbContext<MyContext>((serviceProvider, options) =>
@@ -75,7 +75,6 @@ public static IServiceCollection AddEntityFrameworkSqlite([NotNull] this IServic
                 .TryAdd<IModelValidator, SqliteModelValidator>()
                 .TryAdd<IConventionSetBuilder, SqliteConventionSetBuilder>()
                 .TryAdd<IUpdateSqlGenerator, SqliteUpdateSqlGenerator>()
-                .TryAdd<ISingletonUpdateSqlGenerator, SqliteUpdateSqlGenerator>()
                 .TryAdd<IModificationCommandBatchFactory, SqliteModificationCommandBatchFactory>()
                 .TryAdd<IRelationalConnection>(p => p.GetService<ISqliteRelationalConnection>())
                 .TryAdd<IMigrationsSqlGenerator, SqliteMigrationsSqlGenerator>()