@@ -2178,15 +2178,15 @@ SELECT
21782178 CASE WHEN is_XML = 1 OR is_spatial= 1 THEN N ' ' /* Not even trying for these just yet...*/
21792179 ELSE
21802180 CASE WHEN is_primary_key= 1 THEN
2181- N ' ALTER TABLE ' + QUOTENAME ([schema_name]) +
2181+ N ' ALTER TABLE ' + QUOTENAME ([database_name]) + N ' .' + QUOTENAME ([ schema_name]) +
21822182 N ' .' + QUOTENAME ([object_name]) +
21832183 N ' ADD CONSTRAINT [' +
21842184 index_name +
21852185 N ' ] PRIMARY KEY ' +
21862186 CASE WHEN index_id= 1 THEN N ' CLUSTERED (' ELSE N ' (' END +
21872187 key_column_names_with_sort_order_no_types + N ' )'
21882188 WHEN is_CX_columnstore= 1 THEN
2189- N ' CREATE CLUSTERED COLUMNSTORE INDEX ' + QUOTENAME (index_name) + N ' on ' + QUOTENAME ([schema_name]) + ' .' + QUOTENAME ([object_name])
2189+ N ' CREATE CLUSTERED COLUMNSTORE INDEX ' + QUOTENAME (index_name) + N ' on ' + QUOTENAME ([database_name]) + N ' .' + QUOTENAME ([ schema_name]) + N ' .' + QUOTENAME ([object_name])
21902190 ELSE /* Else not a PK or cx columnstore */
21912191 N ' CREATE ' +
21922192 CASE WHEN is_unique= 1 THEN N ' UNIQUE ' ELSE N ' ' END +
@@ -2195,7 +2195,8 @@ SELECT
21952195 ELSE N ' ' END +
21962196 N ' INDEX ['
21972197 + index_name + N ' ] ON ' +
2198- QUOTENAME ([schema_name]) + ' .' + QUOTENAME ([object_name]) +
2198+ QUOTENAME ([database_name]) + N ' .' +
2199+ QUOTENAME ([schema_name]) + N ' .' + QUOTENAME ([object_name]) +
21992200 CASE WHEN is_NC_columnstore= 1 THEN
22002201 N ' (' + ISNULL (include_column_names_no_types,' ' ) + N ' )'
22012202 ELSE /* Else not colunnstore */
@@ -2358,10 +2359,10 @@ BEGIN
23582359 ct .create_tsql ,
23592360 CASE
23602361 WHEN s .is_primary_key = 1 AND s .index_definition <> ' [HEAP]'
2361- THEN N ' --ALTER TABLE ' + QUOTENAME (s.[schema_name]) + N ' .' + QUOTENAME (s.[object_name])
2362+ THEN N ' --ALTER TABLE ' + QUOTENAME (s.[database_name]) + N ' .' + QUOTENAME (s.[ schema_name]) + N ' .' + QUOTENAME (s.[object_name])
23622363 + N ' DROP CONSTRAINT ' + QUOTENAME (s .index_name ) + N ' ;'
23632364 WHEN s .is_primary_key = 0 AND s .index_definition <> ' [HEAP]'
2364- THEN N ' --DROP INDEX '+ QUOTENAME (s .index_name ) + N ' ON ' +
2365+ THEN N ' --DROP INDEX '+ QUOTENAME (s .index_name ) + N ' ON ' + QUOTENAME (s.[database_name]) + N ' .' +
23652366 QUOTENAME (s.[schema_name]) + N ' .' + QUOTENAME (s.[object_name]) + N ' ;'
23662367 ELSE N ' '
23672368 END AS drop_tsql,
@@ -4921,10 +4922,10 @@ BEGIN;
49214922 ISNULL(i.index_name, '' '' ) AS [Index Name],
49224923 CASE
49234924 WHEN i.is_primary_key = 1 AND i.index_definition <> '' [HEAP]''
4924- THEN N'' -ALTER TABLE '' + QUOTENAME(i.[schema_name]) + N'' .'' + QUOTENAME(i.[object_name]) +
4925+ THEN N'' -ALTER TABLE '' + QUOTENAME(i.[database_name]) + N' ' .' ' + QUOTENAME(i.[ schema_name]) + N'' .'' + QUOTENAME(i.[object_name]) +
49254926 N'' DROP CONSTRAINT '' + QUOTENAME(i.index_name) + N'' ;''
49264927 WHEN i.is_primary_key = 0 AND i.index_definition <> '' [HEAP]''
4927- THEN N'' --DROP INDEX '' + QUOTENAME(i.index_name) + N'' ON '' +
4928+ THEN N'' --DROP INDEX '' + QUOTENAME(i.index_name) + N'' ON '' + QUOTENAME(i.[database_name]) + N' ' .' ' +
49284929 QUOTENAME(i.[schema_name]) + N'' .'' + QUOTENAME(i.[object_name]) + N'' ;''
49294930 ELSE N'' ''
49304931 END AS [Drop TSQL],
@@ -5088,10 +5089,10 @@ BEGIN;
50885089 more_info AS [More Info],
50895090 CASE
50905091 WHEN i .is_primary_key = 1 AND i .index_definition <> ' [HEAP]'
5091- THEN N ' --ALTER TABLE ' + QUOTENAME (i.[schema_name]) + N ' .' + QUOTENAME (i.[object_name])
5092+ THEN N ' --ALTER TABLE ' + QUOTENAME (i.[database_name]) + N ' .' + QUOTENAME (i.[ schema_name]) + N ' .' + QUOTENAME (i.[object_name])
50925093 + N ' DROP CONSTRAINT ' + QUOTENAME (i .index_name ) + N ' ;'
50935094 WHEN i .is_primary_key = 0 AND i .index_definition <> ' [HEAP]'
5094- THEN N ' --DROP INDEX '+ QUOTENAME (i .index_name ) + N ' ON ' +
5095+ THEN N ' --DROP INDEX '+ QUOTENAME (i .index_name ) + N ' ON ' + QUOTENAME (i.[database_name]) + N ' .' +
50955096 QUOTENAME (i.[schema_name]) + N ' .' + QUOTENAME (i.[object_name]) + N ' ;'
50965097 ELSE N ' '
50975098 END AS [Drop TSQL],
0 commit comments