NotificationsYou must be signed in to change notification settings
Fork3.3k
Star14.5k

Commit63815d3

authored

Merge pull request#36788 from dotnet/release/8.0-staging

[release/8.0] Merge release/8.0-staging to release/8.0

2 parents8378c07 +d574040 commit63815d3Copy full SHA for 63815d3

File tree

1 file changed

+23

-3

lines changed

src/EFCore.Relational/Query
- RelationalShapedQueryCompilingExpressionVisitor.ShaperProcessingExpressionVisitor.cs

1 file changed

+23

-3

lines changed

`‎src/EFCore.Relational/Query/RelationalShapedQueryCompilingExpressionVisitor.ShaperProcessingExpressionVisitor.cs‎`

Lines changed: 23 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,9 @@ private sealed partial class ShaperProcessingExpressionVisitor : ExpressionVisit`
`19`	`19`	`publicstaticreadonlyboolUseOldBehavior32310=`
`20`	`20`	`AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue32310",outvarenabled32310)&&enabled32310;`
`21`	`21`
	`22`	`+privatestaticreadonlyboolUseOldBehavior36464=`
	`23`	`+AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue36464",outvarenabled36464)&&enabled36464;`
	`24`	`+`
`22`	`25`	`/// <summary>`
`23`	`26`	`/// Reading database values`
`24`	`27`	`/// </summary>`
`@@ -80,6 +83,9 @@ private static readonly MethodInfo Utf8JsonReaderGetStringMethod`
`80`	`83`	`privatestaticreadonlyMethodInfoEnumParseMethodInfo`
`81`	`84`	`=typeof(Enum).GetMethod(nameof(Enum.Parse),new[]{typeof(Type),typeof(string)})!;`
`82`	`85`
	`86`	`+privatestaticreadonlyPropertyInfoQueryContextQueryLoggerProperty=`
	`87`	`+typeof(QueryContext).GetProperty(nameof(QueryContext.QueryLogger))!;`
	`88`	`+`
`83`	`89`	`privatereadonlyRelationalShapedQueryCompilingExpressionVisitor_parentVisitor;`
`84`	`90`	`privatereadonlyISet<string>?_tags;`
`85`	`91`	`privatereadonlybool_isTracking;`
`@@ -1644,7 +1650,9 @@ protected override Expression VisitSwitch(SwitchExpression switchExpression)`
`1644`	`1650`	`New(`
`1645`	`1651`	`JsonReaderManagerConstructor,`
`1646`	`1652`	`_jsonReaderDataParameter,`
`1647`		`-Constant(_queryLogger))),`
	`1653`	`+UseOldBehavior36464`
	`1654`	`+?Constant(_queryLogger)`
	`1655`	`+:MakeMemberAccess(QueryCompilationContext.QueryContextParameter,QueryContextQueryLoggerProperty))),`
`1648`	`1656`	`// tokenType = jsonReaderManager.CurrentReader.TokenType`
`1649`	`1657`	`Assign(`
`1650`	`1658`	`tokenTypeVariable,`
`@@ -1807,7 +1815,13 @@ void ProcessFixup(IDictionary<string, LambdaExpression> fixupMap)`
`1807`	`1815`	`varcaptureState=Call(managerVariable,Utf8JsonReaderManagerCaptureStateMethod);`
`1808`	`1816`	`varassignment=Assign(propertyVariable,innerShaperMapElement.Value);`
`1809`	`1817`	`varmanagerRecreation=Assign(`
`1810`		`-managerVariable,New(JsonReaderManagerConstructor,_jsonReaderDataParameter,Constant(_queryLogger)));`
	`1818`	`+managerVariable,`
	`1819`	`+New(`
	`1820`	`+JsonReaderManagerConstructor,`
	`1821`	`+_jsonReaderDataParameter,`
	`1822`	`+UseOldBehavior36464`
	`1823`	`+?Constant(_queryLogger)`
	`1824`	`+:MakeMemberAccess(QueryCompilationContext.QueryContextParameter,QueryContextQueryLoggerProperty)));`
`1811`	`1825`
`1812`	`1826`	`readExpressions.Add(`
`1813`	`1827`	`Block(`
`@@ -2170,7 +2184,13 @@ private static IList<T> PopulateList<T>(IList<T> buffer, IList<T> target)`
`2170`	`2184`	`Default(typeof(JsonReaderData))),`
`2171`	`2185`	`Block(`
`2172`	`2186`	`Assign(`
`2173`		`-jsonReaderManagerVariable,New(JsonReaderManagerConstructor,jsonReaderDataVariable,Constant(_queryLogger))),`
	`2187`	`+jsonReaderManagerVariable,`
	`2188`	`+New(`
	`2189`	`+JsonReaderManagerConstructor,`
	`2190`	`+jsonReaderDataVariable,`
	`2191`	`+UseOldBehavior36464`
	`2192`	`+?Constant(_queryLogger)`
	`2193`	`+:MakeMemberAccess(QueryCompilationContext.QueryContextParameter,QueryContextQueryLoggerProperty))),`
`2174`	`2194`	`Call(jsonReaderManagerVariable,Utf8JsonReaderManagerMoveNextMethod),`
`2175`	`2195`	`Call(jsonReaderManagerVariable,Utf8JsonReaderManagerCaptureStateMethod)));`
`2176`	`2196`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit63815d3

File tree

1 file changed

1 file changed

`‎src/EFCore.Relational/Query/RelationalShapedQueryCompilingExpressionVisitor.ShaperProcessingExpressionVisitor.cs‎`

0 commit comments