Skip to content

Commit c74dc49

Browse files
lowlydbalowlydba
committed
Merge branch 'development' of https://github.com/LowlyDBA/ExpressSQL into development
2 parents 3996aeb + b0bc288 commit c74dc49

File tree

5 files changed

+65
-59
lines changed

5 files changed

+65
-59
lines changed

‎appveyor/sqlcover/Coverage.opencoverxml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@
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" />
2828
<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="11836" sl="325" sc="1" el="438" ec="6" />
30-
<SequencePoint vc="5" uspid="19" ordinal="19" offset="16661" sl="444" sc="1" el="558" ec="6" />
31-
<SequencePoint vc="5" uspid="20" ordinal="20" offset="21552" sl="564" sc="1" el="679" ec="6" />
32-
<SequencePoint vc="5" uspid="21" ordinal="21" offset="26440" sl="685" sc="1" el="797" ec="6" />
33-
<SequencePoint vc="5" uspid="22" ordinal="22" offset="31331" sl="803" sc="1" el="877" ec="52" />
34-
<SequencePoint vc="5" uspid="23" ordinal="23" offset="34366" sl="880" sc="1" el="883" ec="20" />
35-
<SequencePoint vc="5" uspid="24" ordinal="24" offset="34448" sl="885" sc="1" el="885" ec="78" />
36-
<SequencePoint vc="5" uspid="25" ordinal="25" offset="34529" sl="886" sc="1" el="889" ec="16" />
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" />
3737
</SequencePoints>
3838
</Method>
3939
</Methods>

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

Lines changed: 55 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ BEGIN
4646
,@ParmDefinition NVARCHAR(500)
4747
,@QuotedDatabaseName SYSNAME
4848
,@Msg NVARCHAR(MAX)
49-
,@LastUpdated NVARCHAR(20) = '2020-06-29';
49+
,@LastUpdated NVARCHAR(20) = '2020-09-18';
5050

5151

5252
-- Find Version
@@ -176,20 +176,20 @@ BEGIN
176176
WHEN TYPE_NAME([c].user_type_id) in (N''float'')
177177
THEN CASE
178178
WHEN [c].precision = 53
179-
THEN N''''
179+
THEN N''''
180180
ELSE CONCAT(N''('',CAST([c].precision AS varchar(5)),N'')'')
181181
END
182182
WHEN TYPE_NAME([c].user_type_id) IN (N''int'',N''bigint'',N''smallint'',N''tinyint'',N''money'',N''smallmoney'',
183183
N''real'',N''datetime'',N''smalldatetime'',N''bit'',N''image'',N''text'',N''uniqueidentifier'',
184184
N''date'',N''ntext'',N''sql_variant'',N''hierarchyid'',''geography'',N''timestamp'',N''xml'')
185185
THEN N''''
186186
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'')'')
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'')'')
193193
END)
194194
,'' | ''
195195
,CASE [c].[is_nullable]
@@ -385,12 +385,12 @@ BEGIN
385385
N''ntext'',N''sql_variant'',N''hierarchyid'',''geography'',N''timestamp'',N''xml'')
386386
THEN N''''
387387
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'')'')
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'')'')
394394
END)
395395
,'' | ''
396396
,CASE [c].[is_nullable]
@@ -490,29 +490,30 @@ BEGIN
490490
INSERT INTO #markdown
491491
select CONCAT(''| '', CASE WHEN LEN([param].[name]) = 0 THEN ''*Output*'' ELSE [param].[name] END
492492
,'' | ''
493-
,CONCAT(UPPER(type_name(user_type_id)),
494-
CASE
493+
,CONCAT(UPPER(type_name(user_type_id))
494+
,CASE
495495
WHEN TYPE_NAME(user_type_id) IN (N''decimal'',N''numeric'')
496496
THEN CONCAT(N''('',CAST(precision AS varchar(5)), N'','',CAST(scale AS varchar(5)), N'')'')
497497
WHEN TYPE_NAME(user_type_id) IN (''varchar'', ''char'')
498-
THEN CAST(max_length AS VARCHAR(10))
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)), ''('')
499501
WHEN TYPE_NAME(user_type_id) IN (N''time'',N''datetime2'',N''datetimeoffset'')
500-
THEN CONCAT(N''('',CAST(scale AS varchar(5)), N'')'')
502+
THEN QUOTENAME(CAST(scale AS varchar(5)), ''('')
501503
WHEN TYPE_NAME(user_type_id) in (N''float'')
502-
THEN CASE WHEN precision = 53 THEN N'''' ELSE CONCAT(N''('',CAST(precision AS varchar(5)),N'')'') END
504+
THEN CASE
505+
WHEN precision = 53
506+
THEN N''''
507+
ELSE QUOTENAME(CAST(precision AS varchar(5)),''('') END
503508
WHEN TYPE_NAME(user_type_id) IN (N''int'',N''bigint'',N''smallint'',N''tinyint'',N''money'',N''smallmoney'',
504509
N''real'',N''datetime'',N''smalldatetime'',N''bit'',N''image'',N''text'',N''uniqueidentifier'',
505510
N''date'',N''ntext'',N''sql_variant'',N''hierarchyid'',''geography'',N''timestamp'',N''xml'')
506511
THEN N''''
507-
ELSE CASE
508-
WHEN [is_readonly] = 1 --User defined table type
509-
THEN N''''
510-
WHEN [max_length] = -1
511-
THEN N''(MAX)''
512-
WHEN TYPE_NAME(user_type_id) IN (N''nvarchar'',N''nchar'')
513-
THEN CONCAT(''('', CAST([max_length]/2 AS VARCHAR(10)), '')'')
514-
ELSE CONCAT(''('', CAST(max_length AS VARCHAR(10)), '')'')
515-
END
512+
WHEN [is_readonly] = 1 --User defined table type
513+
THEN N''''
514+
WHEN [max_length] = -1 --Max length
515+
THEN N''(MAX)''
516+
ELSE QUOTENAME(CAST(max_length AS VARCHAR(10)), ''('')
516517
END)
517518
,'' | ''
518519
,CASE [is_output]
@@ -613,27 +614,30 @@ BEGIN
613614
INSERT INTO #markdown
614615
select CONCAT(''| '', CASE WHEN LEN([param].[name]) = 0 THEN ''*Output*'' ELSE [param].[name] END
615616
,'' | ''
616-
,CONCAT(UPPER(type_name(user_type_id)),
617-
CASE
617+
,CONCAT(UPPER(type_name(user_type_id))
618+
,CASE
618619
WHEN TYPE_NAME(user_type_id) IN (N''decimal'',N''numeric'')
619620
THEN CONCAT(N''('',CAST(precision AS varchar(5)), N'','',CAST(scale AS varchar(5)), N'')'')
620621
WHEN TYPE_NAME(user_type_id) IN (''varchar'', ''char'')
621-
THEN CAST(max_length AS VARCHAR(10))
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)), ''('')
622625
WHEN TYPE_NAME(user_type_id) IN (N''time'',N''datetime2'',N''datetimeoffset'')
623-
THEN CONCAT(N''('',CAST(scale AS varchar(5)), N'')'')
626+
THEN QUOTENAME(CAST(scale AS varchar(5)), ''('')
624627
WHEN TYPE_NAME(user_type_id) in (N''float'')
625-
THEN CASE WHEN precision = 53 THEN N'''' ELSE CONCAT(N''('',CAST(precision AS varchar(5)),N'')'') END
628+
THEN CASE
629+
WHEN precision = 53
630+
THEN N''''
631+
ELSE QUOTENAME(CAST(precision AS varchar(5)),''('') END
626632
WHEN TYPE_NAME(user_type_id) IN (N''int'',N''bigint'',N''smallint'',N''tinyint'',N''money'',N''smallmoney'',
627633
N''real'',N''datetime'',N''smalldatetime'',N''bit'',N''image'',N''text'',N''uniqueidentifier'',
628634
N''date'',N''ntext'',N''sql_variant'',N''hierarchyid'',''geography'',N''timestamp'',N''xml'')
629635
THEN N''''
630-
ELSE CONCAT(N''('',CASE
631-
WHEN max_length = -1
632-
THEN N''MAX''
633-
WHEN TYPE_NAME(user_type_id) IN (N''nvarchar'',N''nchar'')
634-
THEN CAST([max_length]/2 AS VARCHAR(10))
635-
ELSE CAST(max_length AS VARCHAR(10))
636-
END, N'')'')
636+
WHEN [is_readonly] = 1 --User defined table type
637+
THEN N''''
638+
WHEN [max_length] = -1 --Max length
639+
THEN N''(MAX)''
640+
ELSE QUOTENAME(CAST(max_length AS VARCHAR(10)), ''('')
637641
END)
638642
,'' | ''
639643
,CASE [is_output]
@@ -733,8 +737,8 @@ BEGIN
733737
INSERT INTO #markdown
734738
select CONCAT(''| '', CASE WHEN LEN([param].[name]) = 0 THEN ''*Output*'' ELSE [param].[name] END
735739
,'' | ''
736-
,CONCAT(UPPER(type_name(user_type_id)),
737-
CASE
740+
,CONCAT(UPPER(type_name(user_type_id))
741+
,CASE
738742
WHEN TYPE_NAME(user_type_id) IN (N''decimal'',N''numeric'')
739743
THEN CONCAT(N''('',CAST(precision AS varchar(5)), N'','',CAST(scale AS varchar(5)), N'')'')
740744
WHEN TYPE_NAME(user_type_id) IN (''varchar'', ''char'')
@@ -745,13 +749,15 @@ BEGIN
745749
THEN CASE WHEN precision = 53 THEN N'''' ELSE CONCAT(N''('',CAST(precision AS varchar(5)),N'')'') END
746750
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'')
747751
THEN N''''
748-
ELSE CONCAT(N''('',CASE
749-
WHEN max_length = -1
750-
THEN N''MAX''
751-
WHEN TYPE_NAME(user_type_id) IN (N''nvarchar'',N''nchar'')
752-
THEN CAST([max_length]/2 AS VARCHAR(10))
753-
ELSE CAST(max_length AS VARCHAR(10))
754-
END, 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
755761
END)
756762
,'' | ''
757763
,CASE [is_output]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ BEGIN
5555
,@SQLString NVARCHAR(MAX) = N''
5656
,@Msg NVARCHAR(MAX) = N''
5757
,@ParmDefinition NVARCHAR(500)
58-
,@LastUpdated NVARCHAR(20) = '2020-06-29';
58+
,@LastUpdated NVARCHAR(20) = '2020-09-18';
5959

6060
/* Find Version */
6161
IF (@SqlMajorVersion = 0)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ BEGIN
5959
,@HasPersistedSamplePercent BIT = 0
6060
,@CheckNumber TINYINT = 0
6161
,@EngineEdition TINYINT
62-
,@LastUpdated NVARCHAR(20) = '2020-08-04'
62+
,@LastUpdated NVARCHAR(20) = '2020-09-18'
6363
,@CheckSQL NVARCHAR(MAX) = N''
6464
,@Msg NVARCHAR(MAX) = N''
6565
,@DbName SYSNAME = N''

‎install_expsql.sql‎

210 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)