From 1090ee3b8f5a47a1b4dd19fee1358e1d1f57b4c0 Mon Sep 17 00:00:00 2001 From: Christopher Jolly Date: Mon, 25 Sep 2023 02:02:14 +0800 Subject: [PATCH] Make sure the start index for Instr is set. Normally is optional but it seems some sections seem to prefer it to be defined --- .../Internal/JetStringMethodTranslator.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/EFCore.Jet/Query/ExpressionTranslators/Internal/JetStringMethodTranslator.cs b/src/EFCore.Jet/Query/ExpressionTranslators/Internal/JetStringMethodTranslator.cs index 8d6ed0b..aca0401 100644 --- a/src/EFCore.Jet/Query/ExpressionTranslators/Internal/JetStringMethodTranslator.cs +++ b/src/EFCore.Jet/Query/ExpressionTranslators/Internal/JetStringMethodTranslator.cs @@ -276,6 +276,10 @@ namespace EntityFrameworkCore.Jet.Query.ExpressionTranslators.Internal ? _sqlExpressionFactory.Constant(constantStartIndex + 1, typeof(int)) : _sqlExpressionFactory.Add(startIndex, _sqlExpressionFactory.Constant(1))); } + else + { + charIndexArguments.Insert(0, _sqlExpressionFactory.Constant(1)); + } charIndexArguments.Add(_sqlExpressionFactory.Constant(1)); var argumentsPropagateNullability = Enumerable.Repeat(true, charIndexArguments.Count); @@ -286,7 +290,7 @@ namespace EntityFrameworkCore.Jet.Query.ExpressionTranslators.Internal || string.Equals(storeType, "varchar(max)", StringComparison.OrdinalIgnoreCase)) { charIndexExpression = _sqlExpressionFactory.Function( - "InStr", + "INSTR", charIndexArguments, nullable: true, argumentsPropagateNullability, @@ -297,7 +301,7 @@ namespace EntityFrameworkCore.Jet.Query.ExpressionTranslators.Internal else { charIndexExpression = _sqlExpressionFactory.Function( - "InStr", + "INSTR", charIndexArguments, nullable: true, argumentsPropagateNullability,