Skip to content

Commit 9dde22e

Browse files
lowlydbalowlydba
committed
Merge branch 'development' of https://github.com/LowlyDBA/ExpressSQL into development
2 parents f5bc416 + 675e54a commit 9dde22e

File tree

4 files changed

+79
-8770
lines changed

4 files changed

+79
-8770
lines changed

‎appveyor/sqlcover/Coverage.opencoverxml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@
2525
<SequencePoint vc="5" uspid="14" ordinal="14" offset="2510" sl="80" sc="1" el="80" ec="51" />
2626
<SequencePoint vc="5" uspid="15" ordinal="15" offset="2618" sl="83" sc="1" el="86" ec="28" />
2727
<SequencePoint vc="5" uspid="16" ordinal="16" offset="2843" sl="91" sc="1" el="107" ec="29" />
28-
<SequencePoint vc="5" uspid="17" ordinal="17" offset="3487" sl="113" sc="1" el="319" ec="6" />
29-
<SequencePoint vc="5" uspid="18" ordinal="18" offset="11823" sl="325" sc="1" el="438" ec="6" />
30-
<SequencePoint vc="5" uspid="19" ordinal="19" offset="16636" sl="444" sc="1" el="559" ec="6" />
31-
<SequencePoint vc="5" uspid="20" ordinal="20" offset="21515" sl="565" sc="1" el="683" ec="6" />
32-
<SequencePoint vc="5" uspid="21" ordinal="21" offset="26476" sl="689" sc="1" el="803" ec="6" />
33-
<SequencePoint vc="5" uspid="22" ordinal="22" offset="31436" sl="809" sc="1" el="883" ec="52" />
34-
<SequencePoint vc="5" uspid="23" ordinal="23" offset="34471" sl="886" sc="1" el="889" ec="20" />
35-
<SequencePoint vc="5" uspid="24" ordinal="24" offset="34553" sl="891" sc="1" el="891" ec="78" />
36-
<SequencePoint vc="5" uspid="25" ordinal="25" offset="34634" sl="892" sc="1" el="895" ec="16" />
28+
<SequencePoint vc="5" uspid="17" ordinal="17" offset="3487" sl="113" sc="1" el="318" ec="6" />
29+
<SequencePoint vc="5" uspid="18" ordinal="18" offset="11787" sl="324" sc="1" el="440" ec="6" />
30+
<SequencePoint vc="5" uspid="19" ordinal="19" offset="16603" sl="446" sc="1" el="561" ec="6" />
31+
<SequencePoint vc="5" uspid="20" ordinal="20" offset="21489" sl="567" sc="1" el="685" ec="6" />
32+
<SequencePoint vc="5" uspid="21" ordinal="21" offset="26458" sl="691" sc="1" el="808" ec="6" />
33+
<SequencePoint vc="5" uspid="22" ordinal="22" offset="31450" sl="814" sc="1" el="888" ec="52" />
34+
<SequencePoint vc="5" uspid="23" ordinal="23" offset="34485" sl="891" sc="1" el="894" ec="20" />
35+
<SequencePoint vc="5" uspid="24" ordinal="24" offset="34567" sl="896" sc="1" el="896" ec="78" />
36+
<SequencePoint vc="5" uspid="25" ordinal="25" offset="34648" sl="897" sc="1" el="900" ec="16" />
3737
</SequencePoints>
3838
</Method>
3939
</Methods>

‎appveyor/sqlcover/[dbo].[sp_doc]‎

Lines changed: 69 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -165,32 +165,31 @@ BEGIN
165165
ELSE ISNULL([c].[name], ''N/A'')
166166
END
167167
,'' | ''
168-
,CONCAT(UPPER(type_name(user_type_id)),
169-
CASE
170-
WHEN TYPE_NAME(user_type_id) IN (N''decimal'',N''numeric'')
171-
THEN CONCAT(N''('',CAST([c].precision AS varchar(5)), N'','',CAST([c].scale AS varchar(5)), N'')'')
172-
WHEN TYPE_NAME(user_type_id) IN (''varchar'', ''char'')
173-
THEN CONCAT(N''('',CAST(max_length AS VARCHAR(10)), N'')'')
174-
WHEN TYPE_NAME(user_type_id) IN (N''time'',N''datetime2'',N''datetimeoffset'')
175-
THEN CONCAT(N''('',CAST([c].scale AS varchar(5)), N'')'')
176-
WHEN TYPE_NAME([c].user_type_id) in (N''float'')
177-
THEN CASE
178-
WHEN [c].precision = 53
179-
THEN N''''
180-
ELSE CONCAT(N''('',CAST([c].precision AS varchar(5)),N'')'')
181-
END
182-
WHEN TYPE_NAME([c].user_type_id) IN (N''int'',N''bigint'',N''smallint'',N''tinyint'',N''money'',N''smallmoney'',
183-
N''real'',N''datetime'',N''smalldatetime'',N''bit'',N''image'',N''text'',N''uniqueidentifier'',
184-
N''date'',N''ntext'',N''sql_variant'',N''hierarchyid'',''geography'',N''timestamp'',N''xml'')
185-
THEN N''''
186-
ELSE CONCAT(N''('',CASE
187-
WHEN [c].max_length = -1
188-
THEN N''MAX''
189-
WHEN TYPE_NAME([c].user_type_id) IN (N''nvarchar'',N''nchar'')
190-
THEN CAST([c].[max_length]/2 AS VARCHAR(10))
191-
ELSE CAST([c].max_length AS VARCHAR(10))
192-
END, N'')'')
193-
END)
168+
,CONCAT(UPPER(type_name(user_type_id))
169+
,CASE
170+
WHEN TYPE_NAME(user_type_id) IN (N''decimal'',N''numeric'')
171+
THEN CONCAT(N''('',CAST(precision AS varchar(5)), N'','',CAST(scale AS varchar(5)), N'')'')
172+
WHEN TYPE_NAME(user_type_id) IN (''varchar'', ''char'')
173+
THEN QUOTENAME(CAST(max_length AS VARCHAR(10)), ''('')
174+
WHEN TYPE_NAME(user_type_id) IN (N''nvarchar'',N''nchar'')
175+
THEN QUOTENAME(CAST([max_length]/2 AS VARCHAR(10)), ''('')
176+
WHEN TYPE_NAME(user_type_id) IN (N''time'',N''datetime2'',N''datetimeoffset'')
177+
THEN QUOTENAME(CAST(scale AS varchar(5)), ''('')
178+
WHEN TYPE_NAME(user_type_id) in (N''float'')
179+
THEN CASE
180+
WHEN precision = 53
181+
THEN N''''
182+
ELSE QUOTENAME(CAST(precision AS varchar(5)),''('') END
183+
WHEN TYPE_NAME(user_type_id) IN (N''int'',N''bigint'',N''smallint'',N''tinyint'',N''money'',N''smallmoney'',
184+
N''real'',N''datetime'',N''smalldatetime'',N''bit'',N''image'',N''text'',N''uniqueidentifier'',
185+
N''date'',N''ntext'',N''sql_variant'',N''hierarchyid'',''geography'',N''timestamp'',N''xml'')
186+
THEN N''''
187+
WHEN [is_readonly] = 1 --User defined table type
188+
THEN N''''
189+
WHEN [max_length] = -1 --Max length
190+
THEN N''(MAX)''
191+
ELSE QUOTENAME(CAST(max_length AS VARCHAR(10)), ''('')
192+
END)
194193
,'' | ''
195194
,CASE [c].[is_nullable]
196195
WHEN 1
@@ -370,28 +369,31 @@ BEGIN
370369
+ N'INSERT INTO #markdown
371370
SELECT CONCAT(''| '', [c].[name]
372371
,'' | ''
373-
,CONCAT(UPPER(type_name(user_type_id)),
374-
CASE
375-
WHEN TYPE_NAME(user_type_id) IN (N''decimal'',N''numeric'')
376-
THEN CONCAT(N''('',CAST([c].precision AS varchar(5)), N'','',CAST([c].scale AS varchar(5)), N'')'')
377-
WHEN TYPE_NAME(user_type_id) IN (''varchar'', ''char'')
378-
THEN CONCAT(N''('',CAST(max_length AS VARCHAR(10)), '')'')
379-
WHEN TYPE_NAME(user_type_id) IN (N''time'',N''datetime2'',N''datetimeoffset'')
380-
THEN CONCAT(N''('',CAST([c].scale AS varchar(5)), N'')'')
381-
WHEN TYPE_NAME([c].user_type_id) in (N''float'')
382-
THEN CASE WHEN [c].precision = 53 THEN N'''' ELSE CONCAT(N''('',CAST([c].precision AS varchar(5)),N'')'') END
383-
WHEN TYPE_NAME([c].user_type_id) IN (N''int'',N''bigint'',N''smallint'',N''tinyint'',N''money'',N''smallmoney'',
384-
N''real'',N''datetime'',N''smalldatetime'',N''bit'',N''image'',N''text'',N''uniqueidentifier'',N''date'',
385-
N''ntext'',N''sql_variant'',N''hierarchyid'',''geography'',N''timestamp'',N''xml'')
386-
THEN N''''
387-
ELSE CONCAT(N''('',CASE
388-
WHEN [c].max_length = -1
389-
THEN N''MAX''
390-
WHEN TYPE_NAME([c].user_type_id) IN (N''nvarchar'',N''nchar'')
391-
THEN CAST([c].[max_length]/2 AS VARCHAR(10))
392-
ELSE CAST([c].max_length AS VARCHAR(10))
393-
END, N'')'')
394-
END)
372+
,CONCAT(UPPER(type_name(user_type_id))
373+
,CASE
374+
WHEN TYPE_NAME(user_type_id) IN (N''decimal'',N''numeric'')
375+
THEN CONCAT(N''('',CAST(precision AS varchar(5)), N'','',CAST(scale AS varchar(5)), N'')'')
376+
WHEN TYPE_NAME(user_type_id) IN (''varchar'', ''char'')
377+
THEN QUOTENAME(CAST(max_length AS VARCHAR(10)), ''('')
378+
WHEN TYPE_NAME(user_type_id) IN (N''nvarchar'',N''nchar'')
379+
THEN QUOTENAME(CAST([max_length]/2 AS VARCHAR(10)), ''('')
380+
WHEN TYPE_NAME(user_type_id) IN (N''time'',N''datetime2'',N''datetimeoffset'')
381+
THEN QUOTENAME(CAST(scale AS varchar(5)), ''('')
382+
WHEN TYPE_NAME(user_type_id) in (N''float'')
383+
THEN CASE
384+
WHEN precision = 53
385+
THEN N''''
386+
ELSE QUOTENAME(CAST(precision AS varchar(5)),''('') END
387+
WHEN TYPE_NAME(user_type_id) IN (N''int'',N''bigint'',N''smallint'',N''tinyint'',N''money'',N''smallmoney'',
388+
N''real'',N''datetime'',N''smalldatetime'',N''bit'',N''image'',N''text'',N''uniqueidentifier'',
389+
N''date'',N''ntext'',N''sql_variant'',N''hierarchyid'',''geography'',N''timestamp'',N''xml'')
390+
THEN N''''
391+
WHEN [is_readonly] = 1 --User defined table type
392+
THEN N''''
393+
WHEN [max_length] = -1 --Max length
394+
THEN N''(MAX)''
395+
ELSE QUOTENAME(CAST(max_length AS VARCHAR(10)), ''('')
396+
END)
395397
,'' | ''
396398
,CASE [c].[is_nullable]
397399
WHEN 1
@@ -495,7 +497,7 @@ BEGIN
495497
WHEN TYPE_NAME(user_type_id) IN (N''decimal'',N''numeric'')
496498
THEN CONCAT(N''('',CAST(precision AS varchar(5)), N'','',CAST(scale AS varchar(5)), N'')'')
497499
WHEN TYPE_NAME(user_type_id) IN (''varchar'', ''char'')
498-
THEN QUOTENAME(CAST(max_length AS VARCHAR(10)))
500+
THEN QUOTENAME(CAST(max_length AS VARCHAR(10)), ''('')
499501
WHEN TYPE_NAME(user_type_id) IN (N''nvarchar'',N''nchar'')
500502
THEN QUOTENAME(CAST([max_length]/2 AS VARCHAR(10)), ''('')
501503
WHEN TYPE_NAME(user_type_id) IN (N''time'',N''datetime2'',N''datetimeoffset'')
@@ -615,11 +617,11 @@ BEGIN
615617
select CONCAT(''| '', CASE WHEN LEN([param].[name]) = 0 THEN ''*Output*'' ELSE [param].[name] END
616618
,'' | ''
617619
,CONCAT(UPPER(type_name(user_type_id))
618-
,CASE
620+
,CASE
619621
WHEN TYPE_NAME(user_type_id) IN (N''decimal'',N''numeric'')
620622
THEN CONCAT(N''('',CAST(precision AS varchar(5)), N'','',CAST(scale AS varchar(5)), N'')'')
621623
WHEN TYPE_NAME(user_type_id) IN (''varchar'', ''char'')
622-
THEN QUOTENAME(CAST(max_length AS VARCHAR(10)))
624+
THEN QUOTENAME(CAST(max_length AS VARCHAR(10)), ''('')
623625
WHEN TYPE_NAME(user_type_id) IN (N''nvarchar'',N''nchar'')
624626
THEN QUOTENAME(CAST([max_length]/2 AS VARCHAR(10)), ''('')
625627
WHEN TYPE_NAME(user_type_id) IN (N''time'',N''datetime2'',N''datetimeoffset'')
@@ -742,22 +744,25 @@ BEGIN
742744
WHEN TYPE_NAME(user_type_id) IN (N''decimal'',N''numeric'')
743745
THEN CONCAT(N''('',CAST(precision AS varchar(5)), N'','',CAST(scale AS varchar(5)), N'')'')
744746
WHEN TYPE_NAME(user_type_id) IN (''varchar'', ''char'')
745-
THEN CAST(max_length AS VARCHAR(10))
747+
THEN QUOTENAME(CAST(max_length AS VARCHAR(10)), ''('')
748+
WHEN TYPE_NAME(user_type_id) IN (N''nvarchar'',N''nchar'')
749+
THEN QUOTENAME(CAST([max_length]/2 AS VARCHAR(10)), ''('')
746750
WHEN TYPE_NAME(user_type_id) IN (N''time'',N''datetime2'',N''datetimeoffset'')
747-
THEN CONCAT(N''('',CAST(scale AS varchar(5)), N'')'')
751+
THEN QUOTENAME(CAST(scale AS varchar(5)), ''('')
748752
WHEN TYPE_NAME(user_type_id) in (N''float'')
749-
THEN CASE WHEN precision = 53 THEN N'''' ELSE CONCAT(N''('',CAST(precision AS varchar(5)),N'')'') END
750-
WHEN TYPE_NAME(user_type_id) IN (N''int'',N''bigint'',N''smallint'',N''tinyint'',N''money'',N''smallmoney'',N''real'',N''datetime'',N''smalldatetime'',N''bit'',N''image'',N''text'',N''uniqueidentifier'',N''date'',N''ntext'',N''sql_variant'',N''hierarchyid'',''geography'',N''timestamp'',N''xml'')
753+
THEN CASE
754+
WHEN precision = 53
755+
THEN N''''
756+
ELSE QUOTENAME(CAST(precision AS varchar(5)),''('') END
757+
WHEN TYPE_NAME(user_type_id) IN (N''int'',N''bigint'',N''smallint'',N''tinyint'',N''money'',N''smallmoney'',
758+
N''real'',N''datetime'',N''smalldatetime'',N''bit'',N''image'',N''text'',N''uniqueidentifier'',
759+
N''date'',N''ntext'',N''sql_variant'',N''hierarchyid'',''geography'',N''timestamp'',N''xml'')
760+
THEN N''''
761+
WHEN [is_readonly] = 1 --User defined table type
751762
THEN N''''
752-
ELSE CASE
753-
WHEN [is_readonly] = 1 --User defined table type
754-
THEN N''''
755-
WHEN [max_length] = -1
756-
THEN N''(MAX)''
757-
WHEN TYPE_NAME(user_type_id) IN (N''nvarchar'',N''nchar'')
758-
THEN QUOTENAME(CAST([max_length]/2 AS VARCHAR(10)), ''('')
759-
ELSE QUOTENAME(CAST(max_length AS VARCHAR(10)), ''('')
760-
END
763+
WHEN [max_length] = -1 --Max length
764+
THEN N''(MAX)''
765+
ELSE QUOTENAME(CAST(max_length AS VARCHAR(10)), ''('')
761766
END)
762767
,'' | ''
763768
,CASE [is_output]

0 commit comments

Comments
 (0)