Skip to content

Commit 3e662b9

Browse files
BrentOzarBrentOzar
authored
Merge pull request #2873 from BrentOzarULTD/dev
2021-04 release with sp_BlitzWho fix
2 parents 18820a7 + 9cbe691 commit 3e662b9

4 files changed

Lines changed: 20 additions & 20 deletions

File tree

‎Install-All-Scripts.sql‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35927,7 +35927,7 @@ IF @ProductVersionMajor >= 11
3592735927
END - query_stats.statement_start_offset )
3592835928
/ 2 ) + 1), dest.text) AS query_text ,
3592935929
derp.query_plan ,
35930-
CAST(COALESCE(qs_live.query_plan, ''<?No live query plan available. To turn on live plans, see https://www.BrentOzar.com/go/liveplans ?>'') AS XML) AS live_query_plan ,
35930+
CAST(COALESCE(qs_live.Query_Plan, ''<?No live query plan available. To turn on live plans, see https://www.BrentOzar.com/go/liveplans ?>'') AS XML) AS live_query_plan ,
3593135931
STUFF((SELECT DISTINCT N'', '' + Node.Data.value(''(@Column)[1]'', ''NVARCHAR(4000)'') + N'' {'' + Node.Data.value(''(@ParameterDataType)[1]'', ''NVARCHAR(4000)'') + N''}: '' + Node.Data.value(''(@ParameterCompiledValue)[1]'', ''NVARCHAR(4000)'')
3593235932
FROM derp.query_plan.nodes(''/*:ShowPlanXML/*:BatchSequence/*:Batch/*:Statements/*:StmtSimple/*:QueryPlan/*:ParameterList/*:ColumnReference'') AS Node(Data)
3593335933
FOR XML PATH('''')), 1,2,'''')
@@ -36161,13 +36161,13 @@ IF @ProductVersionMajor >= 11
3616136161
) as tempdb_allocations
3616236162

3616336163
OUTER APPLY (
36164-
SELECT TOP 1 query_plan,
36164+
SELECT TOP 1 Query_Plan,
3616536165
STUFF((SELECT DISTINCT N'', '' + Node.Data.value(''(@Column)[1]'', ''NVARCHAR(4000)'') + N'' {'' + Node.Data.value(''(@ParameterDataType)[1]'', ''NVARCHAR(4000)'') + N''}: '' + Node.Data.value(''(@ParameterCompiledValue)[1]'', ''NVARCHAR(4000)'') + N'' (Actual: '' + Node.Data.value(''(@ParameterRuntimeValue)[1]'', ''NVARCHAR(4000)'') + N'')''
36166-
FROM q.query_plan.nodes(''/*:ShowPlanXML/*:BatchSequence/*:Batch/*:Statements/*:StmtSimple/*:QueryPlan/*:ParameterList/*:ColumnReference'') AS Node(Data)
36166+
FROM q.Query_Plan.nodes(''/*:ShowPlanXML/*:BatchSequence/*:Batch/*:Statements/*:StmtSimple/*:QueryPlan/*:ParameterList/*:ColumnReference'') AS Node(Data)
3616736167
FOR XML PATH('''')), 1,2,'''')
3616836168
AS Live_Parameter_Info
3616936169
FROM @LiveQueryPlans q
36170-
WHERE (s.session_id = q.session_id)
36170+
WHERE (s.session_id = q.Session_Id)
3617136171

3617236172
) AS qs_live
3617336173

@@ -36260,7 +36260,7 @@ IF @OutputDatabaseName IS NOT NULL AND @OutputSchemaName IS NOT NULL AND @Output
3626036260
,[query_text]
3626136261
,[query_plan]'
3626236262
+ CASE WHEN @ProductVersionMajor >= 11 THEN N',[live_query_plan]' ELSE N'' END + N'
36263-
,[Cached_Parameter_Info]'
36263+
,[cached_parameter_info]'
3626436264
+ CASE WHEN @ProductVersionMajor >= 11 AND @ShowActualParameters = 1 THEN N',[Live_Parameter_Info]' ELSE N'' END + N'
3626536265
,[query_cost]
3626636266
,[status]

‎Install-Core-Blitz-No-Query-Store.sql‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27354,7 +27354,7 @@ IF @ProductVersionMajor >= 11
2735427354
END - query_stats.statement_start_offset )
2735527355
/ 2 ) + 1), dest.text) AS query_text ,
2735627356
derp.query_plan ,
27357-
CAST(COALESCE(qs_live.query_plan, ''<?No live query plan available. To turn on live plans, see https://www.BrentOzar.com/go/liveplans ?>'') AS XML) AS live_query_plan ,
27357+
CAST(COALESCE(qs_live.Query_Plan, ''<?No live query plan available. To turn on live plans, see https://www.BrentOzar.com/go/liveplans ?>'') AS XML) AS live_query_plan ,
2735827358
STUFF((SELECT DISTINCT N'', '' + Node.Data.value(''(@Column)[1]'', ''NVARCHAR(4000)'') + N'' {'' + Node.Data.value(''(@ParameterDataType)[1]'', ''NVARCHAR(4000)'') + N''}: '' + Node.Data.value(''(@ParameterCompiledValue)[1]'', ''NVARCHAR(4000)'')
2735927359
FROM derp.query_plan.nodes(''/*:ShowPlanXML/*:BatchSequence/*:Batch/*:Statements/*:StmtSimple/*:QueryPlan/*:ParameterList/*:ColumnReference'') AS Node(Data)
2736027360
FOR XML PATH('''')), 1,2,'''')
@@ -27588,13 +27588,13 @@ IF @ProductVersionMajor >= 11
2758827588
) as tempdb_allocations
2758927589

2759027590
OUTER APPLY (
27591-
SELECT TOP 1 query_plan,
27591+
SELECT TOP 1 Query_Plan,
2759227592
STUFF((SELECT DISTINCT N'', '' + Node.Data.value(''(@Column)[1]'', ''NVARCHAR(4000)'') + N'' {'' + Node.Data.value(''(@ParameterDataType)[1]'', ''NVARCHAR(4000)'') + N''}: '' + Node.Data.value(''(@ParameterCompiledValue)[1]'', ''NVARCHAR(4000)'') + N'' (Actual: '' + Node.Data.value(''(@ParameterRuntimeValue)[1]'', ''NVARCHAR(4000)'') + N'')''
27593-
FROM q.query_plan.nodes(''/*:ShowPlanXML/*:BatchSequence/*:Batch/*:Statements/*:StmtSimple/*:QueryPlan/*:ParameterList/*:ColumnReference'') AS Node(Data)
27593+
FROM q.Query_Plan.nodes(''/*:ShowPlanXML/*:BatchSequence/*:Batch/*:Statements/*:StmtSimple/*:QueryPlan/*:ParameterList/*:ColumnReference'') AS Node(Data)
2759427594
FOR XML PATH('''')), 1,2,'''')
2759527595
AS Live_Parameter_Info
2759627596
FROM @LiveQueryPlans q
27597-
WHERE (s.session_id = q.session_id)
27597+
WHERE (s.session_id = q.Session_Id)
2759827598

2759927599
) AS qs_live
2760027600

@@ -27687,7 +27687,7 @@ IF @OutputDatabaseName IS NOT NULL AND @OutputSchemaName IS NOT NULL AND @Output
2768727687
,[query_text]
2768827688
,[query_plan]'
2768927689
+ CASE WHEN @ProductVersionMajor >= 11 THEN N',[live_query_plan]' ELSE N'' END + N'
27690-
,[Cached_Parameter_Info]'
27690+
,[cached_parameter_info]'
2769127691
+ CASE WHEN @ProductVersionMajor >= 11 AND @ShowActualParameters = 1 THEN N',[Live_Parameter_Info]' ELSE N'' END + N'
2769227692
,[query_cost]
2769327693
,[status]

‎Install-Core-Blitz-With-Query-Store.sql‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33108,7 +33108,7 @@ IF @ProductVersionMajor >= 11
3310833108
END - query_stats.statement_start_offset )
3310933109
/ 2 ) + 1), dest.text) AS query_text ,
3311033110
derp.query_plan ,
33111-
CAST(COALESCE(qs_live.query_plan, ''<?No live query plan available. To turn on live plans, see https://www.BrentOzar.com/go/liveplans ?>'') AS XML) AS live_query_plan ,
33111+
CAST(COALESCE(qs_live.Query_Plan, ''<?No live query plan available. To turn on live plans, see https://www.BrentOzar.com/go/liveplans ?>'') AS XML) AS live_query_plan ,
3311233112
STUFF((SELECT DISTINCT N'', '' + Node.Data.value(''(@Column)[1]'', ''NVARCHAR(4000)'') + N'' {'' + Node.Data.value(''(@ParameterDataType)[1]'', ''NVARCHAR(4000)'') + N''}: '' + Node.Data.value(''(@ParameterCompiledValue)[1]'', ''NVARCHAR(4000)'')
3311333113
FROM derp.query_plan.nodes(''/*:ShowPlanXML/*:BatchSequence/*:Batch/*:Statements/*:StmtSimple/*:QueryPlan/*:ParameterList/*:ColumnReference'') AS Node(Data)
3311433114
FOR XML PATH('''')), 1,2,'''')
@@ -33342,13 +33342,13 @@ IF @ProductVersionMajor >= 11
3334233342
) as tempdb_allocations
3334333343

3334433344
OUTER APPLY (
33345-
SELECT TOP 1 query_plan,
33345+
SELECT TOP 1 Query_Plan,
3334633346
STUFF((SELECT DISTINCT N'', '' + Node.Data.value(''(@Column)[1]'', ''NVARCHAR(4000)'') + N'' {'' + Node.Data.value(''(@ParameterDataType)[1]'', ''NVARCHAR(4000)'') + N''}: '' + Node.Data.value(''(@ParameterCompiledValue)[1]'', ''NVARCHAR(4000)'') + N'' (Actual: '' + Node.Data.value(''(@ParameterRuntimeValue)[1]'', ''NVARCHAR(4000)'') + N'')''
33347-
FROM q.query_plan.nodes(''/*:ShowPlanXML/*:BatchSequence/*:Batch/*:Statements/*:StmtSimple/*:QueryPlan/*:ParameterList/*:ColumnReference'') AS Node(Data)
33347+
FROM q.Query_Plan.nodes(''/*:ShowPlanXML/*:BatchSequence/*:Batch/*:Statements/*:StmtSimple/*:QueryPlan/*:ParameterList/*:ColumnReference'') AS Node(Data)
3334833348
FOR XML PATH('''')), 1,2,'''')
3334933349
AS Live_Parameter_Info
3335033350
FROM @LiveQueryPlans q
33351-
WHERE (s.session_id = q.session_id)
33351+
WHERE (s.session_id = q.Session_Id)
3335233352

3335333353
) AS qs_live
3335433354

@@ -33441,7 +33441,7 @@ IF @OutputDatabaseName IS NOT NULL AND @OutputSchemaName IS NOT NULL AND @Output
3344133441
,[query_text]
3344233442
,[query_plan]'
3344333443
+ CASE WHEN @ProductVersionMajor >= 11 THEN N',[live_query_plan]' ELSE N'' END + N'
33444-
,[Cached_Parameter_Info]'
33444+
,[cached_parameter_info]'
3344533445
+ CASE WHEN @ProductVersionMajor >= 11 AND @ShowActualParameters = 1 THEN N',[Live_Parameter_Info]' ELSE N'' END + N'
3344633446
,[query_cost]
3344733447
,[status]

‎sp_BlitzWho.sql‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@ IF @ProductVersionMajor >= 11
814814
END - query_stats.statement_start_offset )
815815
/ 2 ) + 1), dest.text) AS query_text ,
816816
derp.query_plan ,
817-
CAST(COALESCE(qs_live.query_plan, ''<?No live query plan available. To turn on live plans, see https://www.BrentOzar.com/go/liveplans ?>'') AS XML) AS live_query_plan ,
817+
CAST(COALESCE(qs_live.Query_Plan, ''<?No live query plan available. To turn on live plans, see https://www.BrentOzar.com/go/liveplans ?>'') AS XML) AS live_query_plan ,
818818
STUFF((SELECT DISTINCT N'', '' + Node.Data.value(''(@Column)[1]'', ''NVARCHAR(4000)'') + N'' {'' + Node.Data.value(''(@ParameterDataType)[1]'', ''NVARCHAR(4000)'') + N''}: '' + Node.Data.value(''(@ParameterCompiledValue)[1]'', ''NVARCHAR(4000)'')
819819
FROM derp.query_plan.nodes(''/*:ShowPlanXML/*:BatchSequence/*:Batch/*:Statements/*:StmtSimple/*:QueryPlan/*:ParameterList/*:ColumnReference'') AS Node(Data)
820820
FOR XML PATH('''')), 1,2,'''')
@@ -1048,13 +1048,13 @@ IF @ProductVersionMajor >= 11
10481048
) as tempdb_allocations
10491049
10501050
OUTER APPLY (
1051-
SELECT TOP 1 query_plan,
1051+
SELECT TOP 1 Query_Plan,
10521052
STUFF((SELECT DISTINCT N'', '' + Node.Data.value(''(@Column)[1]'', ''NVARCHAR(4000)'') + N'' {'' + Node.Data.value(''(@ParameterDataType)[1]'', ''NVARCHAR(4000)'') + N''}: '' + Node.Data.value(''(@ParameterCompiledValue)[1]'', ''NVARCHAR(4000)'') + N'' (Actual: '' + Node.Data.value(''(@ParameterRuntimeValue)[1]'', ''NVARCHAR(4000)'') + N'')''
1053-
FROM q.query_plan.nodes(''/*:ShowPlanXML/*:BatchSequence/*:Batch/*:Statements/*:StmtSimple/*:QueryPlan/*:ParameterList/*:ColumnReference'') AS Node(Data)
1053+
FROM q.Query_Plan.nodes(''/*:ShowPlanXML/*:BatchSequence/*:Batch/*:Statements/*:StmtSimple/*:QueryPlan/*:ParameterList/*:ColumnReference'') AS Node(Data)
10541054
FOR XML PATH('''')), 1,2,'''')
10551055
AS Live_Parameter_Info
10561056
FROM @LiveQueryPlans q
1057-
WHERE (s.session_id = q.session_id)
1057+
WHERE (s.session_id = q.Session_Id)
10581058
10591059
) AS qs_live
10601060
@@ -1147,7 +1147,7 @@ IF @OutputDatabaseName IS NOT NULL AND @OutputSchemaName IS NOT NULL AND @Output
11471147
,[query_text]
11481148
,[query_plan]'
11491149
+ CASE WHEN @ProductVersionMajor >= 11 THEN N',[live_query_plan]' ELSE N'' END + N'
1150-
,[Cached_Parameter_Info]'
1150+
,[cached_parameter_info]'
11511151
+ CASE WHEN @ProductVersionMajor >= 11 AND @ShowActualParameters = 1 THEN N',[Live_Parameter_Info]' ELSE N'' END + N'
11521152
,[query_cost]
11531153
,[status]

0 commit comments

Comments
 (0)