Skip to content

Commit 657e174

Browse files
alex-kulakovalex-kulakov
committed
Rename class QueryableExtensions -> QueryableExtensionsEx
1 parent 436afd9 commit 657e174

8 files changed

Lines changed: 36 additions & 27 deletions

File tree

‎Extensions/Xtensive.Orm.BulkOperations/Internals/WellKnownMembers.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ internal static class WellKnownMembers
1717

1818
public static readonly Type IncludeAlgorithmType = typeof(IncludeAlgorithm);
1919
public static readonly Type QueryableType = typeof(Queryable);
20-
public static readonly Type QueryableExtensionsType = typeof(QueryableExtensions);
20+
public static readonly Type QueryableExtensionsType = typeof(QueryableExtensionsEx);
2121

22-
public const string InMethodName = nameof(QueryableExtensions.In);
22+
public const string InMethodName = nameof(QueryableExtensionsEx.In);
2323

2424
public static readonly MethodInfo TranslateQueryMethod =
2525
typeof(QueryBuilder).GetMethod(nameof(QueryBuilder.TranslateQuery));

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace Xtensive.Orm.Linq
3535
internal sealed partial class Translator
3636
{
3737
private static readonly Type OrmCollectionExtensionsType = typeof(CollectionExtensionsEx);
38-
private static readonly Type OrmQueryableExtensionsType = typeof(QueryableExtensions);
38+
private static readonly Type OrmQueryableExtensionsType = typeof(QueryableExtensionsEx);
3939
private static readonly ParameterExpression ParameterContextParam = Expression.Parameter(WellKnownOrmTypes.ParameterContext, "context");
4040
private static readonly ConstantExpression
4141
NullKeyExpression = Expression.Constant(null, WellKnownOrmTypes.Key),
@@ -503,9 +503,11 @@ protected override Expression VisitMethodCall(MethodCallExpression mc)
503503
#pragma warning restore 612,618
504504

505505
// Visit Queryable extensions.
506-
if (methodDeclaringType == typeof(QueryableExtensions)) {
506+
if (methodDeclaringType == typeof(QueryableExtensionsEx)) {
507507
return methodName switch {
508+
#if !NET10_0_OR_GREATER
508509
Reflection.WellKnown.QueryableExtensions.LeftJoin => VisitLeftJoin(mc),
510+
#endif
509511
Reflection.WellKnown.QueryableExtensions.In => VisitIn(mc),
510512
Reflection.WellKnown.QueryableExtensions.Lock => VisitLock(mc),
511513
Reflection.WellKnown.QueryableExtensions.Take => VisitTake(mc.Arguments[0], mc.Arguments[1]),

‎Orm/Xtensive.Orm/Orm/Linq/WellKnownMembers.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ private static MethodInfo GetQueryableMethod(string name, int numberOfGenericArg
251251

252252
private static MethodInfo GetQueryableExtensionsMethod(string name, int numberOfGenericArgument, int numberOfArguments)
253253
{
254-
return GetMethod(typeof (QueryableExtensions), name, numberOfGenericArgument, numberOfArguments);
254+
return GetMethod(typeof (QueryableExtensionsEx), name, numberOfGenericArgument, numberOfArguments);
255255
}
256256
}
257257
}

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

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,17 @@ public static class Queryable
7878
public static readonly MethodInfo Where;
7979

8080
// Queryable extensions
81-
public static readonly MethodInfo ExtensionCount = GetQueryableExtensionsMethod(nameof(QueryableExtensions.Count), 0, 1);
82-
public static readonly MethodInfo ExtensionLeftJoin = GetQueryableExtensionsMethod(nameof(QueryableExtensions.LeftJoin), 4, 5);
83-
public static readonly MethodInfo ExtensionLock = GetQueryableExtensionsMethod(nameof(QueryableExtensions.Lock), 1, 3);
84-
public static readonly MethodInfo ExtensionTake = GetQueryableExtensionsMethod(nameof(QueryableExtensions.Take), 1, 2);
85-
public static readonly MethodInfo ExtensionSkip = GetQueryableExtensionsMethod(nameof(QueryableExtensions.Skip), 1, 2);
86-
public static readonly MethodInfo ExtensionElementAt = GetQueryableExtensionsMethod(nameof(QueryableExtensions.ElementAt), 1, 2);
87-
public static readonly MethodInfo ExtensionElementAtOrDefault = GetQueryableExtensionsMethod(nameof(QueryableExtensions.ElementAtOrDefault), 1, 2);
88-
public static readonly MethodInfo ExtensionTag = GetQueryableExtensionsMethod(nameof(QueryableExtensions.Tag), 1, 2);
81+
public static readonly MethodInfo ExtensionCount = GetQueryableExtensionsMethod(nameof(QueryableExtensionsEx.Count), 0, 1);
82+
83+
#if !NET10_0_OR_GREATER
84+
public static readonly MethodInfo ExtensionLeftJoin = GetQueryableExtensionsMethod(nameof(QueryableExtensionsEx.LeftJoin), 4, 5);
85+
#endif
86+
public static readonly MethodInfo ExtensionLock = GetQueryableExtensionsMethod(nameof(QueryableExtensionsEx.Lock), 1, 3);
87+
public static readonly MethodInfo ExtensionTake = GetQueryableExtensionsMethod(nameof(QueryableExtensionsEx.Take), 1, 2);
88+
public static readonly MethodInfo ExtensionSkip = GetQueryableExtensionsMethod(nameof(QueryableExtensionsEx.Skip), 1, 2);
89+
public static readonly MethodInfo ExtensionElementAt = GetQueryableExtensionsMethod(nameof(QueryableExtensionsEx.ElementAt), 1, 2);
90+
public static readonly MethodInfo ExtensionElementAtOrDefault = GetQueryableExtensionsMethod(nameof(QueryableExtensionsEx.ElementAtOrDefault), 1, 2);
91+
public static readonly MethodInfo ExtensionTag = GetQueryableExtensionsMethod(nameof(QueryableExtensionsEx.Tag), 1, 2);
8992

9093
static Queryable()
9194
{

‎Orm/Xtensive.Orm/Orm/Providers/Expressions/MemberCompilers/StringCompilers.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -521,14 +521,14 @@ public static SqlExpression EnumerableContains(
521521
return SqlDml.In(value, SqlDml.Row(expressions));
522522
}
523523

524-
[Compiler(typeof (QueryableExtensions), nameof(QueryableExtensions.In), TargetKind.Static | TargetKind.Method, 1)]
524+
[Compiler(typeof (QueryableExtensionsEx), nameof(QueryableExtensionsEx.In), TargetKind.Static | TargetKind.Method, 1)]
525525
public static SqlExpression EnumerableExtensionsInEnumerable(
526526
MemberInfo member, SqlExpression value, [Type(typeof(IEnumerable<>))] SqlExpression sequence)
527527
{
528528
return EnumerableContains(member, sequence, value);
529529
}
530530

531-
[Compiler(typeof(QueryableExtensions), nameof(QueryableExtensions.In), TargetKind.Static | TargetKind.Method, 1)]
531+
[Compiler(typeof(QueryableExtensionsEx), nameof(QueryableExtensionsEx.In), TargetKind.Static | TargetKind.Method, 1)]
532532
public static SqlExpression EnumerableExtensionsInArray(
533533
MemberInfo member, SqlExpression value, [Type(typeof(MethodHelper.AnyArrayPlaceholder))] SqlExpression sequence)
534534
{

‎Orm/Xtensive.Orm/Orm/QueryableExtensions.Async.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ namespace Xtensive.Orm
1919
/// <summary>
2020
/// Extends LINQ methods for <see cref="Xtensive.Orm.Linq"/> queries.
2121
/// </summary>
22-
public static partial class QueryableExtensions
22+
public static partial class QueryableExtensionsEx
2323
{
2424
/// <summary>
2525
/// A wrapper to transform non-<see cref="IAsyncEnumerable{T}"/>, yet based on <see cref="QueryProvider"/>,

‎Orm/Xtensive.Orm/Orm/QueryableExtensions.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace Xtensive.Orm
2424
/// <summary>
2525
/// Extends LINQ methods for <see cref="Xtensive.Orm.Linq"/> queries.
2626
/// </summary>
27-
public static partial class QueryableExtensions
27+
public static partial class QueryableExtensionsEx
2828
{
2929
/// <summary>
3030
/// Tags query with given <paramref name="tag"/> string
@@ -257,6 +257,7 @@ public static bool In<T>(this T source, IncludeAlgorithm algorithm, IEnumerable<
257257
values == null ? false : values.Contains(source);
258258
#pragma warning restore IDE0060 // Remove unused parameter
259259

260+
#if !NET10_0_OR_GREATER
260261
/// <summary>
261262
/// Correlates the elements of two sequences based on matching keys.
262263
/// </summary>
@@ -290,6 +291,7 @@ public static IQueryable<TResult> LeftJoin<TOuter, TInner, TKey, TResult>(this I
290291
var expression = Expression.Call(null, genericMethod, new[] {outer.Expression, GetSourceExpression(inner), outerKeySelector, innerKeySelector, resultSelector});
291292
return outer.Provider.CreateQuery<TResult>(expression);
292293
}
294+
#endif
293295

294296
/// <summary>
295297
/// Runs query to database asynchronously and returns completed task for other <see cref="IQueryable{T}"/>.

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,21 @@ namespace Xtensive.Reflection
77
public partial class WellKnown
88
{
99
/// <summary>
10-
/// Various well-known constants related to <see cref="Orm.QueryableExtensions" />
10+
/// Various well-known constants related to <see cref="Orm.QueryableExtensionsEx" />
1111
/// </summary>
1212
public static class QueryableExtensions
1313
{
14-
public const string Count = nameof(Orm.QueryableExtensions.Count);
15-
public const string LeftJoin = nameof(Orm.QueryableExtensions.LeftJoin);
16-
public const string Lock = nameof(Orm.QueryableExtensions.Lock);
17-
public const string Take = nameof(Orm.QueryableExtensions.Take);
18-
public const string Skip = nameof(Orm.QueryableExtensions.Skip);
19-
public const string ElementAt = nameof(Orm.QueryableExtensions.ElementAt);
20-
public const string ElementAtOrDefault = nameof(Orm.QueryableExtensions.ElementAtOrDefault);
21-
public const string Tag = nameof(Orm.QueryableExtensions.Tag);
22-
public const string In = nameof(Orm.QueryableExtensions.In);
14+
public const string Count = nameof(Orm.QueryableExtensionsEx.Count);
15+
#if !NET10_0_OR_GREATER
16+
public const string LeftJoin = nameof(Orm.QueryableExtensionsEx.LeftJoin);
17+
#endif
18+
public const string Lock = nameof(Orm.QueryableExtensionsEx.Lock);
19+
public const string Take = nameof(Orm.QueryableExtensionsEx.Take);
20+
public const string Skip = nameof(Orm.QueryableExtensionsEx.Skip);
21+
public const string ElementAt = nameof(Orm.QueryableExtensionsEx.ElementAt);
22+
public const string ElementAtOrDefault = nameof(Orm.QueryableExtensionsEx.ElementAtOrDefault);
23+
public const string Tag = nameof(Orm.QueryableExtensionsEx.Tag);
24+
public const string In = nameof(Orm.QueryableExtensionsEx.In);
2325
}
2426
}
2527
}

0 commit comments

Comments
 (0)