Skip to content

Commit a31ba4a

Browse files
committed
replace EP ticks with html code equivalent
to prevent EP-embedded code blocks from being formatted inside tables
1 parent 5968e06 commit a31ba4a

File tree

1 file changed

+24
-18
lines changed

1 file changed

+24
-18
lines changed

sp_doc.sql

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ sp_doc - Always have current documentation by generating it on the fly in markdo
7878
7979
Part of the DBA MultiTool http://dba-multitool.org
8080
81-
Version: 20210307
81+
Version: 20210312
8282
8383
MIT License
8484
@@ -115,6 +115,8 @@ BEGIN
115115
,@Msg NVARCHAR(MAX)
116116
,@SensitivityClassification BIT
117117
,@PipeHTMLCode CHAR(6) = '|'
118+
,@TickHTMLCode CHAR(5) = '`'
119+
,@BreakHTMLCode CHAR(5) = '<br/>'
118120
-- Variables for Emoji mode
119121
,@Yes VARCHAR(20) = 'yes'
120122
,@No VARCHAR(20) = 'no'
@@ -285,7 +287,7 @@ BEGIN
285287
END;
286288
287289
INSERT INTO #markdown
288-
SELECT CONCAT(''| '', REPLACE(REPLACE(CAST([ep].[value] AS NVARCHAR(4000)), ''|'', @PipeHTMLCode COLLATE DATABASE_DEFAULT), CHAR(13) + CHAR(10), ''<br/>'') COLLATE DATABASE_DEFAULT, '' | '')
290+
SELECT CONCAT(''| '', REPLACE(REPLACE(REPLACE(CAST([ep].[value] AS NVARCHAR(4000)), ''|'', @PipeHTMLCode COLLATE DATABASE_DEFAULT), CHAR(13) + CHAR(10), @BreakHTMLCode COLLATE DATABASE_DEFAULT), ''`'', @TickHTMLCode COLLATE DATABASE_DEFAULT) COLLATE DATABASE_DEFAULT, '' | '')
289291
FROM [sys].[tables] AS [t] WITH(NOLOCK)
290292
INNER JOIN [sys].[extended_properties] AS [ep] WITH(NOLOCK) ON [t].[object_id] = [ep].[major_id]
291293
WHERE [t].[object_id] = @objectid
@@ -365,7 +367,7 @@ BEGIN
365367
,'' | ''
366368
,OBJECT_DEFINITION([dc].[object_id])
367369
,'' | ''
368-
,REPLACE(REPLACE(CAST([ep].[value] AS NVARCHAR(4000)), ''|'', @PipeHTMLCode COLLATE DATABASE_DEFAULT), CHAR(13) + CHAR(10), ''<br/>'') COLLATE DATABASE_DEFAULT
370+
,REPLACE(REPLACE(REPLACE(CAST([ep].[value] AS NVARCHAR(4000)), ''|'', @PipeHTMLCode COLLATE DATABASE_DEFAULT), CHAR(13) + CHAR(10), @BreakHTMLCode COLLATE DATABASE_DEFAULT), ''`'', @TickHTMLCode COLLATE DATABASE_DEFAULT) COLLATE DATABASE_DEFAULT
369371
,'' |''';
370372
IF @SensitivityClassification = 1
371373
BEGIN
@@ -472,7 +474,7 @@ BEGIN
472474
, '' | ''
473475
, @include_columns COLLATE DATABASE_DEFAULT
474476
, '' | ''
475-
, REPLACE(REPLACE(CAST([ep].[value] AS NVARCHAR(4000)), ''|'', @PipeHTMLCode COLLATE DATABASE_DEFAULT), CHAR(13) + CHAR(10), ''<br/>'') COLLATE DATABASE_DEFAULT
477+
, REPLACE(REPLACE(REPLACE(CAST([ep].[value] AS NVARCHAR(4000)), ''|'', @PipeHTMLCode COLLATE DATABASE_DEFAULT), CHAR(13) + CHAR(10), @BreakHTMLCode COLLATE DATABASE_DEFAULT), ''`'', @TickHTMLCode COLLATE DATABASE_DEFAULT) COLLATE DATABASE_DEFAULT
476478
, '' |'')
477479
FROM [sys].[indexes] AS [ind]
478480
LEFT JOIN [sys].[extended_properties] AS [ep] ON [ind].[object_id] = [ep].[major_id]
@@ -629,7 +631,7 @@ BEGIN
629631
END;
630632
631633
INSERT INTO #markdown
632-
SELECT CONCAT(''| '', REPLACE(REPLACE(CAST([ep].[value] AS NVARCHAR(4000)), ''|'', @PipeHTMLCode COLLATE DATABASE_DEFAULT), CHAR(13) + CHAR(10), ''<br/>''), '' |'')
634+
SELECT CONCAT(''| '', REPLACE(REPLACE(REPLACE(CAST([ep].[value] AS NVARCHAR(4000)), ''|'', @PipeHTMLCode COLLATE DATABASE_DEFAULT), CHAR(13) + CHAR(10), @BreakHTMLCode COLLATE DATABASE_DEFAULT), ''`'', @TickHTMLCode COLLATE DATABASE_DEFAULT), '' |'')
633635
FROM [sys].[views] AS [v]
634636
INNER JOIN [sys].[extended_properties] AS [ep] ON [v].[object_id] = [ep].[major_id]
635637
WHERE [v].[object_id] = @objectid
@@ -681,7 +683,7 @@ BEGIN
681683
ELSE @No
682684
END
683685
,'' | ''
684-
,REPLACE(REPLACE(CAST([ep].[value] AS NVARCHAR(4000)), ''|'', @PipeHTMLCode COLLATE DATABASE_DEFAULT), CHAR(13) + CHAR(10), ''<br/>'')
686+
,REPLACE(REPLACE(REPLACE(CAST([ep].[value] AS NVARCHAR(4000)), ''|'', @PipeHTMLCode COLLATE DATABASE_DEFAULT), CHAR(13) + CHAR(10), @BreakHTMLCode COLLATE DATABASE_DEFAULT), ''`'', @TickHTMLCode COLLATE DATABASE_DEFAULT)
685687
,'' |'')
686688
FROM [sys].[views] AS [o]
687689
INNER JOIN [sys].[columns] AS [c] ON [o].[object_id] = [c].[object_id]
@@ -768,7 +770,7 @@ BEGIN
768770
, '' | ''
769771
, @include_columns COLLATE DATABASE_DEFAULT
770772
, '' | ''
771-
, REPLACE(REPLACE(CAST([ep].[value] AS NVARCHAR(4000)), ''|'', @PipeHTMLCode COLLATE DATABASE_DEFAULT), CHAR(13) + CHAR(10), ''<br/>'') COLLATE DATABASE_DEFAULT
773+
, REPLACE(REPLACE(REPLACE(CAST([ep].[value] AS NVARCHAR(4000)), ''|'', @PipeHTMLCode COLLATE DATABASE_DEFAULT), CHAR(13) + CHAR(10), @BreakHTMLCode COLLATE DATABASE_DEFAULT), ''`'', @TickHTMLCode COLLATE DATABASE_DEFAULT) COLLATE DATABASE_DEFAULT
772774
, '' |'')
773775
FROM [sys].[indexes] AS [ind]
774776
LEFT JOIN [sys].[extended_properties] AS [ep] ON [ind].[object_id] = [ep].[major_id]
@@ -850,7 +852,7 @@ BEGIN
850852
END;
851853
852854
INSERT INTO #markdown
853-
SELECT CONCAT(''| '', REPLACE(REPLACE(CAST([ep].[value] AS NVARCHAR(4000)), ''|'', @PipeHTMLCode COLLATE DATABASE_DEFAULT), CHAR(13) + CHAR(10), ''<br/>''), '' |'')
855+
SELECT CONCAT(''| '', REPLACE(REPLACE(REPLACE(CAST([ep].[value] AS NVARCHAR(4000)), ''|'', @PipeHTMLCode COLLATE DATABASE_DEFAULT), CHAR(13) + CHAR(10), @BreakHTMLCode COLLATE DATABASE_DEFAULT), ''`'', @TickHTMLCode COLLATE DATABASE_DEFAULT), '' |'')
854856
FROM [sys].[procedures] AS [p]
855857
INNER JOIN [sys].[extended_properties] AS [ep] ON [p].[object_id] = [ep].[major_id]
856858
WHERE [p].[object_id] = @objectid
@@ -904,7 +906,7 @@ BEGIN
904906
ELSE @No
905907
END
906908
,'' | ''
907-
,REPLACE(REPLACE(CAST([ep].[value] AS NVARCHAR(4000)), ''|'', @PipeHTMLCode COLLATE DATABASE_DEFAULT), CHAR(13) + CHAR(10), ''<br/>'')
909+
,REPLACE(REPLACE(REPLACE(CAST([ep].[value] AS NVARCHAR(4000)), ''|'', @PipeHTMLCode COLLATE DATABASE_DEFAULT), CHAR(13) + CHAR(10), @BreakHTMLCode COLLATE DATABASE_DEFAULT), ''`'', @TickHTMLCode COLLATE DATABASE_DEFAULT)
908910
, '' |'')
909911
FROM [sys].[procedures] AS [proc]
910912
INNER JOIN [sys].[parameters] AS [param] ON [param].[object_id] = [proc].[object_id]
@@ -1004,7 +1006,7 @@ BEGIN
10041006
END;
10051007
10061008
INSERT INTO #markdown
1007-
SELECT CONCAT(''| '', REPLACE(REPLACE(CAST([ep].[value] AS NVARCHAR(4000)), ''|'', @PipeHTMLCode COLLATE DATABASE_DEFAULT), CHAR(13) + CHAR(10), ''<br/>''), '' |'')
1009+
SELECT CONCAT(''| '', REPLACE(REPLACE(REPLACE(CAST([ep].[value] AS NVARCHAR(4000)), ''|'', @PipeHTMLCode COLLATE DATABASE_DEFAULT), CHAR(13) + CHAR(10), @BreakHTMLCode COLLATE DATABASE_DEFAULT), ''`'', @TickHTMLCode COLLATE DATABASE_DEFAULT), '' |'')
10081010
FROM [sys].[objects] AS [o]
10091011
INNER JOIN [sys].[extended_properties] AS [ep] ON [o].[object_id] = [ep].[major_id]
10101012
WHERE [o].[object_id] = @objectid
@@ -1058,7 +1060,7 @@ BEGIN
10581060
ELSE @No
10591061
END
10601062
,'' | ''
1061-
,REPLACE(REPLACE(CAST([ep].[value] AS NVARCHAR(4000)), ''|'', @PipeHTMLCode COLLATE DATABASE_DEFAULT), CHAR(13) + CHAR(10), ''<br/>'')
1063+
,REPLACE(REPLACE(REPLACE(CAST([ep].[value] AS NVARCHAR(4000)), ''|'', @PipeHTMLCode COLLATE DATABASE_DEFAULT), CHAR(13) + CHAR(10), @BreakHTMLCode COLLATE DATABASE_DEFAULT), ''`'', @TickHTMLCode COLLATE DATABASE_DEFAULT)
10621064
, '' |'')
10631065
FROM [sys].[objects] AS [o]
10641066
INNER JOIN [sys].[parameters] AS [param] ON [param].[object_id] = [o].[object_id]
@@ -1144,7 +1146,7 @@ BEGIN
11441146
END;
11451147
11461148
INSERT INTO #markdown
1147-
SELECT CONCAT(''| '', REPLACE(REPLACE(CAST([ep].[value] AS NVARCHAR(4000)), ''|'', @PipeHTMLCode COLLATE DATABASE_DEFAULT), CHAR(13) + CHAR(10), ''<br/>''), '' |'')
1149+
SELECT CONCAT(''| '', REPLACE(REPLACE(REPLACE(CAST([ep].[value] AS NVARCHAR(4000)), ''|'', @PipeHTMLCode COLLATE DATABASE_DEFAULT), CHAR(13) + CHAR(10), @BreakHTMLCode COLLATE DATABASE_DEFAULT), ''`'', @TickHTMLCode COLLATE DATABASE_DEFAULT), '' |'')
11481150
FROM [sys].[objects] AS [o]
11491151
INNER JOIN [sys].[extended_properties] AS [ep] ON [o].[object_id] = [ep].[major_id]
11501152
WHERE [o].[object_id] = @objectid
@@ -1195,7 +1197,7 @@ BEGIN
11951197
ELSE @No
11961198
END
11971199
,'' | ''
1198-
,REPLACE(REPLACE(CAST([ep].[value] AS NVARCHAR(4000)), ''|'', @PipeHTMLCode COLLATE DATABASE_DEFAULT), CHAR(13) + CHAR(10), ''<br/>'')
1200+
,REPLACE(REPLACE(REPLACE(CAST([ep].[value] AS NVARCHAR(4000)), ''|'', @PipeHTMLCode COLLATE DATABASE_DEFAULT), CHAR(13) + CHAR(10), @BreakHTMLCode COLLATE DATABASE_DEFAULT), ''`'', @TickHTMLCode COLLATE DATABASE_DEFAULT)
11991201
, '' |'')
12001202
FROM [sys].[objects] AS [o]
12011203
INNER JOIN [sys].[parameters] AS [param] ON [param].[object_id] = [o].[object_id]
@@ -1279,7 +1281,7 @@ BEGIN
12791281
END;
12801282
12811283
INSERT INTO #markdown
1282-
SELECT CONCAT(''| '', REPLACE(REPLACE(CAST([ep].[value] AS NVARCHAR(4000)), ''|'', @PipeHTMLCode COLLATE DATABASE_DEFAULT), CHAR(13) + CHAR(10), ''<br/>''), '' |'')
1284+
SELECT CONCAT(''| '', REPLACE(REPLACE(REPLACE(CAST([ep].[value] AS NVARCHAR(4000)), ''|'', @PipeHTMLCode COLLATE DATABASE_DEFAULT), CHAR(13) + CHAR(10), @BreakHTMLCode COLLATE DATABASE_DEFAULT), ''`'', @TickHTMLCode COLLATE DATABASE_DEFAULT), '' |'')
12831285
FROM [sys].[synonyms] AS [s]
12841286
INNER JOIN [sys].[extended_properties] AS [ep] ON [s].[object_id] = [ep].[major_id]
12851287
WHERE [s].[object_id] = @objectid
@@ -1370,7 +1372,7 @@ BEGIN
13701372
END;
13711373
13721374
INSERT INTO #markdown
1373-
SELECT CONCAT(''| '', REPLACE(REPLACE(CAST([ep].[value] AS NVARCHAR(4000)), ''|'', @PipeHTMLCode COLLATE DATABASE_DEFAULT), CHAR(13) + CHAR(10), ''<br/>''), '' |'')
1375+
SELECT CONCAT(''| '', REPLACE(REPLACE(REPLACE(CAST([ep].[value] AS NVARCHAR(4000)), ''|'', @PipeHTMLCode COLLATE DATABASE_DEFAULT), CHAR(13) + CHAR(10), @BreakHTMLCode COLLATE DATABASE_DEFAULT), ''`'', @TickHTMLCode COLLATE DATABASE_DEFAULT), '' |'')
13741376
FROM [sys].[table_types] AS [tt]
13751377
INNER JOIN [sys].[extended_properties] AS [ep] ON [tt].[user_type_id] = [ep].[major_id]
13761378
WHERE [tt].[user_type_id] = @objectid
@@ -1430,7 +1432,7 @@ BEGIN
14301432
,'' | ''
14311433
,OBJECT_DEFINITION([dc].[object_id])
14321434
,'' | ''
1433-
,REPLACE(REPLACE(CAST([ep].[value] AS NVARCHAR(4000)), ''|'', @PipeHTMLCode COLLATE DATABASE_DEFAULT), CHAR(13) + CHAR(10), ''<br/>'')
1435+
,REPLACE(REPLACE(REPLACE(CAST([ep].[value] AS NVARCHAR(4000)), ''|'', @PipeHTMLCode COLLATE DATABASE_DEFAULT), CHAR(13) + CHAR(10), @BreakHTMLCode COLLATE DATABASE_DEFAULT), ''`'', @TickHTMLCode COLLATE DATABASE_DEFAULT)
14341436
,'' |'')
14351437
FROM [sys].[table_types] AS [tt]
14361438
INNER JOIN [sys].[columns] AS [c] ON [tt].[type_table_object_id] = [c].[object_id]
@@ -1486,7 +1488,9 @@ BEGIN
14861488
,@PK VARCHAR(20)
14871489
,@FK VARCHAR(20)
14881490
,@Column VARCHAR(20)
1489-
,@PipeHTMLCode CHAR(6)';
1491+
,@PipeHTMLCode CHAR(6)
1492+
,@TickHTMLCode CHAR(5)
1493+
,@BreakHTMLCode CHAR(5)';
14901494
EXEC sp_executesql @Sql
14911495
,@ParmDefinition
14921496
,@ExtendedPropertyName
@@ -1497,7 +1501,9 @@ BEGIN
14971501
,@PK
14981502
,@FK
14991503
,@Column
1500-
,@PipeHTMLCode;
1504+
,@PipeHTMLCode
1505+
,@TickHTMLCode
1506+
,@BreakHTMLCode;
15011507
END;
15021508
GO
15031509

0 commit comments

Comments
 (0)