Remove dead code for #12085

dotnet · Jun 5, 2019 · b0dc813 · b0dc813
1 parent abffe67
commit b0dc813
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 118 deletions.
diff --git a/src/EFCore.Relational/Diagnostics/RelationalEventId.cs b/src/EFCore.Relational/Diagnostics/RelationalEventId.cs
@@ -65,7 +65,7 @@ private enum Id
             QueryClientEvaluationWarning = CoreEventId.RelationalBaseId + 500,
             QueryPossibleUnintendedUseOfEqualsWarning,
             QueryPossibleExceptionWithAggregateOperatorWarning,
-            ValueConversionSqlLiteralWarning,
+            ValueConversionSqlLiteralWarning, // This warning has been removed.
 
             // Model validation events
             ModelValidationKeyDefaultValueWarning = CoreEventId.RelationalBaseId + 600,
@@ -463,16 +463,6 @@ private enum Id
         /// </summary>
         public static readonly EventId QueryPossibleExceptionWithAggregateOperatorWarning = MakeQueryId(Id.QueryPossibleExceptionWithAggregateOperatorWarning);
 
-        /// <summary>
-        ///     <para>
-        ///         A SQL literal is being generated for a value that is using a value conversion.
-        ///     </para>
-        ///     <para>
-        ///         This event is in the <see cref="DbLoggerCategory.Query" /> category.
-        ///     </para>
-        /// </summary>
-        public static readonly EventId ValueConversionSqlLiteralWarning = MakeQueryId(Id.ValueConversionSqlLiteralWarning);
-
         private static readonly string _validationPrefix = DbLoggerCategory.Model.Validation.Name + ".";
         private static EventId MakeValidationId(Id id) => new EventId((int)id, _validationPrefix + id);
 

diff --git a/src/EFCore.Relational/Diagnostics/RelationalLoggerExtensions.cs b/src/EFCore.Relational/Diagnostics/RelationalLoggerExtensions.cs
@@ -1363,48 +1363,6 @@ public static void QueryPossibleExceptionWithAggregateOperatorWarning(
             }
         }
 
-        /// <summary>
-        ///     Logs for the <see cref="RelationalEventId.ValueConversionSqlLiteralWarning" /> event.
-        /// </summary>
-        /// <param name="diagnostics"> The diagnostics logger to use. </param>
-        /// <param name="mappingClrType"> The CLR type. </param>
-        /// <param name="valueConverter"> The value converter. </param>
-        public static void ValueConversionSqlLiteralWarning(
-            [NotNull] this IDiagnosticsLogger<DbLoggerCategory.Query> diagnostics,
-            [NotNull] Type mappingClrType,
-            [NotNull] ValueConverter valueConverter)
-        {
-            var definition = RelationalResources.LogValueConversionSqlLiteralWarning(diagnostics);
-
-            var warningBehavior = definition.GetLogBehavior(diagnostics);
-            if (warningBehavior != WarningBehavior.Ignore)
-            {
-                definition.Log(
-                    diagnostics,
-                    warningBehavior,
-                    mappingClrType.ShortDisplayName(),
-                    valueConverter.GetType().ShortDisplayName());
-            }
-
-            if (diagnostics.DiagnosticSource.IsEnabled(definition.EventId.Name))
-            {
-                diagnostics.DiagnosticSource.Write(
-                    definition.EventId.Name,
-                    new ValueConverterEventData(
-                        definition,
-                        ValueConversionSqlLiteral,
-                        mappingClrType,
-                        valueConverter));
-            }
-        }
-
-        private static string ValueConversionSqlLiteral(EventDefinitionBase definition, EventData payload)
-        {
-            var d = (EventDefinition<object, object>)definition;
-            var p = (ValueConverterEventData)payload;
-            return d.GenerateMessage(p.MappingClrType.ShortDisplayName(), p.ValueConverter.GetType().ShortDisplayName());
-        }
-
         /// <summary>
         ///     Logs for the <see cref="RelationalEventId.ModelValidationKeyDefaultValueWarning" /> event.
         /// </summary>

diff --git a/src/EFCore.Relational/Properties/RelationalStrings.Designer.cs b/src/EFCore.Relational/Properties/RelationalStrings.Designer.cs
diff --git a/src/EFCore.Relational/Properties/RelationalStrings.resx b/src/EFCore.Relational/Properties/RelationalStrings.resx
@@ -445,10 +445,6 @@
     <value>A MigrationAttribute isn't specified on the '{class}' class.</value>
     <comment>Warning RelationalEventId.MigrationAttributeMissingWarning string</comment>
   </data>
-  <data name="LogValueConversionSqlLiteralWarning" xml:space="preserve">
-    <value>A SQL parameter or literal was generated for the type '{type}' using the ValueConverter '{valueConverter}'. Review the generated SQL for correctness and consider evaluating the target expression in-memory instead.</value>
-    <comment>Warning RelationalEventId.ValueConversionSqlLiteralWarning object object</comment>
-  </data>
   <data name="DerivedTypeTable" xml:space="preserve">
     <value>The entity type '{entityType}' cannot be mapped to a table because it is derived from '{baseType}'. Only base entity types can be mapped to a table.</value>
   </data>

diff --git a/test/EFCore.Relational.Specification.Tests/Query/GearsOfWarQueryRelationalFixture.cs b/test/EFCore.Relational.Specification.Tests/Query/GearsOfWarQueryRelationalFixture.cs
@@ -12,11 +12,6 @@ public abstract class GearsOfWarQueryRelationalFixture : GearsOfWarQueryFixtureB
 
         public TestSqlLoggerFactory TestSqlLoggerFactory => (TestSqlLoggerFactory)ListLoggerFactory;
 
-        public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
-            => base.AddOptions(builder).ConfigureWarnings(
-                c => c
-                    .Log(RelationalEventId.ValueConversionSqlLiteralWarning));
-
         protected override bool ShouldLogCategory(string logCategory)
             => logCategory == DbLoggerCategory.Query.Name;
     }

diff --git a/test/EFCore.Relational.Specification.Tests/Query/NorthwindQueryRelationalFixture.cs b/test/EFCore.Relational.Specification.Tests/Query/NorthwindQueryRelationalFixture.cs
@@ -19,8 +19,7 @@ public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder build
             => base.AddOptions(builder).ConfigureWarnings(
                     c => c
                         .Log(RelationalEventId.QueryPossibleUnintendedUseOfEqualsWarning)
-                        .Log(RelationalEventId.QueryPossibleExceptionWithAggregateOperatorWarning)
-                        .Log(RelationalEventId.ValueConversionSqlLiteralWarning))
+                        .Log(RelationalEventId.QueryPossibleExceptionWithAggregateOperatorWarning))
                 .EnableDetailedErrors();
 
         protected override bool ShouldLogCategory(string logCategory)

diff --git a/test/EFCore.SqlServer.FunctionalTests/ConvertToProviderTypesSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/ConvertToProviderTypesSqlServerTest.cs
@@ -23,22 +23,6 @@ public ConvertToProviderTypesSqlServerTest(ConvertToProviderTypesSqlServerFixtur
         {
         }
 
-        [ConditionalFact(Skip = "Issue#15312")]
-        public virtual void Warning_when_suspicious_conversion_in_sql()
-        {
-            using (var context = CreateContext())
-            {
-                Assert.Contains(
-                    RelationalResources.LogValueConversionSqlLiteralWarning(new TestLogger<SqlServerLoggingDefinitions>())
-                        .GenerateMessage(
-                            typeof(decimal).ShortDisplayName(),
-                            new NumberToBytesConverter<decimal>().GetType().ShortDisplayName()),
-                    Assert.Throws<InvalidOperationException>(
-                        () =>
-                            context.Set<BuiltInDataTypes>().Where(b => b.TestDecimal > 123.0m).ToList()).Message);
-            }
-        }
-
         [ConditionalFact]
         public virtual void Columns_have_expected_data_types()
         {

diff --git a/test/EFCore.Sqlite.FunctionalTests/BuiltInDataTypesSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/BuiltInDataTypesSqliteTest.cs
@@ -1619,10 +1619,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder, DbContext con
                     b => b.Property(e => e.Decimal).HasColumnType("decimal(5, 2)"));
             }
 
-            public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
-                => base.AddOptions(builder).ConfigureWarnings(
-                    c => c.Log(RelationalEventId.ValueConversionSqlLiteralWarning));
-
             public override bool SupportsBinaryKeys => true;
 
             public override DateTime DefaultDateTime => new DateTime();

diff --git a/test/EFCore.Sqlite.FunctionalTests/ConvertToProviderTypesSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/ConvertToProviderTypesSqliteTest.cs
@@ -33,10 +33,6 @@ public class ConvertToProviderTypesSqliteFixture : ConvertToProviderTypesFixture
             protected override ITestStoreFactory TestStoreFactory => SqliteTestStoreFactory.Instance;
             public TestSqlLoggerFactory TestSqlLoggerFactory => (TestSqlLoggerFactory)ListLoggerFactory;
 
-            public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
-                => base.AddOptions(builder).ConfigureWarnings(
-                    c => c.Log(RelationalEventId.ValueConversionSqlLiteralWarning));
-
             public override bool SupportsBinaryKeys => true;
 
             public override DateTime DefaultDateTime => new DateTime();

diff --git a/test/EFCore.Sqlite.FunctionalTests/CustomConvertersSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/CustomConvertersSqliteTest.cs
@@ -37,12 +37,6 @@ public class CustomConvertersSqliteFixture : CustomConvertersFixtureBase
             public override bool SupportsBinaryKeys => true;
 
             public override DateTime DefaultDateTime => new DateTime();
-
-            public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
-                => base
-                    .AddOptions(builder)
-                    .ConfigureWarnings(
-                        c => c.Log(RelationalEventId.ValueConversionSqlLiteralWarning));
         }
     }
 }