Skip to content

Commit 440a7b1

Browse files
committed
Update ExpressionBuilder.cs
1 parent d1b0e79 commit 440a7b1

1 file changed

Lines changed: 9 additions & 8 deletions

File tree

src/GraphQL.EntityFramework/Where/ExpressionBuilder.cs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -178,25 +178,26 @@ static Expression ProcessList(string path, Comparison comparison, string?[]? val
178178
static Expression GetExpression(string path, Comparison comparison, string?[]? values)
179179
{
180180
var property = PropertyCache<T>.GetProperty(path);
181-
Expression expressionBody;
181+
Expression expression;
182182

183183
if (property.PropertyType == typeof(string))
184184
{
185185
switch (comparison)
186186
{
187187
case Comparison.NotIn:
188188
WhereValidator.ValidateString(comparison);
189-
expressionBody = NegateExpression(MakeStringListInComparison(values!, property)); // Ensure expression is negated
189+
// Ensure expression is negated
190+
expression = NegateExpression(MakeStringListInComparison(values!, property));
190191
break;
191192
case Comparison.In:
192193
WhereValidator.ValidateString(comparison);
193-
expressionBody = MakeStringListInComparison(values!, property);
194+
expression = MakeStringListInComparison(values!, property);
194195
break;
195196

196197
default:
197198
WhereValidator.ValidateSingleString(comparison);
198199
var value = values?.Single();
199-
expressionBody = MakeSingleStringComparison(comparison, value, property);
200+
expression = MakeSingleStringComparison(comparison, value, property);
200201
break;
201202
}
202203
}
@@ -206,23 +207,23 @@ static Expression GetExpression(string path, Comparison comparison, string?[]? v
206207
{
207208
case Comparison.NotIn:
208209
WhereValidator.ValidateObject(property.PropertyType, comparison);
209-
expressionBody = NegateExpression(MakeObjectListInComparision(values!, property));
210+
expression = NegateExpression(MakeObjectListInComparision(values!, property));
210211
break;
211212
case Comparison.In:
212213
WhereValidator.ValidateObject(property.PropertyType, comparison);
213-
expressionBody = MakeObjectListInComparision(values!, property);
214+
expression = MakeObjectListInComparision(values!, property);
214215
break;
215216

216217
default:
217218
WhereValidator.ValidateSingleObject(property.PropertyType, comparison);
218219
var value = values?.Single();
219220
var valueObject = TypeConverter.ConvertStringToType(value, property.PropertyType);
220-
expressionBody = MakeSingleObjectComparison(comparison, valueObject, property);
221+
expression = MakeSingleObjectComparison(comparison, valueObject, property);
221222
break;
222223
}
223224
}
224225

225-
return expressionBody;
226+
return expression;
226227
}
227228

228229
static MethodCallExpression MakeObjectListInComparision(string[] values, Property<T> property)

0 commit comments

Comments
 (0)