Skip to content

Commit b18cce6

Browse files
committed
Let QueryableExtensions.LeftJoinEx exist in both NET8 and NET10
1 parent 9eb4548 commit b18cce6

5 files changed

Lines changed: 9 additions & 9 deletions

File tree

Orm/Xtensive.Orm/Orm/Linq/Translator.Expressions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (C) 2009-2024 Xtensive LLC.
1+
// Copyright (C) 2009-2026 Xtensive LLC.
22
// This code is distributed under MIT license terms.
33
// See the License.txt file in the project root for more information.
44
// Created by: Alexis Kochetov
@@ -507,8 +507,8 @@ protected override Expression VisitMethodCall(MethodCallExpression mc)
507507
return methodName switch {
508508
#if !NET10_0_OR_GREATER
509509
Reflection.WellKnown.QueryableExtensions.LeftJoin => VisitLeftJoin(mc),
510-
Reflection.WellKnown.QueryableExtensions.LeftJoinEx => VisitLeftJoin(mc),
511510
#endif
511+
Reflection.WellKnown.QueryableExtensions.LeftJoinEx => VisitLeftJoin(mc),
512512
Reflection.WellKnown.QueryableExtensions.In => VisitIn(mc),
513513
Reflection.WellKnown.QueryableExtensions.Lock => VisitLock(mc),
514514
Reflection.WellKnown.QueryableExtensions.Take => VisitTake(mc.Arguments[0], mc.Arguments[1]),

Orm/Xtensive.Orm/Orm/Linq/Translator.Queryable.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (C) 2009-2024 Xtensive LLC.
1+
// Copyright (C) 2009-2026 Xtensive LLC.
22
// This code is distributed under MIT license terms.
33
// See the License.txt file in the project root for more information.
44
// Created by: Alexis Kochetov

Orm/Xtensive.Orm/Orm/Linq/WellknownMembers.Queryable.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (C) 2020 Xtensive LLC.
1+
// Copyright (C) 2020-2024 Xtensive LLC.
22
// This code is distributed under MIT license terms.
33
// See the License.txt file in the project root for more information.
44

@@ -82,8 +82,8 @@ public static class Queryable
8282

8383
#if !NET10_0_OR_GREATER
8484
public static readonly MethodInfo ExtensionLeftJoin = GetQueryableExtensionsMethod(nameof(QueryableExtensionsEx.LeftJoin), 4, 5);
85-
public static readonly MethodInfo ExtensionLeftJoinEx = GetQueryableExtensionsMethod(nameof(QueryableExtensions.LeftJoinEx), 4, 5);
8685
#endif
86+
public static readonly MethodInfo ExtensionLeftJoinEx = GetQueryableExtensionsMethod(nameof(QueryableExtensionsEx.LeftJoinEx), 4, 5);
8787
public static readonly MethodInfo ExtensionLock = GetQueryableExtensionsMethod(nameof(QueryableExtensionsEx.Lock), 1, 3);
8888
public static readonly MethodInfo ExtensionTake = GetQueryableExtensionsMethod(nameof(QueryableExtensionsEx.Take), 1, 2);
8989
public static readonly MethodInfo ExtensionSkip = GetQueryableExtensionsMethod(nameof(QueryableExtensionsEx.Skip), 1, 2);

Orm/Xtensive.Orm/Orm/QueryableExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (C) 2009-2022 Xtensive LLC.
1+
// Copyright (C) 2009-2026 Xtensive LLC.
22
// This code is distributed under MIT license terms.
33
// See the License.txt file in the project root for more information.
44
// Created by: Alexey Gamzov
@@ -321,7 +321,7 @@ public static IQueryable<TResult> LeftJoinEx<TOuter, TInner, TKey, TResult>(this
321321
throw new NotSupportedException(string.Format(errorMessage, outerProviderType));
322322
}
323323

324-
var genericMethod = WellKnownMembers.Queryable.ExtensionLeftJoin.MakeGenericMethod(new[] { typeof(TOuter), typeof(TInner), typeof(TKey), typeof(TResult) });
324+
var genericMethod = WellKnownMembers.Queryable.ExtensionLeftJoinEx.MakeGenericMethod(new[] { typeof(TOuter), typeof(TInner), typeof(TKey), typeof(TResult) });
325325
var expression = Expression.Call(null, genericMethod, new[] { outer.Expression, GetSourceExpression(inner), outerKeySelector, innerKeySelector, resultSelector });
326326
return outer.Provider.CreateQuery<TResult>(expression);
327327
}

Orm/Xtensive.Orm/Reflection/WellKnown.QueryableExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (C) 2024 Xtensive LLC.
1+
// Copyright (C) 2024-2026 Xtensive LLC.
22
// This code is distributed under MIT license terms.
33
// See the License.txt file in the project root for more information.
44

@@ -14,8 +14,8 @@ public static class QueryableExtensions
1414
public const string Count = nameof(Orm.QueryableExtensionsEx.Count);
1515
#if !NET10_0_OR_GREATER
1616
public const string LeftJoin = nameof(Orm.QueryableExtensionsEx.LeftJoin);
17-
public const string LeftJoinEx = nameof(Orm.QueryableExtensions.LeftJoinEx);
1817
#endif
18+
public const string LeftJoinEx = nameof(Orm.QueryableExtensionsEx.LeftJoinEx);
1919
public const string Lock = nameof(Orm.QueryableExtensionsEx.Lock);
2020
public const string Take = nameof(Orm.QueryableExtensionsEx.Take);
2121
public const string Skip = nameof(Orm.QueryableExtensionsEx.Skip);

0 commit comments

Comments
 (0)