Re-adds byte-array translation post-rebase

dotnet · Jan 24, 2020 · 2f5fc99 · 2f5fc99
1 parent 96ffe14
commit 2f5fc99
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 32 deletions.
diff --git a/src/EFCore.SqlServer/Query/Internal/SqlServerByteArrayMethodTranslator.cs b/src/EFCore.SqlServer/Query/Internal/SqlServerByteArrayMethodTranslator.cs
@@ -27,21 +27,28 @@ public virtual SqlExpression Translate(SqlExpression instance, MethodInfo method
             if (method.IsGenericMethod
                  && arguments[0].Type == typeof(byte[]))
             {
+                var genericMethodDefinition = method.GetGenericMethodDefinition();
                 var source = arguments[0];
                 var sourceTypeMapping = source.TypeMapping;
 
-                var value = arguments[1] is SqlConstantExpression constantValue
-                    ? (SqlExpression)_sqlExpressionFactory.Constant(new[] { (byte)constantValue.Value }, sourceTypeMapping)
-                    : _sqlExpressionFactory.Convert(arguments[1], typeof(byte[]), sourceTypeMapping);
-
-                return _sqlExpressionFactory.GreaterThan(
-                    _sqlExpressionFactory.Function(
-                        "CHARINDEX",
-                        new[] { value, source },
-                        nullResultAllowed: true,
-                        argumentsPropagateNullability: new[] { true, true },
-                        typeof(int)),
-                    _sqlExpressionFactory.Constant(0));
+                if (genericMethodDefinition == EnumerableMethods.Contains)
+                {
+                    var value = arguments[1] is SqlConstantExpression constantValue
+                        ? (SqlExpression)_sqlExpressionFactory.Constant(new[] { (byte)constantValue.Value }, sourceTypeMapping)
+                        : _sqlExpressionFactory.Convert(arguments[1], typeof(byte[]), sourceTypeMapping);
+
+                    return _sqlExpressionFactory.GreaterThan(
+                        _sqlExpressionFactory.Function(
+                            "CHARINDEX",
+                            new[] { value, source },
+                            nullResultAllowed: true,
+                            argumentsPropagateNullability: new[] { true, true },
+                            typeof(int)),
+                        _sqlExpressionFactory.Constant(0)); 
+                } else if (genericMethodDefinition == EnumerableMethods.SequenceEqual)
+                {
+                    return _sqlExpressionFactory.Equal(source, arguments[1]);
+                }
             }
 
             return null;

diff --git a/src/EFCore.Sqlite.Core/Query/Internal/SqliteByteArrayMethodTranslator.cs b/src/EFCore.Sqlite.Core/Query/Internal/SqliteByteArrayMethodTranslator.cs
@@ -27,23 +27,30 @@ public virtual SqlExpression Translate(SqlExpression instance, MethodInfo method
 
                 var source = arguments[0];
 
-                var value = arguments[1] is SqlConstantExpression constantValue
-                    ? (SqlExpression)_sqlExpressionFactory.Constant(new[] { (byte)constantValue.Value }, source.TypeMapping)
-                    : _sqlExpressionFactory.Function(
-                        "char",
-                        new[] { arguments[1] },
-                        nullResultAllowed: false,
-                        argumentsPropagateNullability: new[] { false },
-                        typeof(string));
-
-                return _sqlExpressionFactory.GreaterThan(
-                    _sqlExpressionFactory.Function(
-                        "instr",
-                        new[] { source, value },
-                        nullResultAllowed: true,
-                        argumentsPropagateNullability: new[] { true, true },
-                        typeof(int)),
-                    _sqlExpressionFactory.Constant(0));
+                if (genericMethodDefinition == EnumerableMethods.Contains)
+                {
+                    var value = arguments[1] is SqlConstantExpression constantValue
+                        ? (SqlExpression)_sqlExpressionFactory.Constant(new[] { (byte)constantValue.Value }, source.TypeMapping)
+                        : _sqlExpressionFactory.Function(
+                            "char",
+                            new[] { arguments[1] },
+                            nullResultAllowed: false,
+                            argumentsPropagateNullability: new[] { false },
+                            typeof(string));
+
+                    return _sqlExpressionFactory.GreaterThan(
+                        _sqlExpressionFactory.Function(
+                            "instr",
+                            new[] { source, value },
+                            nullResultAllowed: true,
+                            argumentsPropagateNullability: new[] { true, true },
+                            typeof(int)),
+                        _sqlExpressionFactory.Constant(0));
+                }
+                else if (genericMethodDefinition == EnumerableMethods.SequenceEqual)
+                {
+                    return _sqlExpressionFactory.Equal(source, arguments[1]);
+                }
             }
 
             return null;

diff --git a/test/EFCore.Specification.Tests/Query/GearsOfWarQueryTestBase.cs b/test/EFCore.Specification.Tests/Query/GearsOfWarQueryTestBase.cs
@@ -7547,13 +7547,15 @@ public virtual Task Projecting_required_string_column_compared_to_null_parameter
                 async,
                 ss => ss.Set<Gear>().Select(g => g.Nickname == nullParameter));
         }
-
-        public virtual Task SequenceEqual_is_translated_with_byte_array(bool isAsync)
+
+        [ConditionalTheory]
+        [MemberData(nameof(IsAsyncData))]
+        public virtual Task SequenceEqual_is_translated_with_byte_array(bool async)
         {
             var byteArrayParam = new byte[] { 0x04, 0x05, 0x06, 0x07, 0x08 };
 
             return AssertQuery(
-                isAsync,
+                async,
                 ss => ss.Set<Squad>().Where(s => s.Banner5.SequenceEqual(byteArrayParam)));
         }
 

diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/GearsOfWarQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/GearsOfWarQuerySqlServerTest.cs
@@ -7525,6 +7525,7 @@ public override async Task Projecting_required_string_column_compared_to_null_pa
                 @"SELECT CAST(0 AS bit)
 FROM [Gears] AS [g]
 WHERE [g].[Discriminator] IN (N'Gear', N'Officer')");
+        }
 
         public override async Task SequenceEqual_is_translated_with_byte_array(bool isAsync)
         {