Implemented overload for substring

Net-Http-OData · Jun 1, 2020 · 214a924 · 214a924
1 parent 925bd9c
commit 214a924
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 3 deletions.
diff --git a/Net.Http.OData.Tests/Query/QueryableExtensionsTests_StringFunctions.cs b/Net.Http.OData.Tests/Query/QueryableExtensionsTests_StringFunctions.cs
@@ -116,7 +116,7 @@ public void Apply_Filter_Single_Property_StartsWith()
         }
 
         [Fact]
-        public void Apply_Filter_Single_Property_Substring()
+        public void Apply_Filter_Single_Property_Substring_Int()
         {
             TestHelper.EnsureEDM();
 
@@ -132,6 +132,23 @@ public void Apply_Filter_Single_Property_Substring()
             Assert.All(results, x => Assert.True(((dynamic)x).Description == "iPhone SE 64GB Blue"));
         }
 
+        [Fact]
+        public void Apply_Filter_Single_Property_Substring_Int_Int()
+        {
+            TestHelper.EnsureEDM();
+
+            var queryOptions = new ODataQueryOptions(
+                "?$filter=substring(Description, 7, 2) eq 'SE'",
+                EntityDataModel.Current.EntitySets["Products"],
+                Mock.Of<IODataQueryOptionsValidator>());
+
+            IList<ExpandoObject> results = _products.AsQueryable().Apply(queryOptions).ToList();
+
+            Assert.Equal(_products.Where(x => x.Description.Substring(7, 2) == "SE").Count(), results.Count);
+
+            Assert.All(results, x => Assert.True(((dynamic)x).Description.Substring(7, 2) == "SE"));
+        }
+
         [Fact]
         public void Apply_Filter_Single_Property_ToLower()
         {

diff --git a/Net.Http.OData/Query/Linq/FilterBinder.cs b/Net.Http.OData/Query/Linq/FilterBinder.cs
@@ -33,7 +33,9 @@ internal static class FilterBinder
 
         private static readonly MethodInfo s_stringStartsWith = typeof(string).GetMethod("StartsWith", new[] { typeof(string) });
 
-        private static readonly MethodInfo s_stringSubstring = typeof(string).GetMethod("Substring", new[] { typeof(int) });
+        private static readonly MethodInfo s_stringSubstringInt = typeof(string).GetMethod("Substring", new[] { typeof(int) });
+
+        private static readonly MethodInfo s_stringSubstringIntInt = typeof(string).GetMethod("Substring", new[] { typeof(int), typeof(int) });
 
         private static readonly MethodInfo s_stringToLower = typeof(string).GetMethod("ToLower", Type.EmptyTypes);
 
@@ -194,7 +196,18 @@ private static Expression Bind(FunctionCallNode functionCallNode)
                     return Expression.Call(Bind(functionCallNode.Parameters[0]), s_stringStartsWith, Bind(functionCallNode.Parameters[1]));
 
                 case "substring":
-                    return Expression.Call(Bind(functionCallNode.Parameters[0]), s_stringSubstring, Bind(functionCallNode.Parameters[1]));
+                    if (functionCallNode.Parameters.Count == 2)
+                    {
+                        return Expression.Call(Bind(functionCallNode.Parameters[0]), s_stringSubstringInt, Bind(functionCallNode.Parameters[1]));
+                    }
+                    else if (functionCallNode.Parameters.Count == 3)
+                    {
+                        return Expression.Call(Bind(functionCallNode.Parameters[0]), s_stringSubstringIntInt, Bind(functionCallNode.Parameters[1]), Bind(functionCallNode.Parameters[2]));
+                    }
+                    else
+                    {
+                        throw new NotSupportedException();
+                    }
 
                 case "tolower":
                     return Expression.Call(Bind(functionCallNode.Parameters[0]), s_stringToLower);