Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Query: Throw exception for null key value in non-tracking #26311

Merged
merged 1 commit into from
Oct 28, 2021
Merged

Query: Throw exception for null key value in non-tracking #26311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 58 additions & 3 deletions src/EFCore/Query/ShapedQueryCompilingExpressionVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using System.Reflection;
using System.Threading;
using System.Threading.Tasks;
using JetBrains.Annotations;
using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
using Microsoft.EntityFrameworkCore.Diagnostics;
using Microsoft.EntityFrameworkCore.Infrastructure;
Expand Down Expand Up @@ -324,6 +325,9 @@ private static readonly MethodInfo _startTrackingMethodInfo
= typeof(QueryContext).GetRequiredMethod(
nameof(QueryContext.StartTracking), typeof(IEntityType), typeof(object), typeof(ValueBuffer));

private static readonly MethodInfo _createNullKeyValueInNoTrackingQuery
= typeof(EntityMaterializerInjectingExpressionVisitor).GetRequiredDeclaredMethod(nameof(CreateNullKeyValueInNoTrackingQuery));

private readonly IEntityMaterializerSource _entityMaterializerSource;
private readonly QueryTrackingBehavior _queryTrackingBehavior;
private readonly bool _queryStateMananger;
Expand Down Expand Up @@ -458,16 +462,47 @@ private Expression ProcessEntityShaper(EntityShaperExpression entityShaperExpres
{
if (primaryKey != null)
{
expressions.Add(
Expression.IfThen(
primaryKey.Properties.Select(
if (entityShaperExpression.IsNullable)
{
expressions.Add(
Expression.IfThen(
primaryKey.Properties.Select(
p => Expression.NotEqual(
valueBufferExpression.CreateValueBufferReadValueExpression(typeof(object), p.GetIndex(), p),
Expression.Constant(null)))
.Aggregate((a, b) => Expression.AndAlso(a, b)),
MaterializeEntity(
entityShaperExpression, materializationContextVariable, concreteEntityTypeVariable, instanceVariable,
null)));
}
else
{
var keyValuesVariable = Expression.Variable(typeof(object[]), "keyValues" + _currentEntityIndex);
expressions.Add(
Expression.IfThenElse(
primaryKey.Properties.Select(
p => Expression.NotEqual(
valueBufferExpression.CreateValueBufferReadValueExpression(typeof(object), p.GetIndex(), p),
Expression.Constant(null)))
.Aggregate((a, b) => Expression.AndAlso(a, b)),
MaterializeEntity(
entityShaperExpression, materializationContextVariable, concreteEntityTypeVariable, instanceVariable,
null),
Expression.Block(
new[] { keyValuesVariable },
Expression.Assign(
keyValuesVariable,
Expression.NewArrayInit(
typeof(object),
primaryKey.Properties.Select(
p => valueBufferExpression.CreateValueBufferReadValueExpression(typeof(object), p.GetIndex(), p)))),
Expression.Call(
_createNullKeyValueInNoTrackingQuery,
Expression.Constant(entityType),
Expression.Constant(primaryKey.Properties),
keyValuesVariable))));

}
}
else
{
Expand Down Expand Up @@ -605,6 +640,26 @@ private BlockExpression CreateFullMaterializeExpression(

return Expression.Block(blockExpressions);
}

[UsedImplicitly]
private static Exception CreateNullKeyValueInNoTrackingQuery(
IEntityType entityType, IReadOnlyList<IProperty> properties, object?[] keyValues)
{
var index = -1;
for (var i = 0; i < keyValues.Length; i++)
{
if (keyValues[i] == null)
{
index = i;
break;
}
}

var property = properties[index];

throw new InvalidOperationException(
CoreStrings.InvalidKeyValue(entityType.DisplayName(), property.Name));
}
}
}
}
18 changes: 18 additions & 0 deletions test/EFCore.Cosmos.FunctionalTests/Query/FromSqlQueryCosmosTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,6 +612,24 @@ public virtual async Task FromSqlRaw_queryable_simple_projection_not_composed(bo
) c");
}

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public async Task FromSqlRaw_queryable_simple_with_missing_key_and_non_tracking_throws(bool async)
{
using var context = CreateContext();
var query = context.Set<Customer>()
.FromSqlRaw(@"SELECT * FROM root c WHERE c[""Discriminator""] = ""Category""")
.AsNoTracking();
var exception = async
? await Assert.ThrowsAsync<InvalidOperationException>(() => query.ToArrayAsync())
: Assert.Throws<InvalidOperationException>(() => query.ToArray());

Assert.Equal(CoreStrings.InvalidKeyValue(
context.Model.FindEntityType(typeof(Customer))!.DisplayName(),
"CustomerID"),
exception.Message);
}

private void AssertSql(params string[] expected)
=> Fixture.TestSqlLoggerFactory.AssertBaseline(expected);

Expand Down