Fix to #25842 - Cosmos: Translate string.Equals with StringComparison…

….Ordinal Fixes #25842
dotnet · Sep 4, 2021 · 192ad2e · 192ad2e
1 parent c666392
commit 192ad2e
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 4 deletions.
diff --git a/src/EFCore.Cosmos/Query/Internal/StringMethodTranslator.cs b/src/EFCore.Cosmos/Query/Internal/StringMethodTranslator.cs
@@ -250,14 +250,19 @@ public StringMethodTranslator(ISqlExpressionFactory sqlExpressionFactory)
                 || _stringComparisonWithComparisonTypeArgumentStatic.Equals(method))
             {
                 var comparisonTypeArgument = arguments[^1];
+
                 if (comparisonTypeArgument is SqlConstantExpression constantComparisonTypeArgument
                     && constantComparisonTypeArgument.Value is StringComparison comparisonTypeArgumentValue
-                    && comparisonTypeArgumentValue == StringComparison.OrdinalIgnoreCase)
+                    && (comparisonTypeArgumentValue == StringComparison.OrdinalIgnoreCase
+                        || comparisonTypeArgumentValue == StringComparison.Ordinal))
                 {
-
                     return _stringComparisonWithComparisonTypeArgumentInstance.Equals(method)
-                        ? TranslateSystemFunction("STRINGEQUALS", typeof(bool), instance!, arguments[0], _sqlExpressionFactory.Constant(true))
-                        : TranslateSystemFunction("STRINGEQUALS", typeof(bool), arguments[0], arguments[1], _sqlExpressionFactory.Constant(true));
+                        ? comparisonTypeArgumentValue == StringComparison.OrdinalIgnoreCase
+                            ? TranslateSystemFunction("STRINGEQUALS", typeof(bool), instance!, arguments[0], _sqlExpressionFactory.Constant(true))
+                            : TranslateSystemFunction("STRINGEQUALS", typeof(bool), instance!, arguments[0])
+                        : comparisonTypeArgumentValue == StringComparison.OrdinalIgnoreCase
+                            ? TranslateSystemFunction("STRINGEQUALS", typeof(bool), arguments[0], arguments[1], _sqlExpressionFactory.Constant(true))
+                            : TranslateSystemFunction("STRINGEQUALS", typeof(bool), arguments[0], arguments[1]);
                 }
             }
 

diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/NorthwindFunctionsQueryCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/NorthwindFunctionsQueryCosmosTest.cs
@@ -1365,6 +1365,36 @@ FROM root c
 WHERE ((c[""Discriminator""] = ""Customer"") AND STRINGEQUALS(c[""CustomerID""], ""alFkI"", true))");
         }
 
+        [ConditionalTheory]
+        [MemberData(nameof(IsAsyncData))]
+        public virtual async Task Case_sensitive_string_comparison_instance(bool async)
+        {
+            await AssertQuery(
+                async,
+                ss => ss.Set<Customer>().Where(c => c.CustomerID.Equals("ALFKI", StringComparison.Ordinal)),
+                entryCount: 1);
+
+            AssertSql(
+                @"SELECT c
+FROM root c
+WHERE ((c[""Discriminator""] = ""Customer"") AND STRINGEQUALS(c[""CustomerID""], ""ALFKI"", false))");
+        }
+
+        [ConditionalTheory]
+        [MemberData(nameof(IsAsyncData))]
+        public virtual async Task Case_sensitive_string_comparison_static(bool async)
+        {
+            await AssertQuery(
+                async,
+                ss => ss.Set<Customer>().Where(c => string.Equals(c.CustomerID, "ALFKI", StringComparison.Ordinal)),
+            entryCount: 1);
+
+            AssertSql(
+                @"SELECT c
+FROM root c
+WHERE ((c[""Discriminator""] = ""Customer"") AND STRINGEQUALS(c[""CustomerID""], ""ALFKI"", false))");
+        }
+
         private void AssertSql(params string[] expected)
             => Fixture.TestSqlLoggerFactory.AssertBaseline(expected);