Skip to content

Commit 51b582d

Browse files
authored
Merge pull request #3723 from chadbaldwin/patch-1
Bug fix: DB_ID() does not support quoted identifiers
2 parents ed60333 + 8f6dde2 commit 51b582d

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

sp_BlitzIndex.sql

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1953,7 +1953,7 @@ WITH
19531953
ON ty.user_type_id = co.user_type_id
19541954
WHERE id_inner.index_handle = id.index_handle
19551955
AND id_inner.object_id = id.object_id
1956-
AND id_inner.database_id = DB_ID(''' + QUOTENAME(@DatabaseName) + N''')
1956+
AND id_inner.database_id = DB_ID(@i_DatabaseName)
19571957
AND cn_inner.IndexColumnType = cn.IndexColumnType
19581958
FOR XML PATH('''')
19591959
),
@@ -1991,7 +1991,7 @@ WITH
19911991
) x (n)
19921992
CROSS APPLY n.nodes(''x'') node(v)
19931993
)AS cn
1994-
WHERE id.database_id = DB_ID(''' + QUOTENAME(@DatabaseName) + N''')
1994+
WHERE id.database_id = DB_ID(@i_DatabaseName)
19951995
GROUP BY
19961996
id.index_handle,
19971997
id.object_id,
@@ -2137,7 +2137,7 @@ OPTION (RECOMPILE);';
21372137
END;
21382138

21392139
SET @dsql = N'
2140-
SELECT DB_ID(N' + QUOTENAME(@DatabaseName,'''') + N') AS [database_id],
2140+
SELECT DB_ID(@i_DatabaseName) AS [database_id],
21412141
@i_DatabaseName AS database_name,
21422142
s.name,
21432143
fk_object.name AS foreign_key_name,
@@ -2206,17 +2206,17 @@ OPTION (RECOMPILE);';
22062206
BEGIN
22072207
SET @dsql = N'
22082208
SELECT
2209-
DB_ID(N' + QUOTENAME(@DatabaseName,'''') + N') AS [database_id],
2209+
DB_ID(@i_DatabaseName) AS [database_id],
22102210
@i_DatabaseName AS database_name,
22112211
foreign_key_schema =
22122212
s.name,
22132213
foreign_key_name =
22142214
fk.name,
22152215
foreign_key_table =
2216-
OBJECT_NAME(fk.parent_object_id, DB_ID(N' + QUOTENAME(@DatabaseName,'''') + N')),
2216+
OBJECT_NAME(fk.parent_object_id, DB_ID(@i_DatabaseName)),
22172217
fk.parent_object_id,
22182218
foreign_key_referenced_table =
2219-
OBJECT_NAME(fk.referenced_object_id, DB_ID(N' + QUOTENAME(@DatabaseName,'''') + N')),
2219+
OBJECT_NAME(fk.referenced_object_id, DB_ID(@i_DatabaseName)),
22202220
fk.referenced_object_id
22212221
FROM ' + QUOTENAME(@DatabaseName) + N'.sys.foreign_keys fk
22222222
JOIN ' + QUOTENAME(@DatabaseName) + N'.sys.schemas AS s
@@ -2290,7 +2290,7 @@ OPTION (RECOMPILE);';
22902290
days_since_last_stats_update, rows, rows_sampled, percent_sampled, histogram_steps, modification_counter,
22912291
percent_modifications, modifications_before_auto_update, index_type_desc, table_create_date, table_modify_date,
22922292
no_recompute, has_filter, filter_definition, persisted_sample_percent, is_incremental)
2293-
SELECT DB_ID(N' + QUOTENAME(@DatabaseName,'''') + N') AS [database_id],
2293+
SELECT DB_ID(@i_DatabaseName) AS [database_id],
22942294
@i_DatabaseName AS database_name,
22952295
obj.object_id,
22962296
obj.name AS table_name,
@@ -2385,7 +2385,7 @@ OPTION (RECOMPILE);';
23852385
last_statistics_update, days_since_last_stats_update, rows, modification_counter,
23862386
percent_modifications, modifications_before_auto_update, index_type_desc, table_create_date, table_modify_date,
23872387
no_recompute, has_filter, filter_definition, persisted_sample_percent, is_incremental)
2388-
SELECT DB_ID(N' + QUOTENAME(@DatabaseName,'''') + N') AS [database_id],
2388+
SELECT DB_ID(@i_DatabaseName) AS [database_id],
23892389
@i_DatabaseName AS database_name,
23902390
obj.object_id,
23912391
obj.name AS table_name,
@@ -2518,7 +2518,7 @@ OPTION (RECOMPILE);';
25182518
BEGIN
25192519
RAISERROR (N'Gathering Temporal Table Info',0,1) WITH NOWAIT;
25202520
SET @dsql=N'SELECT ' + QUOTENAME(@DatabaseName,'''') + N' AS database_name,
2521-
DB_ID(N' + QUOTENAME(@DatabaseName,'''') + N') AS [database_id],
2521+
DB_ID(@i_DatabaseName) AS [database_id],
25222522
s.name AS schema_name,
25232523
t.name AS table_name,
25242524
oa.hsn as history_schema_name,
@@ -2554,7 +2554,7 @@ OPTION (RECOMPILE);';
25542554
INSERT #TemporalTables ( database_name, database_id, schema_name, table_name, history_schema_name,
25552555
history_table_name, start_column_name, end_column_name, period_name, history_table_object_id )
25562556

2557-
EXEC sp_executesql @dsql;
2557+
EXEC sp_executesql @dsql, @params = N'@i_DatabaseName NVARCHAR(128)', @i_DatabaseName = @DatabaseName;
25582558
END;
25592559

25602560
SET @dsql=N'SELECT DB_ID(@i_DatabaseName) AS [database_id],

0 commit comments

Comments
 (0)