Logic changes and Log to table code changes added

BrentOzarULTD#2887 Replaced the dbcc inputbuffer loop with a cursor to reduce additional reads for retrieving the next session_id to execute.

Added a new column to the output table 'outer_command'

Added relevant code to allow log to table for both @GetOuterCommand - 0 and = 1

Author: Adedba

sp_BlitzWho.sql

@@ -161,6 +161,7 @@ IF @OutputDatabaseName IS NOT NULL AND @OutputSchemaName IS NOT NULL AND @Output
 	[session_id] [smallint] NOT NULL,
 	[database_name] [nvarchar](128) NULL,
 	[query_text] [nvarchar](max) NULL,
+	[outer_command] NVARCHAR(4000) NULL,
 	[query_plan] [xml] NULL,
 	[live_query_plan] [xml] NULL,
 	[cached_parameter_info] [nvarchar](max) NULL,
@@ -277,6 +278,13 @@ IF @OutputDatabaseName IS NOT NULL AND @OutputSchemaName IS NOT NULL AND @Output
 		ALTER TABLE ' + @ObjectFullName + N' ADD live_parameter_info NVARCHAR(MAX) NULL;';
 	EXEC(@StringToExecute);
 
+	/* If the table doesn't have the new outer_command column, add it. See Github #2887. */
+	SET @ObjectFullName = @OutputDatabaseName + N'.' + @OutputSchemaName + N'.' +  @OutputTableName;
+	SET @StringToExecute = N'IF NOT EXISTS (SELECT * FROM ' + @OutputDatabaseName + N'.sys.all_columns 
+		WHERE object_id = (OBJECT_ID(''' + @ObjectFullName + N''')) AND name = ''outer_command'')
+		ALTER TABLE ' + @ObjectFullName + N' ADD outer_command NVARCHAR(4000) NULL;';
+	EXEC(@StringToExecute);
+
 	/* Delete history older than @OutputTableRetentionDays */
 	SET @OutputTableCleanupDate = CAST( (DATEADD(DAY, -1 * @OutputTableRetentionDays, GETDATE() ) ) AS DATE);
 	SET @StringToExecute = N' IF EXISTS(SELECT * FROM '
@@ -573,13 +581,9 @@ SELECT @BlockingCheck = N'SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 						FROM sys.sysprocesses AS sys1
 						JOIN sys.sysprocesses AS sys2
 						ON sys1.spid = sys2.blocked;
-
 						'+CASE
-							WHEN (@GetOuterCommand = 1 AND (NOT EXISTS(SELECT 1 FROM sys.all_objects WHERE [name] = N'dm_exec_input_buffer'))) THEN N'DECLARE @Iteration INT = 1;
-						DECLARE @DBCCCommand NVARCHAR(50);
-						DECLARE @Sessioncount INT;
-						DECLARE @SessionID INT = 0;
-
+							WHEN (@GetOuterCommand = 1 AND (NOT EXISTS(SELECT 1 FROM sys.all_objects WHERE [name] = N'dm_exec_input_buffer'))) THEN N'
+						DECLARE @session_id SMALLINT;
 						DECLARE @Sessions TABLE 
 						(
 							session_id INT
@@ -594,33 +598,44 @@ SELECT @BlockingCheck = N'SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
 						event_info	NVARCHAR(4000)
 						);
 
-						INSERT INTO @Sessions (session_id) 
+						DECLARE inputbuffer_cursor
+						
+						CURSOR LOCAL FAST_FORWARD
+						FOR 
 						SELECT session_id
 						FROM sys.dm_exec_sessions
 						WHERE session_id <> @@SPID
-						AND session_id > 50;
-
-						SELECT @Sessioncount = COUNT(*) FROM @Sessions;
-
-						WHILE (@Iteration <= @Sessioncount) 
-						BEGIN 
-							SELECT TOP 1 @SessionID = session_id
-							FROM @Sessions
-							WHERE session_id > @SessionID
-							ORDER BY session_id ASC;
-
-							SET @DBCCCommand = ''DBCC INPUTBUFFER (''+CAST(@SessionID AS NVARCHAR(10))+'') WITH NO_INFOMSGS;'';
-
-							INSERT INTO @inputbuffer (event_type,parameters,event_info) 
-							EXEC(@DBCCCommand);
-
-							UPDATE @inputbuffer 
-							SET session_id = @SessionID 
-							WHERE ID = SCOPE_IDENTITY();
-
-							SET @Iteration += 1;
-
-						END'
+						AND is_user_process = 1;
+						
+						OPEN inputbuffer_cursor;
+						
+						FETCH NEXT FROM inputbuffer_cursor INTO @session_id;
+						
+						WHILE (@@FETCH_STATUS = 0)
+						BEGIN;
+							BEGIN TRY;
+
+								INSERT INTO @inputbuffer ([event_type],[parameters],[event_info])
+								EXEC sp_executesql
+									N''DBCC INPUTBUFFER(@session_id) WITH NO_INFOMSGS;'',
+									N''@session_id SMALLINT'',
+									@session_id;
+						
+								UPDATE @inputbuffer 
+								SET session_id = @session_id 
+								WHERE ID = SCOPE_IDENTITY();
+
+							END TRY
+							BEGIN CATCH
+								RAISERROR(''DBCC inputbuffer failed for session %d'',0,0,@session_id) WITH NOWAIT;
+							END CATCH;
+						
+							FETCH NEXT FROM inputbuffer_cursor INTO @session_id
+						
+						END;
+						
+						CLOSE inputbuffer_cursor;
+						DEALLOCATE inputbuffer_cursor;'
 						ELSE N''
 						END+
 						N' 
@@ -786,7 +801,7 @@ BEGIN
 				WHEN @GetOuterCommand = 1 THEN CASE
 													WHEN EXISTS(SELECT 1 FROM sys.all_objects WHERE [name] = N'dm_exec_input_buffer') THEN N'OUTER APPLY sys.dm_exec_input_buffer (s.session_id, 0) AS ib'
 													ELSE N'LEFT JOIN @inputbuffer ib ON s.session_id = ib.session_id'
-													END
+												END
 				ELSE N''
 			 END+N'
 			 LEFT JOIN sys.dm_exec_requests AS r
@@ -1218,7 +1233,8 @@ IF @OutputDatabaseName IS NOT NULL AND @OutputSchemaName IS NOT NULL AND @Output
 	,[elapsed_time]
 	,[session_id]
 	,[database_name]
-	,[query_text]
+	,[query_text]'
+	+ CASE WHEN @GetOuterCommand = 1 THEN N',[outer_command]' ELSE N'' END + N'
 	,[query_plan]'
     + CASE WHEN @ProductVersionMajor >= 11 THEN N',[live_query_plan]' ELSE N'' END + N'
 	,[cached_parameter_info]'