Skip to content

Commit 68e9779

Browse files
lowlydbalowlydba
committed
Merge branch 'development' of https://github.com/LowlyDBA/ExpressSQL into development
2 parents ab1661c + 4d7838b commit 68e9779

File tree

4 files changed

+123
-111
lines changed

4 files changed

+123
-111
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="316" ec="6" />
29-
<SequencePoint vc="5" uspid="18" ordinal="18" offset="11713" sl="322" sc="1" el="436" ec="6" />
30-
<SequencePoint vc="5" uspid="19" ordinal="19" offset="16455" sl="442" sc="1" el="557" ec="6" />
31-
<SequencePoint vc="5" uspid="20" ordinal="20" offset="21341" sl="563" sc="1" el="681" ec="6" />
32-
<SequencePoint vc="5" uspid="21" ordinal="21" offset="26310" sl="687" sc="1" el="804" ec="6" />
33-
<SequencePoint vc="5" uspid="22" ordinal="22" offset="31303" sl="810" sc="1" el="884" ec="52" />
34-
<SequencePoint vc="5" uspid="23" ordinal="23" offset="34338" sl="887" sc="1" el="890" ec="20" />
35-
<SequencePoint vc="5" uspid="24" ordinal="24" offset="34420" sl="892" sc="1" el="892" ec="78" />
36-
<SequencePoint vc="5" uspid="25" ordinal="25" offset="34501" sl="893" sc="1" el="896" ec="16" />
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="11797" sl="325" sc="1" el="442" ec="6" />
30+
<SequencePoint vc="5" uspid="19" ordinal="19" offset="16623" sl="448" sc="1" el="565" ec="6" />
31+
<SequencePoint vc="5" uspid="20" ordinal="20" offset="21553" sl="571" sc="1" el="691" ec="6" />
32+
<SequencePoint vc="5" uspid="21" ordinal="21" offset="26567" sl="697" sc="1" el="816" ec="6" />
33+
<SequencePoint vc="5" uspid="22" ordinal="22" offset="31603" sl="822" sc="1" el="896" ec="52" />
34+
<SequencePoint vc="5" uspid="23" ordinal="23" offset="34638" sl="899" sc="1" el="902" ec="20" />
35+
<SequencePoint vc="5" uspid="24" ordinal="24" offset="34720" sl="904" sc="1" el="904" ec="78" />
36+
<SequencePoint vc="5" uspid="25" ordinal="25" offset="34801" sl="905" sc="1" el="908" ec="16" />
3737
</SequencePoints>
3838
</Method>
3939
</Methods>

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

Lines changed: 97 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -165,28 +165,31 @@ BEGIN
165165
ELSE ISNULL([c].[name], ''N/A'')
166166
END
167167
,'' | ''
168-
,CONCAT(UPPER(type_name(user_type_id))
168+
,CONCAT(UPPER(TYPE_NAME([user_type_id]))
169169
,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 [max_length] = -1 --Max length
173-
THEN N''(MAX)''
174-
WHEN TYPE_NAME(user_type_id) IN (''varchar'', ''char'')
175-
THEN QUOTENAME(CAST(max_length AS VARCHAR(10)), ''('')
176-
WHEN TYPE_NAME(user_type_id) IN (N''nvarchar'',N''nchar'')
177-
THEN QUOTENAME(CAST([max_length]/2 AS VARCHAR(10)), ''('')
178-
WHEN TYPE_NAME(user_type_id) IN (N''time'',N''datetime2'',N''datetimeoffset'')
179-
THEN QUOTENAME(CAST(scale AS varchar(5)), ''('')
180-
WHEN TYPE_NAME(user_type_id) in (N''float'')
181-
THEN CASE
182-
WHEN precision = 53
183-
THEN N''''
184-
ELSE QUOTENAME(CAST(precision AS varchar(5)),''('') END
185-
WHEN TYPE_NAME(user_type_id) IN (N''int'',N''bigint'',N''smallint'',N''tinyint'',N''money'',N''smallmoney'',
186-
N''real'',N''datetime'',N''smalldatetime'',N''bit'',N''image'',N''text'',N''uniqueidentifier'',
187-
N''date'',N''ntext'',N''sql_variant'',N''hierarchyid'',''geography'',N''timestamp'',N''xml'')
188-
THEN N''''
189-
ELSE QUOTENAME(CAST(max_length AS VARCHAR(10)), ''('')
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''time'',N''datetime2'',N''datetimeoffset'')
175+
THEN QUOTENAME(CAST(scale AS varchar(5)), ''('')
176+
WHEN TYPE_NAME([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 CASE
187+
WHEN [max_length] = -1
188+
THEN N''(MAX)''
189+
WHEN TYPE_NAME([user_type_id]) IN (N''nvarchar'',N''nchar'')
190+
THEN QUOTENAME(CAST([max_length]/2 AS VARCHAR(10)), ''('')
191+
ELSE QUOTENAME(CAST([max_length] AS VARCHAR(10)), ''('')
192+
END
190193
END)
191194
,'' | ''
192195
,CASE [c].[is_nullable]
@@ -367,28 +370,31 @@ BEGIN
367370
+ N'INSERT INTO #markdown
368371
SELECT CONCAT(''| '', [c].[name]
369372
,'' | ''
370-
,CONCAT(UPPER(type_name(user_type_id))
373+
,CONCAT(UPPER(TYPE_NAME([user_type_id]))
371374
,CASE
372-
WHEN TYPE_NAME(user_type_id) IN (N''decimal'',N''numeric'')
373-
THEN CONCAT(N''('',CAST(precision AS varchar(5)), N'','',CAST(scale AS varchar(5)), N'')'')
374-
WHEN [max_length] = -1 --Max length
375-
THEN N''(MAX)''
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-
ELSE QUOTENAME(CAST(max_length AS VARCHAR(10)), ''('')
375+
WHEN TYPE_NAME([user_type_id]) IN (N''decimal'',N''numeric'')
376+
THEN CONCAT(N''('',CAST(precision AS varchar(5)), N'','',CAST(scale AS varchar(5)), N'')'')
377+
WHEN TYPE_NAME([user_type_id]) IN (''varchar'', ''char'')
378+
THEN QUOTENAME(CAST([max_length] AS VARCHAR(10)), ''('')
379+
WHEN TYPE_NAME([user_type_id]) IN (N''time'',N''datetime2'',N''datetimeoffset'')
380+
THEN QUOTENAME(CAST(scale AS varchar(5)), ''('')
381+
WHEN TYPE_NAME([user_type_id]) in (N''float'')
382+
THEN CASE
383+
WHEN [c].precision = 53
384+
THEN N''''
385+
ELSE CONCAT(N''('',CAST([c].precision AS varchar(5)),N'')'')
386+
END
387+
WHEN TYPE_NAME([c].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+
ELSE CASE
392+
WHEN [max_length] = -1
393+
THEN N''(MAX)''
394+
WHEN TYPE_NAME([user_type_id]) IN (N''nvarchar'',N''nchar'')
395+
THEN QUOTENAME(CAST([max_length]/2 AS VARCHAR(10)), ''('')
396+
ELSE QUOTENAME(CAST([max_length] AS VARCHAR(10)), ''('')
397+
END
392398
END)
393399
,'' | ''
394400
,CASE [c].[is_nullable]
@@ -488,30 +494,32 @@ BEGIN
488494
INSERT INTO #markdown
489495
select CONCAT(''| '', CASE WHEN LEN([param].[name]) = 0 THEN ''*Output*'' ELSE [param].[name] END
490496
,'' | ''
491-
,CONCAT(UPPER(type_name(user_type_id))
497+
,CONCAT(UPPER(TYPE_NAME([user_type_id]))
492498
,CASE
493-
WHEN TYPE_NAME(user_type_id) IN (N''decimal'',N''numeric'')
499+
WHEN TYPE_NAME([user_type_id]) IN (N''decimal'',N''numeric'')
494500
THEN CONCAT(N''('',CAST(precision AS varchar(5)), N'','',CAST(scale AS varchar(5)), N'')'')
495-
WHEN [max_length] = -1 --Max length
496-
THEN N''(MAX)''
497-
WHEN TYPE_NAME(user_type_id) IN (''varchar'', ''char'')
498-
THEN QUOTENAME(CAST(max_length AS VARCHAR(10)), ''('')
499-
WHEN TYPE_NAME(user_type_id) IN (N''nvarchar'',N''nchar'')
500-
THEN QUOTENAME(CAST([max_length]/2 AS VARCHAR(10)), ''('')
501-
WHEN TYPE_NAME(user_type_id) IN (N''time'',N''datetime2'',N''datetimeoffset'')
501+
WHEN TYPE_NAME([user_type_id]) IN (''varchar'', ''char'')
502+
THEN QUOTENAME(CAST([max_length] AS VARCHAR(10)), ''('')
503+
WHEN TYPE_NAME([user_type_id]) IN (N''time'',N''datetime2'',N''datetimeoffset'')
502504
THEN QUOTENAME(CAST(scale AS varchar(5)), ''('')
503-
WHEN TYPE_NAME(user_type_id) in (N''float'')
505+
WHEN TYPE_NAME([user_type_id]) in (N''float'')
504506
THEN CASE
505507
WHEN precision = 53
506508
THEN N''''
507509
ELSE QUOTENAME(CAST(precision AS varchar(5)),''('') END
508-
WHEN TYPE_NAME(user_type_id) IN (N''int'',N''bigint'',N''smallint'',N''tinyint'',N''money'',N''smallmoney'',
510+
WHEN TYPE_NAME([user_type_id]) IN (N''int'',N''bigint'',N''smallint'',N''tinyint'',N''money'',N''smallmoney'',
509511
N''real'',N''datetime'',N''smalldatetime'',N''bit'',N''image'',N''text'',N''uniqueidentifier'',
510512
N''date'',N''ntext'',N''sql_variant'',N''hierarchyid'',''geography'',N''timestamp'',N''xml'')
511513
THEN N''''
512-
WHEN [is_readonly] = 1 --User defined table type
513-
THEN N''''
514-
ELSE QUOTENAME(CAST(max_length AS VARCHAR(10)), ''('')
514+
ELSE CASE
515+
WHEN [is_readonly] = 1 --User defined table type
516+
THEN N''''
517+
WHEN [max_length] = -1
518+
THEN N''(MAX)''
519+
WHEN TYPE_NAME([user_type_id]) IN (N''nvarchar'',N''nchar'')
520+
THEN QUOTENAME(CAST([max_length]/2 AS VARCHAR(10)), ''('')
521+
ELSE QUOTENAME(CAST([max_length] AS VARCHAR(10)), ''('')
522+
END
515523
END)
516524
,'' | ''
517525
,CASE [is_output]
@@ -612,30 +620,32 @@ BEGIN
612620
INSERT INTO #markdown
613621
select CONCAT(''| '', CASE WHEN LEN([param].[name]) = 0 THEN ''*Output*'' ELSE [param].[name] END
614622
,'' | ''
615-
,CONCAT(UPPER(type_name(user_type_id))
616-
,CASE
617-
WHEN TYPE_NAME(user_type_id) IN (N''decimal'',N''numeric'')
623+
,CONCAT(UPPER(TYPE_NAME([user_type_id]))
624+
,CASE
625+
WHEN TYPE_NAME([user_type_id]) IN (N''decimal'',N''numeric'')
618626
THEN CONCAT(N''('',CAST(precision AS varchar(5)), N'','',CAST(scale AS varchar(5)), N'')'')
619-
WHEN [max_length] = -1 --Max length
620-
THEN N''(MAX)''
621-
WHEN TYPE_NAME(user_type_id) IN (''varchar'', ''char'')
622-
THEN QUOTENAME(CAST(max_length AS VARCHAR(10)), ''('')
623-
WHEN TYPE_NAME(user_type_id) IN (N''nvarchar'',N''nchar'')
624-
THEN QUOTENAME(CAST([max_length]/2 AS VARCHAR(10)), ''('')
625-
WHEN TYPE_NAME(user_type_id) IN (N''time'',N''datetime2'',N''datetimeoffset'')
627+
WHEN TYPE_NAME([user_type_id]) IN (''varchar'', ''char'')
628+
THEN QUOTENAME(CAST([max_length] AS VARCHAR(10)), ''('')
629+
WHEN TYPE_NAME([user_type_id]) IN (N''time'',N''datetime2'',N''datetimeoffset'')
626630
THEN QUOTENAME(CAST(scale AS varchar(5)), ''('')
627-
WHEN TYPE_NAME(user_type_id) in (N''float'')
631+
WHEN TYPE_NAME([user_type_id]) in (N''float'')
628632
THEN CASE
629633
WHEN precision = 53
630634
THEN N''''
631635
ELSE QUOTENAME(CAST(precision AS varchar(5)),''('') END
632-
WHEN TYPE_NAME(user_type_id) IN (N''int'',N''bigint'',N''smallint'',N''tinyint'',N''money'',N''smallmoney'',
636+
WHEN TYPE_NAME([user_type_id]) IN (N''int'',N''bigint'',N''smallint'',N''tinyint'',N''money'',N''smallmoney'',
633637
N''real'',N''datetime'',N''smalldatetime'',N''bit'',N''image'',N''text'',N''uniqueidentifier'',
634638
N''date'',N''ntext'',N''sql_variant'',N''hierarchyid'',''geography'',N''timestamp'',N''xml'')
635639
THEN N''''
636-
WHEN [is_readonly] = 1 --User defined table type
637-
THEN N''''
638-
ELSE QUOTENAME(CAST(max_length AS VARCHAR(10)), ''('')
640+
ELSE CASE
641+
WHEN [is_readonly] = 1 --User defined table type
642+
THEN N''''
643+
WHEN [max_length] = -1
644+
THEN N''(MAX)''
645+
WHEN TYPE_NAME([user_type_id]) IN (N''nvarchar'',N''nchar'')
646+
THEN QUOTENAME(CAST([max_length]/2 AS VARCHAR(10)), ''('')
647+
ELSE QUOTENAME(CAST([max_length] AS VARCHAR(10)), ''('')
648+
END
639649
END)
640650
,'' | ''
641651
,CASE [is_output]
@@ -735,30 +745,32 @@ BEGIN
735745
INSERT INTO #markdown
736746
select CONCAT(''| '', CASE WHEN LEN([param].[name]) = 0 THEN ''*Output*'' ELSE [param].[name] END
737747
,'' | ''
738-
,CONCAT(UPPER(type_name(user_type_id))
748+
,CONCAT(UPPER(TYPE_NAME([user_type_id]))
739749
,CASE
740-
WHEN TYPE_NAME(user_type_id) IN (N''decimal'',N''numeric'')
750+
WHEN TYPE_NAME([user_type_id]) IN (N''decimal'',N''numeric'')
741751
THEN CONCAT(N''('',CAST(precision AS varchar(5)), N'','',CAST(scale AS varchar(5)), N'')'')
742-
WHEN [max_length] = -1 --Max length
743-
THEN N''(MAX)''
744-
WHEN TYPE_NAME(user_type_id) IN (''varchar'', ''char'')
745-
THEN QUOTENAME(CAST(max_length AS VARCHAR(10)), ''('')
746-
WHEN TYPE_NAME(user_type_id) IN (N''nvarchar'',N''nchar'')
747-
THEN QUOTENAME(CAST([max_length]/2 AS VARCHAR(10)), ''('')
748-
WHEN TYPE_NAME(user_type_id) IN (N''time'',N''datetime2'',N''datetimeoffset'')
752+
WHEN TYPE_NAME([user_type_id]) IN (''varchar'', ''char'')
753+
THEN QUOTENAME(CAST([max_length] AS VARCHAR(10)), ''('')
754+
WHEN TYPE_NAME([user_type_id]) IN (N''time'',N''datetime2'',N''datetimeoffset'')
749755
THEN QUOTENAME(CAST(scale AS varchar(5)), ''('')
750-
WHEN TYPE_NAME(user_type_id) in (N''float'')
756+
WHEN TYPE_NAME([user_type_id]) in (N''float'')
751757
THEN CASE
752758
WHEN precision = 53
753759
THEN N''''
754760
ELSE QUOTENAME(CAST(precision AS varchar(5)),''('') END
755-
WHEN TYPE_NAME(user_type_id) IN (N''int'',N''bigint'',N''smallint'',N''tinyint'',N''money'',N''smallmoney'',
761+
WHEN TYPE_NAME([user_type_id]) IN (N''int'',N''bigint'',N''smallint'',N''tinyint'',N''money'',N''smallmoney'',
756762
N''real'',N''datetime'',N''smalldatetime'',N''bit'',N''image'',N''text'',N''uniqueidentifier'',
757763
N''date'',N''ntext'',N''sql_variant'',N''hierarchyid'',''geography'',N''timestamp'',N''xml'')
758764
THEN N''''
759-
WHEN [is_readonly] = 1 --User defined table type
760-
THEN N''''
761-
ELSE QUOTENAME(CAST(max_length AS VARCHAR(10)), ''('')
765+
ELSE CASE
766+
WHEN [is_readonly] = 1 --User defined table type
767+
THEN N''''
768+
WHEN [max_length] = -1
769+
THEN N''(MAX)''
770+
WHEN TYPE_NAME([user_type_id]) IN (N''nvarchar'',N''nchar'')
771+
THEN QUOTENAME(CAST([max_length]/2 AS VARCHAR(10)), ''('')
772+
ELSE QUOTENAME(CAST([max_length] AS VARCHAR(10)), ''('')
773+
END
762774
END)
763775
,'' | ''
764776
,CASE [is_output]

0 commit comments

Comments
 (0)