Fix breaking changes affecting SapientGuardian MySQL provider

Issue dotnet#6926 Add back obsolete parameterless constructors and make logging conditional.
davidMuir · Nov 9, 2016 · 539c9e6 · 539c9e6
1 parent 3435161
commit 539c9e6
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 3 deletions.
diff --git a/...EntityFrameworkCore.Relational/Query/ExpressionTranslators/Internal/ContainsTranslator.cs b/...EntityFrameworkCore.Relational/Query/ExpressionTranslators/Internal/ContainsTranslator.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.Linq.Expressions;
 using System.Reflection;
 using JetBrains.Annotations;
@@ -27,6 +28,15 @@ private static readonly MethodInfo _methodInfo
         private static readonly MethodInfo _concat
             = typeof(string).GetRuntimeMethod(nameof(string.Concat), new[] { typeof(string), typeof(string) });
 
+        /// <summary>
+        ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
+        ///     directly from your code. This API may change or be removed in future releases.
+        /// </summary>
+        [Obsolete("Use constructor ContainsTranslator(ILogger) instead.")]
+        public ContainsTranslator()
+        {
+        }
+
         /// <summary>
         ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
         ///     directly from your code. This API may change or be removed in future releases.
@@ -48,7 +58,7 @@ public virtual Expression Translate(MethodCallExpression methodCallExpression)
 
             if (ReferenceEquals(methodCallExpression.Method, _methodInfo))
             {
-                _logger.LogWarning(
+                _logger?.LogWarning(
                     RelationalEventId.PossibleIncorrectResultsUsingLikeOperator,
                     () => RelationalStrings.PossibleIncorrectResultsUsingLikeOperator(
                         nameof(string.Contains)));

diff --git a/...EntityFrameworkCore.Relational/Query/ExpressionTranslators/Internal/EndsWithTranslator.cs b/...EntityFrameworkCore.Relational/Query/ExpressionTranslators/Internal/EndsWithTranslator.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.Linq.Expressions;
 using System.Reflection;
 using JetBrains.Annotations;
@@ -27,6 +28,15 @@ private static readonly MethodInfo _methodInfo
         private static readonly MethodInfo _concat
             = typeof(string).GetRuntimeMethod(nameof(string.Concat), new[] { typeof(string), typeof(string) });
 
+        /// <summary>
+        ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
+        ///     directly from your code. This API may change or be removed in future releases.
+        /// </summary>
+        [Obsolete("Use constructor EndsWithTranslator(ILogger) instead.")]
+        public EndsWithTranslator()
+        {
+        }
+
         /// <summary>
         ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
         ///     directly from your code. This API may change or be removed in future releases.
@@ -48,7 +58,7 @@ public virtual Expression Translate(MethodCallExpression methodCallExpression)
 
             if (ReferenceEquals(methodCallExpression.Method, _methodInfo))
             {
-                _logger.LogWarning(
+                _logger?.LogWarning(
                     RelationalEventId.PossibleIncorrectResultsUsingLikeOperator,
                     () => RelationalStrings.PossibleIncorrectResultsUsingLikeOperator(
                         nameof(string.EndsWith)));

diff --git a/...tityFrameworkCore.Relational/Query/ExpressionTranslators/Internal/StartsWithTranslator.cs b/...tityFrameworkCore.Relational/Query/ExpressionTranslators/Internal/StartsWithTranslator.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.Linq.Expressions;
 using System.Reflection;
 using JetBrains.Annotations;
@@ -27,6 +28,15 @@ private static readonly MethodInfo _methodInfo
         private static readonly MethodInfo _concat
             = typeof(string).GetRuntimeMethod(nameof(string.Concat), new[] { typeof(string), typeof(string) });
 
+        /// <summary>
+        ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
+        ///     directly from your code. This API may change or be removed in future releases.
+        /// </summary>
+        [Obsolete("Use constructor StartsWithTranslator(ILogger) instead.")]
+        public StartsWithTranslator()
+        {
+        }
+
         /// <summary>
         ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
         ///     directly from your code. This API may change or be removed in future releases.
@@ -48,7 +58,7 @@ public virtual Expression Translate(MethodCallExpression methodCallExpression)
 
             if (ReferenceEquals(methodCallExpression.Method, _methodInfo))
             {
-                _logger.LogWarning(
+                _logger?.LogWarning(
                     RelationalEventId.PossibleIncorrectResultsUsingLikeOperator,
                     () => RelationalStrings.PossibleIncorrectResultsUsingLikeOperator(
                         nameof(string.StartsWith)));