Byte array translations.

Author: cincuranet

Provider/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/GearsOfWarQueryFbTest.cs

@@ -19,8 +19,6 @@
 using FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.Helpers;
 using Microsoft.EntityFrameworkCore.Query;
 using Xunit;
-using System.Linq;
-using Microsoft.EntityFrameworkCore.TestModels.GearsOfWarModel;
 
 namespace FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.Query
 {
@@ -30,27 +28,6 @@ public GearsOfWarQueryFbTest(GearsOfWarQueryFbFixture fixture)
 			: base(fixture)
 		{ }
 
-		[NotSupportedOnFirebirdTheory]
-		[MemberData(nameof(IsAsyncData))]
-		public override Task Byte_array_contains_parameter(bool async)
-		{
-			return base.Byte_array_contains_parameter(async);
-		}
-
-		[NotSupportedOnFirebirdTheory]
-		[MemberData(nameof(IsAsyncData))]
-		public override Task Byte_array_contains_literal(bool async)
-		{
-			return base.Byte_array_contains_literal(async);
-		}
-
-		[NotSupportedOnFirebirdTheory]
-		[MemberData(nameof(IsAsyncData))]
-		public override Task Contains_on_byte_array_property_using_byte_column(bool async)
-		{
-			return base.Contains_on_byte_array_property_using_byte_column(async);
-		}
-
 		[NotSupportedOnFirebirdTheory]
 		[MemberData(nameof(IsAsyncData))]
 		public override Task DateTimeOffset_DateAdd_AddDays(bool isAsync)

Provider/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/TPTGearsOfWarQueryFbTest.cs

@@ -15,15 +15,9 @@
 
 //$Authors = Jiri Cincura (jiri@cincura.net)
 
-using System;
-using System.Data.Common;
-using System.Linq;
 using System.Threading.Tasks;
-using FirebirdSql.Data.FirebirdClient;
 using FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.Helpers;
 using Microsoft.EntityFrameworkCore.Query;
-using Microsoft.EntityFrameworkCore.TestModels.GearsOfWarModel;
-using Microsoft.EntityFrameworkCore.TestUtilities;
 using Xunit;
 
 namespace FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.Query
@@ -34,27 +28,6 @@ public TPTGearsOfWarQueryFbTest(TPTGearsOfWarQueryFbFixture fixture)
 			: base(fixture)
 		{ }
 
-		[NotSupportedOnFirebirdTheory]
-		[MemberData(nameof(IsAsyncData))]
-		public override Task Byte_array_contains_parameter(bool async)
-		{
-			return base.Byte_array_contains_parameter(async);
-		}
-
-		[NotSupportedOnFirebirdTheory]
-		[MemberData(nameof(IsAsyncData))]
-		public override Task Byte_array_contains_literal(bool async)
-		{
-			return base.Byte_array_contains_literal(async);
-		}
-
-		[NotSupportedOnFirebirdTheory]
-		[MemberData(nameof(IsAsyncData))]
-		public override Task Contains_on_byte_array_property_using_byte_column(bool async)
-		{
-			return base.Contains_on_byte_array_property_using_byte_column(async);
-		}
-
 		[NotSupportedOnFirebirdTheory]
 		[MemberData(nameof(IsAsyncData))]
 		public override Task Correlated_collections_inner_subquery_predicate_references_outer_qsre(bool async)

Provider/src/FirebirdSql.EntityFrameworkCore.Firebird/Query/ExpressionTranslators/Internal/FbByteArrayMethodTranslator.cs

@@ -36,30 +36,24 @@ public FbByteArrayMethodTranslator(FbSqlExpressionFactory fbSqlExpressionFactory
 
 		public SqlExpression Translate(SqlExpression instance, MethodInfo method, IReadOnlyList<SqlExpression> arguments, IDiagnosticsLogger<DbLoggerCategory.Query> logger)
 		{
-			// POSITION works only with text blobs at the moment
+			if (method.IsGenericMethod
+				&& method.GetGenericMethodDefinition().Equals(EnumerableMethods.Contains)
+				&& arguments[0].Type == typeof(byte[]))
+			{
+				var value = arguments[1] is SqlConstantExpression constantValue
+					? _fbSqlExpressionFactory.Function("ASCII_CHAR", new[] { _fbSqlExpressionFactory.Constant((byte)constantValue.Value) }, false, new[] { false }, typeof(string))
+					: _fbSqlExpressionFactory.Function("ASCII_CHAR", new[] { _fbSqlExpressionFactory.Convert(arguments[1], typeof(byte)) }, true, new[] { true }, typeof(string));
+
+				return _fbSqlExpressionFactory.GreaterThan(
+					_fbSqlExpressionFactory.Function(
+						"POSITION",
+						new[] { value, arguments[0] },
+						true,
+						new[] { true, true },
+						typeof(int)),
+					_fbSqlExpressionFactory.Constant(0));
+			}
 			return null;
-
-			//if (method.IsGenericMethod
-			//	&& method.GetGenericMethodDefinition().Equals(EnumerableMethods.Contains)
-			//	&& arguments[0].Type == typeof(byte[]))
-			//{
-			//	var source = arguments[0];
-			//	var sourceTypeMapping = source.TypeMapping;
-
-			//	var value = arguments[1] is SqlConstantExpression constantValue
-			//		? (SqlExpression)_fbSqlExpressionFactory.Constant(new[] { (byte)constantValue.Value }, sourceTypeMapping)
-			//		: _fbSqlExpressionFactory.Convert(arguments[1], typeof(byte[]), sourceTypeMapping);
-
-			//	return _fbSqlExpressionFactory.GreaterThan(
-			//		_fbSqlExpressionFactory.Function(
-			//			"POSITION",
-			//			new[] { value, source },
-			//			true,
-			//			new[] { true, true },
-			//			typeof(int)),
-			//		_fbSqlExpressionFactory.Constant(0));
-			//}
-			//return null;
 		}
 	}
 }