Skip to content

Commit 9852476

Browse files
committed
Some code-reformat + added comments
Linked to #43
1 parent ac81f63 commit 9852476

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

src/System.Linq.Dynamic.Core/DynamicQueryableExtensions.cs

+9-3
Original file line numberDiff line numberDiff line change
@@ -435,13 +435,19 @@ public static IQueryable Join([NotNull] this IQueryable outer, [NotNull] IEnumer
435435
Expression.Parameter(outer.ElementType, "outer"), Expression.Parameter(inner.AsQueryable().ElementType, "inner")
436436
};
437437

438-
LambdaExpression resultsSelectorLambda = DynamicExpressionParser.ParseLambda(createParameterCtor, parameters, null, resultSelector, args);
438+
LambdaExpression resultSelectorLambda = DynamicExpressionParser.ParseLambda(createParameterCtor, parameters, null, resultSelector, args);
439439

440440
return outer.Provider.CreateQuery(
441441
Expression.Call(
442442
typeof(Queryable), "Join",
443-
new[] { outer.ElementType, inner.AsQueryable().ElementType, outerSelectorLambda.Body.Type, resultsSelectorLambda.Body.Type },
444-
outer.Expression, inner.AsQueryable().Expression, Expression.Quote(outerSelectorLambda), Expression.Quote(innerSelectorLambda), Expression.Quote(resultsSelectorLambda)));
443+
new[] { outer.ElementType, inner.AsQueryable().ElementType, outerSelectorLambda.Body.Type, resultSelectorLambda.Body.Type },
444+
outer.Expression, // outer: The first sequence to join.
445+
inner.AsQueryable().Expression, // inner: The sequence to join to the first sequence.
446+
Expression.Quote(outerSelectorLambda), // outerKeySelector: A function to extract the join key from each element of the first sequence.
447+
Expression.Quote(innerSelectorLambda), // innerKeySelector: A function to extract the join key from each element of the second sequence.
448+
Expression.Quote(resultSelectorLambda) // resultSelector: A function to create a result element from two matching elements.
449+
)
450+
);
445451
}
446452

447453
/// <summary>

test/System.Linq.Dynamic.Core.Tests/Helpers/Models/Person.cs

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ namespace System.Linq.Dynamic.Core.Tests.Helpers.Models
33
{
44
public class Person
55
{
6+
public int Id { get; set; }
67
public string Name { get; set; }
78
}
89
}

test/System.Linq.Dynamic.Core.Tests/Helpers/Models/Pet.cs

+2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ namespace System.Linq.Dynamic.Core.Tests.Helpers.Models
33
{
44
public class Pet
55
{
6+
public int Id { get; set; }
67
public string Name { get; set; }
78
public Person Owner { get; set; }
9+
public int OwnerId { get; set; }
810
}
911
}

0 commit comments

Comments
 (0)