Fix client-side evaluation for string comparison queries, PR #2053.

Author: SiberaIndustries

src/Microsoft.AspNet.OData.Shared/Query/Expressions/ExpressionBinderBase.cs

@@ -32,15 +32,14 @@ namespace Microsoft.AspNet.OData.Query.Expressions
     [SuppressMessage("Microsoft.Maintainability", "CA1506:AvoidExcessiveClassCoupling", Justification = "Relies on many ODataLib classes.")]
     public abstract class ExpressionBinderBase
     {
-        internal static readonly MethodInfo StringCompareMethodInfo = typeof(string).GetMethod("Compare", new[] { typeof(string), typeof(string), typeof(StringComparison) });
+        internal static readonly MethodInfo StringCompareMethodInfo = typeof(string).GetMethod("Compare", new[] { typeof(string), typeof(string) });
         internal static readonly MethodInfo GuidCompareMethodInfo = typeof(ExpressionBinderBase).GetMethod("GuidCompare", new[] { typeof(Guid), typeof(Guid) });
         internal static readonly string DictionaryStringObjectIndexerName = typeof(Dictionary<string, object>).GetDefaultMembers()[0].Name;
 
         internal static readonly Expression NullConstant = Expression.Constant(null);
         internal static readonly Expression FalseConstant = Expression.Constant(false);
         internal static readonly Expression TrueConstant = Expression.Constant(true);
         internal static readonly Expression ZeroConstant = Expression.Constant(0);
-        internal static readonly Expression OrdinalStringComparisonConstant = Expression.Constant(StringComparison.Ordinal);
 
         internal static readonly MethodInfo EnumTryParseMethod = typeof(Enum).GetMethods()
                         .Single(m => m.Name == "TryParse" && m.GetParameters().Length == 2);
@@ -165,7 +164,7 @@ internal Expression CreateBinaryExpression(BinaryOperatorKind binaryOperator, Ex
                 right = ToNullable(right);
             }
 
-            if ((left.Type == typeof(Guid) || right.Type == typeof(Guid)))
+            if (left.Type == typeof(Guid) || right.Type == typeof(Guid))
             {
                 left = ConvertNull(left, typeof(Guid));
                 right = ConvertNull(right, typeof(Guid));
@@ -197,7 +196,7 @@ internal Expression CreateBinaryExpression(BinaryOperatorKind binaryOperator, Ex
                     case BinaryOperatorKind.GreaterThanOrEqual:
                     case BinaryOperatorKind.LessThan:
                     case BinaryOperatorKind.LessThanOrEqual:
-                        left = Expression.Call(StringCompareMethodInfo, left, right, OrdinalStringComparisonConstant);
+                        left = Expression.Call(StringCompareMethodInfo, left, right);
                         right = ZeroConstant;
                         break;
                     default:

test/E2ETest/Microsoft.Test.E2E.AspNet.OData/QueryComposition/FilterTests.cs

@@ -50,8 +50,8 @@ public static TheoryDataSet<string, IEnumerable<Product>> OperatorData
                 data.Add("1 eq 1", products);
                 data.Add(string.Format("Name eq '{0}'", Encoding(name)), products.Where(p => p.Name == name));
                 data.Add(string.Format("Name ne '{0}'", Encoding(name)), products.Where(p => p.Name != name));
-                data.Add(string.Format("Name gt '{0}'", Encoding(name)), products.Where(p => string.Compare(p.Name, name, StringComparison.Ordinal) > 0));
-                data.Add(string.Format("Name lt '{0}'", Encoding(name)), products.Where(p => string.Compare(p.Name, name, StringComparison.Ordinal) < 0));
+                data.Add(string.Format("Name gt '{0}'", Encoding(name)), products.Where(p => string.Compare(p.Name, name) > 0));
+                data.Add(string.Format("Name lt '{0}'", Encoding(name)), products.Where(p => string.Compare(p.Name, name) < 0));
                 data.Add("ID gt 1", products.Where(p => p.ID > 1));
                 data.Add("ID ge 1", products.Where(p => p.ID >= 1));
                 data.Add("ID lt 20", products.Where(p => p.ID < 20));
@@ -320,6 +320,11 @@ public async Task TestFiltersWithXmlSerializer()
                 var response = await this.Client.SendAsync(request);
                 var result = await response.Content.ReadAsObject<IEnumerable<Product>>();
 
+                if (expected.Count() == 5 && result.Count() ==8)
+                {
+                    Assert.True(true);
+                }
+
                 Assert.Equal(expected.Count(), result.Count());
                 for (int i = 0; i < expected.Count(); i++)
                 {