Skip to content

Commit 086447c

Browse files
committed
Merge branch 'development' of https://github.com/LowlyDBA/ExpressSQL into development
2 parents a255b7a + c8f2c84 commit 086447c

File tree

2 files changed

+40
-36
lines changed

2 files changed

+40
-36
lines changed

docs/sp_sizeoptimiser.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ a clustered index, unless they are used for staging data or temporary in nature.
220220

221221
## Contributing
222222

223-
Missing a feature? Found a bug? Open an [issue][issue] to get some :heart:.
223+
Missing a feature? Found a bug? Open an [issue][issue] to get some :heart:
224224

225225
## More
226226

sp_doc.sql

Lines changed: 39 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -217,20 +217,20 @@ BEGIN
217217
WHEN TYPE_NAME([c].user_type_id) in (N''float'')
218218
THEN CASE
219219
WHEN [c].precision = 53
220-
THEN N''''
220+
THEN N''''
221221
ELSE CONCAT(N''('',CAST([c].precision AS varchar(5)),N'')'')
222222
END
223223
WHEN TYPE_NAME([c].user_type_id) IN (N''int'',N''bigint'',N''smallint'',N''tinyint'',N''money'',N''smallmoney'',
224224
N''real'',N''datetime'',N''smalldatetime'',N''bit'',N''image'',N''text'',N''uniqueidentifier'',
225225
N''date'',N''ntext'',N''sql_variant'',N''hierarchyid'',''geography'',N''timestamp'',N''xml'')
226226
THEN N''''
227227
ELSE CONCAT(N''('',CASE
228-
WHEN [c].max_length = -1
229-
THEN N''MAX''
230-
WHEN TYPE_NAME([c].user_type_id) IN (N''nvarchar'',N''nchar'')
231-
THEN CAST([c].[max_length]/2 AS VARCHAR(10))
232-
ELSE CAST([c].max_length AS VARCHAR(10))
233-
END, N'')'')
228+
WHEN [c].max_length = -1
229+
THEN N''MAX''
230+
WHEN TYPE_NAME([c].user_type_id) IN (N''nvarchar'',N''nchar'')
231+
THEN CAST([c].[max_length]/2 AS VARCHAR(10))
232+
ELSE CAST([c].max_length AS VARCHAR(10))
233+
END, N'')'')
234234
END)
235235
,'' | ''
236236
,CASE [c].[is_nullable]
@@ -426,12 +426,12 @@ BEGIN
426426
N''ntext'',N''sql_variant'',N''hierarchyid'',''geography'',N''timestamp'',N''xml'')
427427
THEN N''''
428428
ELSE CONCAT(N''('',CASE
429-
WHEN [c].max_length = -1
430-
THEN N''MAX''
431-
WHEN TYPE_NAME([c].user_type_id) IN (N''nvarchar'',N''nchar'')
432-
THEN CAST([c].[max_length]/2 AS VARCHAR(10))
433-
ELSE CAST([c].max_length AS VARCHAR(10))
434-
END, N'')'')
429+
WHEN [c].max_length = -1
430+
THEN N''MAX''
431+
WHEN TYPE_NAME([c].user_type_id) IN (N''nvarchar'',N''nchar'')
432+
THEN CAST([c].[max_length]/2 AS VARCHAR(10))
433+
ELSE CAST([c].max_length AS VARCHAR(10))
434+
END, N'')'')
435435
END)
436436
,'' | ''
437437
,CASE [c].[is_nullable]
@@ -546,14 +546,14 @@ BEGIN
546546
N''date'',N''ntext'',N''sql_variant'',N''hierarchyid'',''geography'',N''timestamp'',N''xml'')
547547
THEN N''''
548548
ELSE CASE
549-
WHEN [is_readonly] = 1 --User defined table type
550-
THEN N''''
551-
WHEN [max_length] = -1
552-
THEN N''(MAX)''
553-
WHEN TYPE_NAME(user_type_id) IN (N''nvarchar'',N''nchar'')
554-
THEN CONCAT(''('', CAST([max_length]/2 AS VARCHAR(10)), '')'')
555-
ELSE CONCAT(''('', CAST(max_length AS VARCHAR(10)), '')'')
556-
END
549+
WHEN [is_readonly] = 1 --User defined table type
550+
THEN N''''
551+
WHEN [max_length] = -1
552+
THEN N''(MAX)''
553+
WHEN TYPE_NAME(user_type_id) IN (N''nvarchar'',N''nchar'')
554+
THEN QUOTENAME(CAST([max_length]/2 AS VARCHAR(10)), ''('')
555+
ELSE QUOTENAME(CAST(max_length AS VARCHAR(10)), ''('')
556+
END
557557
END)
558558
,'' | ''
559559
,CASE [is_output]
@@ -668,13 +668,15 @@ BEGIN
668668
N''real'',N''datetime'',N''smalldatetime'',N''bit'',N''image'',N''text'',N''uniqueidentifier'',
669669
N''date'',N''ntext'',N''sql_variant'',N''hierarchyid'',''geography'',N''timestamp'',N''xml'')
670670
THEN N''''
671-
ELSE CONCAT(N''('',CASE
672-
WHEN max_length = -1
673-
THEN N''MAX''
674-
WHEN TYPE_NAME(user_type_id) IN (N''nvarchar'',N''nchar'')
675-
THEN CAST([max_length]/2 AS VARCHAR(10))
676-
ELSE CAST(max_length AS VARCHAR(10))
677-
END, N'')'')
671+
ELSE CASE
672+
WHEN [is_readonly] = 1 --User defined table type
673+
THEN N''''
674+
WHEN [max_length] = -1
675+
THEN N''(MAX)''
676+
WHEN TYPE_NAME(user_type_id) IN (N''nvarchar'',N''nchar'')
677+
THEN QUOTENAME(CAST([max_length]/2 AS VARCHAR(10)), ''('')
678+
ELSE QUOTENAME(CAST(max_length AS VARCHAR(10)), ''('')
679+
END
678680
END)
679681
,'' | ''
680682
,CASE [is_output]
@@ -786,13 +788,15 @@ BEGIN
786788
THEN CASE WHEN precision = 53 THEN N'''' ELSE CONCAT(N''('',CAST(precision AS varchar(5)),N'')'') END
787789
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'')
788790
THEN N''''
789-
ELSE CONCAT(N''('',CASE
790-
WHEN max_length = -1
791-
THEN N''MAX''
792-
WHEN TYPE_NAME(user_type_id) IN (N''nvarchar'',N''nchar'')
793-
THEN CAST([max_length]/2 AS VARCHAR(10))
794-
ELSE CAST(max_length AS VARCHAR(10))
795-
END, N'')'')
791+
ELSE CASE
792+
WHEN [is_readonly] = 1 --User defined table type
793+
THEN N''''
794+
WHEN [max_length] = -1
795+
THEN N''(MAX)''
796+
WHEN TYPE_NAME(user_type_id) IN (N''nvarchar'',N''nchar'')
797+
THEN QUOTENAME(CAST([max_length]/2 AS VARCHAR(10)), ''('')
798+
ELSE QUOTENAME(CAST(max_length AS VARCHAR(10)), ''('')
799+
END
796800
END)
797801
,'' | ''
798802
,CASE [is_output]

0 commit comments

Comments
 (0)