Skip to content

Commit e5e2225

Browse files
BrentOzarclaude
andcommitted
#3888 Address Copilot PR review feedback
- sp_kill: Branch on @AzureSQLDB for output table creation — use 2-part names on Azure SQL DB, 3-part names on on-prem/MI - sp_BlitzWho: Update help text to say "2016 SP2 and newer" to match the version gate Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 9381edd commit e5e2225

2 files changed

Lines changed: 17 additions & 6 deletions

File tree

sp_BlitzWho.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ versions for free, watch training videos on how it works, get more info on
8585
the findings, contribute your own code, and more.
8686
8787
Known limitations of this version:
88-
- Only SQL Server 2016 and newer. Sorry, 2014 and earlier.
88+
- Only SQL Server 2016 SP2 and newer. Sorry, 2016 SP1 and earlier.
8989
- If @OutputDatabaseName and @OutputSchemaName are populated, the database and
9090
schema must already exist. We will not create them, only the table.
9191

sp_kill.sql

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -648,13 +648,24 @@ For more info, visit http://FirstResponderKit.org
648648
IF @Debug = 1
649649
RAISERROR('Creating/updating persistent output table...', 0, 1) WITH NOWAIT;
650650

651-
SET @ObjectFullName = @OutputDatabaseName + N'.' + @OutputSchemaName + N'.' + @OutputTableName;
651+
IF @AzureSQLDB = 1
652+
SET @ObjectFullName = @OutputSchemaName + N'.' + @OutputTableName;
653+
ELSE
654+
SET @ObjectFullName = @OutputDatabaseName + N'.' + @OutputSchemaName + N'.' + @OutputTableName;
652655

653656
/* Create table if it doesn't exist */
654-
SET @StringToExecute = N'
655-
IF EXISTS(SELECT * FROM ' + @OutputDatabaseName + N'.INFORMATION_SCHEMA.SCHEMATA WHERE QUOTENAME(SCHEMA_NAME) = ''' + @OutputSchemaName + N''')
656-
AND NOT EXISTS (SELECT * FROM ' + @OutputDatabaseName + N'.INFORMATION_SCHEMA.TABLES WHERE QUOTENAME(TABLE_SCHEMA) = ''' + @OutputSchemaName + N''' AND QUOTENAME(TABLE_NAME) = ''' + @OutputTableName + N''')
657-
CREATE TABLE ' + @ObjectFullName + N' (
657+
IF @AzureSQLDB = 1
658+
SET @StringToExecute = N'
659+
IF EXISTS(SELECT * FROM INFORMATION_SCHEMA.SCHEMATA WHERE QUOTENAME(SCHEMA_NAME) = ''' + @OutputSchemaName + N''')
660+
AND NOT EXISTS (SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE QUOTENAME(TABLE_SCHEMA) = ''' + @OutputSchemaName + N''' AND QUOTENAME(TABLE_NAME) = ''' + @OutputTableName + N''')
661+
CREATE TABLE ' + @ObjectFullName + N' (';
662+
ELSE
663+
SET @StringToExecute = N'
664+
IF EXISTS(SELECT * FROM ' + @OutputDatabaseName + N'.INFORMATION_SCHEMA.SCHEMATA WHERE QUOTENAME(SCHEMA_NAME) = ''' + @OutputSchemaName + N''')
665+
AND NOT EXISTS (SELECT * FROM ' + @OutputDatabaseName + N'.INFORMATION_SCHEMA.TABLES WHERE QUOTENAME(TABLE_SCHEMA) = ''' + @OutputSchemaName + N''' AND QUOTENAME(TABLE_NAME) = ''' + @OutputTableName + N''')
666+
CREATE TABLE ' + @ObjectFullName + N' (';
667+
668+
SET @StringToExecute = @StringToExecute + N'
658669
Id INT IDENTITY(1,1) NOT NULL PRIMARY KEY CLUSTERED,
659670
ServerName NVARCHAR(128) NULL,
660671
CheckDate DATETIMEOFFSET NULL,

0 commit comments

Comments
 (0)