Add Concat, Union, Except and Intersect (#506)

StefH · web-flow · commit 93d93d7b807d · 2021-05-31T08:40:40.000+02:00
diff --git a/src/System.Linq.Dynamic.Core/DynamicQueryableExtensions.cs b/src/System.Linq.Dynamic.Core/DynamicQueryableExtensions.cs
@@ -26,7 +26,7 @@ namespace System.Linq.Dynamic.Core
     public static class DynamicQueryableExtensions
     {
 #if !(WINDOWS_APP45x || SILVERLIGHT)
-        private static readonly TraceSource TraceSource = new TraceSource(typeof(DynamicQueryableExtensions).Name);
+        private static readonly TraceSource TraceSource = new TraceSource(nameof(DynamicQueryableExtensions));
 #endif
 
         private static Expression OptimizeExpression(Expression expression)
@@ -76,7 +76,7 @@ public static object Aggregate([NotNull] this IQueryable source, [NotNull] strin
             {
                 ParameterInfo lastParameter = m.GetParameters().LastOrDefault();
 
-                return lastParameter != null ? TypeHelper.GetUnderlyingType(lastParameter.ParameterType) == property.PropertyType : false;
+                return lastParameter != null && TypeHelper.GetUnderlyingType(lastParameter.ParameterType) == property.PropertyType;
             });
 
             // Sum, Average
diff --git a/src/System.Linq.Dynamic.Core/Parser/ExpressionParser.cs b/src/System.Linq.Dynamic.Core/Parser/ExpressionParser.cs
@@ -1923,7 +1923,7 @@ Expression ParseEnumerable(Expression instance, Type elementType, string methodN
             }
             else
             {
-                if (new[] { "Contains", "Take", "Skip", "DefaultIfEmpty" }.Contains(methodName))
+                if (new[] { "Concat", "Contains", "DefaultIfEmpty", "Except", "Intersect", "Skip", "Take", "Union" }.Contains(methodName))
                 {
                     args = new[] { instance, args[0] };
                 }
diff --git a/src/System.Linq.Dynamic.Core/Parser/SupportedMethods/IEnumerableSignatures.cs b/src/System.Linq.Dynamic.Core/Parser/SupportedMethods/IEnumerableSignatures.cs
@@ -1,4 +1,6 @@
-﻿namespace System.Linq.Dynamic.Core.Parser.SupportedMethods
+﻿using System.Collections;
+
+namespace System.Linq.Dynamic.Core.Parser.SupportedMethods
 {
     internal interface IEnumerableSignatures
     {
@@ -17,18 +19,21 @@ internal interface IEnumerableSignatures
         void Average(long selector);
         void Cast(string type);
         void Cast(Type type);
+        void Concat(IEnumerable enumerable);
         void Contains(object selector);
         void Count();
         void Count(bool predicate);
         void DefaultIfEmpty();
         void DefaultIfEmpty(object defaultValue);
         void Distinct();
+        void Except(IEnumerable enumerable);
         void First();
         void First(bool predicate);
         void FirstOrDefault();
         void FirstOrDefault(bool predicate);
         void GroupBy(object keySelector);
         void GroupBy(object keySelector, object elementSelector);
+        void Intersect(IEnumerable enumerable);
         void Last();
         void Last(bool predicate);
         void LastOrDefault();
@@ -63,6 +68,7 @@ internal interface IEnumerableSignatures
         void TakeWhile(bool predicate);
         void ThenBy(object selector);
         void ThenByDescending(object selector);
+        void Union(IEnumerable enumerable);
         void Where(bool predicate);
 
         // Executors
diff --git a/src/System.Linq.Dynamic.Core/Parser/SupportedMethods/IQueryableSignatures.cs b/src/System.Linq.Dynamic.Core/Parser/SupportedMethods/IQueryableSignatures.cs
@@ -1,4 +1,6 @@
-﻿namespace System.Linq.Dynamic.Core.Parser.SupportedMethods
+﻿using System.Collections;
+
+namespace System.Linq.Dynamic.Core.Parser.SupportedMethods
 {
     internal interface IQueryableSignatures
     {
@@ -15,19 +17,22 @@ internal interface IQueryableSignatures
         void Average(int selector);
         void Average(long? selector);
         void Average(long selector);
+        void Concat(IEnumerable enumerable);
         void Cast(string type);
         void Cast(Type type);
         void Count();
         void Count(bool predicate);
         void DefaultIfEmpty();
         void DefaultIfEmpty(object defaultValue);
         void Distinct();
+        void Except(IEnumerable enumerable);
         void First();
         void First(bool predicate);
         void FirstOrDefault();
         void FirstOrDefault(bool predicate);
         void GroupBy(object keySelector);
         void GroupBy(object keySelector, object elementSelector);
+        void Intersect(IEnumerable enumerable);
         void Last();
         void Last(bool predicate);
         void LastOrDefault();
@@ -62,6 +67,7 @@ internal interface IQueryableSignatures
         void TakeWhile(bool predicate);
         void ThenBy(object selector);
         void ThenByDescending(object selector);
+        void Union(IEnumerable enumerable);
         void Where(bool predicate);
     }
 }
diff --git a/test/System.Linq.Dynamic.Core.Tests/Parser/ExpressionParserTests.TypeAccess.cs b/test/System.Linq.Dynamic.Core.Tests/Parser/ExpressionParserTests.TypeAccess.cs
@@ -54,8 +54,6 @@ public void ParseTypeAccess_Via_Constructor_String_To_DateTime_Valid()
 
         [Theory]
         [InlineData(null)]
-        [InlineData(1.1d)]
-        [InlineData(1.1f)]
         [InlineData("\"abc\"")]
         public void ParseTypeAccess_Via_Constructor_Any_To_DateTime_Invalid(object any)
         {
diff --git a/test/System.Linq.Dynamic.Core.Tests/QueryableTests.Concat.cs b/test/System.Linq.Dynamic.Core.Tests/QueryableTests.Concat.cs
@@ -0,0 +1,25 @@
+﻿using System.Collections.Generic;
+using FluentAssertions;
+using Xunit;
+
+namespace System.Linq.Dynamic.Core.Tests
+{
+    public partial class QueryableTests
+    {
+        [Fact]
+        public void Concat_Dynamic_ListOfStrings()
+        {
+            // Arrange
+            var list1 = new List<bool> { true };
+            var list2 = new List<string> { "User3", "User4" };
+            var list3 = new List<string> { "User5", "User6", "User7" };
+
+            // Act
+            var testQuery = list1.AsQueryable().Select("@0.Concat(@1).ToList()", list2, list3);
+
+            // Assert
+            var result = testQuery.ToDynamicArray<List<string>>();
+            result.First().Should().BeEquivalentTo(list2.Concat(list3));
+        }
+    }
+}
diff --git a/test/System.Linq.Dynamic.Core.Tests/QueryableTests.Except.cs b/test/System.Linq.Dynamic.Core.Tests/QueryableTests.Except.cs
@@ -0,0 +1,25 @@
+﻿using System.Collections.Generic;
+using FluentAssertions;
+using Xunit;
+
+namespace System.Linq.Dynamic.Core.Tests
+{
+    public partial class QueryableTests
+    {
+        [Fact]
+        public void Except_Dynamic_ListOfStrings()
+        {
+            // Arrange
+            var list1 = new List<bool> { true };
+            var list2 = new List<string> { "User3", "User4" };
+            var list3 = new List<string> { "User3", "User6", "User7" };
+
+            // Act
+            var testQuery = list1.AsQueryable().Select("@0.Except(@1).ToList()", list2, list3);
+
+            // Assert
+            var result = testQuery.ToDynamicArray<List<string>>();
+            result.First().Should().BeEquivalentTo(list2.Except(list3));
+        }
+    }
+}
diff --git a/test/System.Linq.Dynamic.Core.Tests/QueryableTests.Intersect.cs b/test/System.Linq.Dynamic.Core.Tests/QueryableTests.Intersect.cs
@@ -0,0 +1,25 @@
+﻿using System.Collections.Generic;
+using FluentAssertions;
+using Xunit;
+
+namespace System.Linq.Dynamic.Core.Tests
+{
+    public partial class QueryableTests
+    {
+        [Fact]
+        public void Intersect_Dynamic_ListOfStrings()
+        {
+            // Arrange
+            var list1 = new List<bool> { true };
+            var list2 = new List<string> { "User3", "User4" };
+            var list3 = new List<string> { "User3", "User6", "User7" };
+
+            // Act
+            var testQuery = list1.AsQueryable().Select("@0.Intersect(@1).ToList()", list2, list3);
+
+            // Assert
+            var result = testQuery.ToDynamicArray<List<string>>();
+            result.First().Should().BeEquivalentTo(list2.Intersect(list3));
+        }
+    }
+}
diff --git a/test/System.Linq.Dynamic.Core.Tests/QueryableTests.Union.cs b/test/System.Linq.Dynamic.Core.Tests/QueryableTests.Union.cs
@@ -0,0 +1,25 @@
+﻿using System.Collections.Generic;
+using FluentAssertions;
+using Xunit;
+
+namespace System.Linq.Dynamic.Core.Tests
+{
+    public partial class QueryableTests
+    {
+        [Fact]
+        public void Union_Dynamic_ListOfStrings()
+        {
+            // Arrange
+            var list1 = new List<bool> { true };
+            var list2 = new List<string> { "User3", "User4" };
+            var list3 = new List<string> { "User3", "User6", "User7" };
+
+            // Act
+            var testQuery = list1.AsQueryable().Select("@0.Union(@1).ToList()", list2, list3);
+
+            // Assert
+            var result = testQuery.ToDynamicArray<List<string>>();
+            result.First().Should().BeEquivalentTo(list2.Union(list3));
+        }
+    }
+}
diff --git a/version.xml b/version.xml
@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <PatchVersion>9</PatchVersion>
+    <PatchVersion>10-preview-01</PatchVersion>
   </PropertyGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ namespace System.Linq.Dynamic.Core`
`26`	`26`	`public static class DynamicQueryableExtensions`
`27`	`27`	`{`
`28`	`28`	`#if !(WINDOWS_APP45x \|\| SILVERLIGHT)`
`29`		`- private static readonly TraceSource TraceSource = new TraceSource(typeof(DynamicQueryableExtensions).Name);`
	`29`	`+ private static readonly TraceSource TraceSource = new TraceSource(nameof(DynamicQueryableExtensions));`
`30`	`30`	`#endif`
`31`	`31`
`32`	`32`	`private static Expression OptimizeExpression(Expression expression)`
`@@ -76,7 +76,7 @@ public static object Aggregate([NotNull] this IQueryable source, [NotNull] strin`
`76`	`76`	`{`
`77`	`77`	`ParameterInfo lastParameter = m.GetParameters().LastOrDefault();`
`78`	`78`
`79`		`- return lastParameter != null ? TypeHelper.GetUnderlyingType(lastParameter.ParameterType) == property.PropertyType : false;`
	`79`	`+ return lastParameter != null && TypeHelper.GetUnderlyingType(lastParameter.ParameterType) == property.PropertyType;`
`80`	`80`	`});`
`81`	`81`
`82`	`82`	`// Sum, Average`
Original file line number	Diff line number	Diff line change
`@@ -1923,7 +1923,7 @@ Expression ParseEnumerable(Expression instance, Type elementType, string methodN`
`1923`	`1923`	`}`
`1924`	`1924`	`else`
`1925`	`1925`	`{`
`1926`		`- if (new[] { "Contains", "Take", "Skip", "DefaultIfEmpty" }.Contains(methodName))`
	`1926`	`+ if (new[] { "Concat", "Contains", "DefaultIfEmpty", "Except", "Intersect", "Skip", "Take", "Union" }.Contains(methodName))`
`1927`	`1927`	`{`
`1928`	`1928`	`args = new[] { instance, args[0] };`
`1929`	`1929`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,6 @@ public void ParseTypeAccess_Via_Constructor_String_To_DateTime_Valid()`
`54`	`54`
`55`	`55`	`[Theory]`
`56`	`56`	`[InlineData(null)]`
`57`		`- [InlineData(1.1d)]`
`58`		`- [InlineData(1.1f)]`
`59`	`57`	`[InlineData("\"abc\"")]`
`60`	`58`	`public void ParseTypeAccess_Via_Constructor_Any_To_DateTime_Invalid(object any)`
`61`	`59`	`{`