Skip to content

[release/9.0] Merge release/9.0-staging to release/9.0 #36789

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

Merged
merged 2 commits into from
Sep 15, 2025
Merged

[release/9.0] Merge release/9.0-staging to release/9.0 #36789

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dae7f7d
Merge pull request #36541 from dotnet/release/9.0
cincuranet Aug 8, 2025
efb7602
Resolve query logger from QueryContext in shaper generation (#36758) …
roji Sep 15, 2025
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
44 changes: 28 additions & 16 deletions ...uery/RelationalShapedQueryCompilingExpressionVisitor.ShaperProcessingExpressionVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ public sealed partial class ShaperProcessingExpressionVisitor : ExpressionVisito
private static readonly bool UseOldBehavior35212 =
AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue35212", out var enabled35212) && enabled35212;

private static readonly bool UseOldBehavior36464 =
AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue36464", out var enabled36464) && enabled36464;

/// <summary>
/// Reading database values
/// </summary>
Expand Down Expand Up @@ -103,6 +106,9 @@ private static readonly PropertyInfo Utf8JsonReaderTokenTypeProperty
private static readonly MethodInfo PropertyGetTypeMappingMethod =
typeof(IReadOnlyProperty).GetMethod(nameof(IReadOnlyProperty.GetTypeMapping), [])!;

private static readonly PropertyInfo QueryContextQueryLoggerProperty =
typeof(QueryContext).GetProperty(nameof(QueryContext.QueryLogger))!;

private readonly RelationalShapedQueryCompilingExpressionVisitor _parentVisitor;
private readonly ISet<string>? _tags;
private readonly bool _isTracking;
Expand Down Expand Up @@ -1928,11 +1934,13 @@ protected override Expression VisitSwitch(SwitchExpression switchExpression)
New(
JsonReaderManagerConstructor,
jsonReaderDataParameter,
liftableConstantFactory.CreateLiftableConstant(
queryLogger,
static c => c.Dependencies.QueryLogger,
"queryLogger",
typeof(IDiagnosticsLogger<DbLoggerCategory.Query>)))),
UseOldBehavior36464
? liftableConstantFactory.CreateLiftableConstant(
queryLogger,
static c => c.Dependencies.QueryLogger,
"queryLogger",
typeof(IDiagnosticsLogger<DbLoggerCategory.Query>))
: MakeMemberAccess(QueryCompilationContext.QueryContextParameter, QueryContextQueryLoggerProperty))),
// tokenType = jsonReaderManager.CurrentReader.TokenType
Assign(
tokenTypeVariable,
Expand Down Expand Up @@ -2113,11 +2121,13 @@ void ProcessFixup(IDictionary<string, LambdaExpression> fixupMap)
New(
JsonReaderManagerConstructor,
jsonReaderDataParameter,
liftableConstantFactory.CreateLiftableConstant(
queryLogger,
static c => c.Dependencies.QueryLogger,
"queryLogger",
typeof(IDiagnosticsLogger<DbLoggerCategory.Query>))));
UseOldBehavior36464
? liftableConstantFactory.CreateLiftableConstant(
queryLogger,
static c => c.Dependencies.QueryLogger,
"queryLogger",
typeof(IDiagnosticsLogger<DbLoggerCategory.Query>))
: MakeMemberAccess(QueryCompilationContext.QueryContextParameter, QueryContextQueryLoggerProperty)));

readExpressions.Add(
Block(
Expand Down Expand Up @@ -2472,11 +2482,13 @@ private bool IsPropertyAssignment(
New(
JsonReaderManagerConstructor,
jsonReaderDataVariable,
_parentVisitor.Dependencies.LiftableConstantFactory.CreateLiftableConstant(
_queryLogger,
static c => c.Dependencies.QueryLogger,
"queryLogger",
typeof(IDiagnosticsLogger<DbLoggerCategory.Query>)))),
UseOldBehavior36464
? _parentVisitor.Dependencies.LiftableConstantFactory.CreateLiftableConstant(
_queryLogger,
static c => c.Dependencies.QueryLogger,
"queryLogger",
typeof(IDiagnosticsLogger<DbLoggerCategory.Query>))
: MakeMemberAccess(QueryCompilationContext.QueryContextParameter, QueryContextQueryLoggerProperty))),
Call(jsonReaderManagerVariable, Utf8JsonReaderManagerMoveNextMethod),
Call(jsonReaderManagerVariable, Utf8JsonReaderManagerCaptureStateMethod)));

Expand Down Expand Up @@ -2849,7 +2861,7 @@ Expression valueExpression
// UPDATE: instead of guessing the type mapping in case where we don't have IProperty and converter uses non-literal constant,
// we just revert to the pre-AOT behavior, i.e. we still use converter.ConvertFromProviderExpression
// this will not work for precompiled query (which realistically was already broken for this scenario - type mapping we "guess"
// is pretty much always wrong), but regular case (not pre-compiled) will continue to work.
// is pretty much always wrong), but regular case (not pre-compiled) will continue to work.
if (property != null)
{
var typeMappingExpression = Call(
Expand Down
Loading