Fix DynamicCompare for DateTime (#391)

Author: AlekseyMartynov

net/DevExtreme.AspNet.Data.Tests/DynamicBindingTests.cs

@@ -225,15 +225,9 @@ void Case(IList clientFilter, string expectedExpr, object trueTestValue) {
 
             Case(
                 new object[] { "this", ">", new JValue(9) },
-                "(DynamicCompare(obj, 9) > 0)",
+                "(DynamicCompare(obj, 9, False) > 0)",
                 10
             );
-
-            Case(
-                new object[] { "this", new JValue("a") },
-                @"(obj.ToString() == ""a"")",
-                "a"
-            );
         }
 
         [Fact]
@@ -265,6 +259,17 @@ public void DBNull() {
                 RequireTotalCount = true
             }).totalCount);
         }
+
+        [Fact]
+        public void T819075() {
+            dynamic sourceItem = new ExpandoObject();
+            sourceItem.p = new DateTime(2011, 11, 11);
+
+            Assert.Equal(1, DataSourceLoader.Load(new[] { sourceItem }, new SampleLoadOptions {
+                Filter = new[] { "p", "11/11/2011" },
+                RequireTotalCount = true
+            }).totalCount);
+        }
     }
 
 }

net/DevExtreme.AspNet.Data.Tests/StringToLowerTests.cs

@@ -57,14 +57,14 @@ public void Dynamic() {
             var expr = compiler.Compile(new object[] {
                 new[] { "this", "startswith", "1" },
                 "or",
-                new[] { "this", "b" },
+                new[] { "this", "B" },
                 "or",
-                new[] { "this", ">=", "c" }
+                new[] { "this", ">=", "C" }
             });
 
             var expectedExpr = "(((IIF((obj == null), null, obj.ToString().ToLower()) ?? '').StartsWith('1')"
-                    + " OrElse (IIF((obj == null), null, obj.ToString().ToLower()) == 'b'))"
-                    + " OrElse (Compare(IIF((obj == null), null, obj.ToString().ToLower()), 'c') >= 0))";
+                    + " OrElse (DynamicCompare(obj, 'b', True) == 0))"
+                    + " OrElse (DynamicCompare(obj, 'c', True) >= 0))";
 
             Assert.Equal(
                 expectedExpr.Replace("'", "\""),
@@ -73,8 +73,8 @@ public void Dynamic() {
 
             var method = expr.Compile();
             Assert.True((bool)method.DynamicInvoke(1));
-            Assert.True((bool)method.DynamicInvoke("b"));
-            Assert.True((bool)method.DynamicInvoke('c'));
+            Assert.True((bool)method.DynamicInvoke("B"));
+            Assert.True((bool)method.DynamicInvoke('C'));
         }
 
         [Fact]

net/DevExtreme.AspNet.Data/DynamicBindingHelper.cs

@@ -4,14 +4,14 @@
 using System.Dynamic;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Reflection;
-using System.Text;
 using DynamicBinder = Microsoft.CSharp.RuntimeBinder.Binder;
 
 namespace DevExtreme.AspNet.Data {
 
     static class DynamicBindingHelper {
-        static IEnumerable<CSharpArgumentInfo> EMPTY_ARGUMENT_INFO;
+        readonly static IEnumerable<CSharpArgumentInfo> EMPTY_ARGUMENT_INFO = new[] {
+            CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null)
+        };
 
         public static bool ShouldUseDynamicBinding(Type type) {
             if(type == typeof(object))
@@ -29,9 +29,6 @@ public static bool ShouldUseDynamicBinding(Type type) {
         }
 
         public static Expression CompileGetMember(Expression target, string clientExpr) {
-            if(EMPTY_ARGUMENT_INFO == null)
-                EMPTY_ARGUMENT_INFO = new[] { CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null) };
-
             var binder = DynamicBinder.GetMember(CSharpBinderFlags.None, clientExpr, typeof(DynamicBindingHelper), EMPTY_ARGUMENT_INFO);
 
             return Expression.Call(

net/DevExtreme.AspNet.Data/FilterExpressionCompiler.cs

@@ -61,7 +61,7 @@ Expression CompileBinary(ParameterExpression dataItemExpr, IList criteriaJson) {
             }
 
             var accessorExpr = CompileAccessorExpression(dataItemExpr, clientAccessor, progression => {
-                if(isStringOperation || progression.Last().Type == typeof(Object) && clientValue is String)
+                if(isStringOperation)
                     ForceToString(progression);
 
                 if(_stringToLower)
@@ -128,7 +128,7 @@ Expression CompileBinary(ParameterExpression dataItemExpr, IList criteriaJson) {
                     var compareMethod = typeof(Utils).GetMethod(nameof(Utils.DynamicCompare));
                     return Expression.MakeBinary(
                         expressionType,
-                        Expression.Call(compareMethod, accessorExpr, valueExpr),
+                        Expression.Call(compareMethod, accessorExpr, valueExpr, Expression.Constant(_stringToLower)),
                         Expression.Constant(0)
                     );
                 }

net/DevExtreme.AspNet.Data/Utils.cs

@@ -90,14 +90,23 @@ public static string[] GetPrimaryKey(Type type) {
                 .ToArray();
         }
 
-        public static int DynamicCompare(object selectorResult, object clientValue) {
+        public static int DynamicCompare(object selectorResult, object clientValue, bool stringToLower) {
             if(selectorResult is DBNull)
                 selectorResult = null;
 
-            if(selectorResult != null)
+            if(selectorResult != null) {
                 clientValue = ConvertClientValue(clientValue, selectorResult.GetType());
-            else
+
+                if(stringToLower && clientValue != null) {
+                    if(selectorResult is String selectorResultString) {
+                        selectorResult = selectorResultString.ToLower();
+                    } else if(selectorResult is Char selectorResultChar) {
+                        selectorResult = Char.ToLower(selectorResultChar);
+                    }
+                }
+            } else {
                 clientValue = UnwrapNewtonsoftValue(clientValue);
+            }
 
             return Comparer<object>.Default.Compare(selectorResult, clientValue);
         }