Skip to content

Commit 96cfe99

Browse files
committed
Use WellKnown.KeyFieldName instead of literal
1 parent 0e95fb8 commit 96cfe99

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

Orm/Xtensive.Orm/Orm/Linq/Rewriters/AggregateOptimizer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ private static void AddGroupByItemWrapper(GroupByQuery groupBy, List<LambdaExpre
224224
var keyType = keySelector.Body.Type;
225225
var elementType = elementSelector.Body.Type;
226226
var wrapperType = typeof (GroupByItemWrapper<,>).MakeGenericType(keyType, elementType);
227-
var wrapperKeyProperty = wrapperType.GetProperty("Key");
227+
var wrapperKeyProperty = wrapperType.GetProperty(WellKnown.KeyFieldName);
228228
var wrapperElementProperty = wrapperType.GetProperty("Element");
229229

230230
var projectionParameter = keySelector.Parameters[0];

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ protected override Expression VisitMemberAccess(MemberExpression ma)
391391
return VisitSequence(rootPoint.Expression);
392392
}
393393
}
394-
else if (sourceExpression.GetMemberType() == MemberType.Entity && memberInfo.Name != "Key") {
394+
else if (sourceExpression.GetMemberType() == MemberType.Entity && memberInfo.Name != WellKnown.KeyFieldName) {
395395
var type = sourceExpression.Type;
396396
if (sourceExpression is ParameterExpression parameter) {
397397
var projection = context.Bindings[parameter];
@@ -1420,7 +1420,7 @@ bool propertyFilter(PersistentFieldExpression f)
14201420
}
14211421
break;
14221422
case ExtendedExpressionType.Grouping:
1423-
if (member.Name == "Key") {
1423+
if (member.Name == WellKnown.KeyFieldName) {
14241424
return ((GroupingExpression) expression).KeyExpression;
14251425
}
14261426
break;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1225,7 +1225,7 @@ private Expression VisitGroupJoin(Expression outerSource, Expression innerSource
12251225
innerGrouping.ResultAccessMethod);
12261226
}
12271227

1228-
var groupingKeyPropertyInfo = groupingType.GetProperty("Key");
1228+
var groupingKeyPropertyInfo = groupingType.GetProperty(WellKnown.KeyFieldName);
12291229
var groupingJoinParameter = Expression.Parameter(enumerableType, "groupingJoinParameter");
12301230
var groupingKeyExpression = Expression.MakeMemberAccess(
12311231
Expression.Convert(groupingJoinParameter, groupingType),

Orm/Xtensive.Orm/Orm/Operations/KeyOperation.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ protected virtual void GetObjectData(SerializationInfo info, StreamingContext co
7373
/// <inheritdoc/>
7474
protected KeyOperation(SerializationInfo info, StreamingContext context)
7575
{
76-
Key = Key.Parse(Domain.Demand(), info.GetString("Key"));
76+
Key = Key.Parse(Domain.Demand(), info.GetString(WellKnown.KeyFieldName));
7777
// Key.TypeReference = new TypeReference(Key.TypeReference.Type, TypeReferenceAccuracy.ExactType);
7878
}
7979
}

0 commit comments

Comments
 (0)