Skip to content

Commit f9e909b

Browse files
lowlydbalowlydba
committed
update lint rules, fix lint errors
1 parent 232315c commit f9e909b

File tree

6 files changed

+43
-28
lines changed

6 files changed

+43
-28
lines changed

‎.github/linter-conf/.tsqllintrc_150‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
11
{
22
"rules": {
3+
"case-sensitive-variables": "error",
34
"concat-strings": "error",
4-
"conditional-begin-end": "error",
5+
"conditional-begin-end": "off",
6+
"count-star": "error",
57
"cross-database-transaction": "error",
68
"data-compression": "warn",
79
"data-type-length": "error",
10+
"delete-where": "error",
811
"disallow-cursors": "off",
912
"full-text": "error",
1013
"information-schema": "error",
1114
"keyword-capitalization": "error",
1215
"linked-server": "error",
1316
"multi-table-alias": "error",
17+
"named-constraint": "error",
1418
"non-sargable": "warn",
1519
"object-property": "error",
1620
"print-statement": "error",
@@ -22,7 +26,9 @@
2226
"set-quoted-identifier": "error",
2327
"set-transaction-isolation-level": "off",
2428
"set-variable": "off",
25-
"upper-lower": "error"
29+
"update-where": "error",
30+
"upper-lower": "error",
31+
"unicode-string": "error"
2632
},
2733
"compatability-level": 150
2834
}

‎install_dba-multitool.sql‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2597,7 +2597,7 @@ BEGIN TRY
25972597
WHERE COALESCE([equality_columns] + ', ', '') + [inequality_columns] = @QuotedKeyColumns
25982598
AND ([included_columns] = @QuotedInclColumns OR [included_columns] IS NULL);
25992599

2600-
IF (SELECT COUNT(*) FROM ##TempMissingIndex) = 0 AND (@Verbose = 1)
2600+
IF (SELECT COUNT(1) FROM ##TempMissingIndex) = 0 AND (@Verbose = 1)
26012601
BEGIN;
26022602
SET @Msg = 'No matching missing index statistics found.';
26032603
RAISERROR(@Msg, 10, 1) WITH NOWAIT;
@@ -3269,13 +3269,13 @@ BEGIN
32693269
END;
32703270

32713271
/* Check for Hidden Columns feature */
3272-
IF 1 = (SELECT COUNT(*) FROM sys.all_columns AS ac WHERE ac.name = 'is_hidden' AND OBJECT_NAME(ac.object_id) = 'all_columns')
3272+
IF 1 = (SELECT COUNT(1) FROM sys.all_columns AS ac WHERE ac.name = 'is_hidden' AND OBJECT_NAME(ac.object_id) = 'all_columns')
32733273
BEGIN
32743274
SET @HasHidden = 1;
32753275
END;
32763276

32773277
/* Check for Masked Columns feature */
3278-
IF 1 = (SELECT COUNT(*) FROM sys.all_columns AS ac WHERE ac.name = 'is_masked' AND OBJECT_NAME(ac.object_id) = 'all_columns')
3278+
IF 1 = (SELECT COUNT(1) FROM sys.all_columns AS ac WHERE ac.name = 'is_masked' AND OBJECT_NAME(ac.object_id) = 'all_columns')
32793279
BEGIN
32803280
SET @HasMasked = 1;
32813281
END;
@@ -3573,7 +3573,7 @@ BEGIN
35733573
EXEC sys.sp_helpindex @ObjectName;
35743574
EXEC sys.sp_helpconstraint @ObjectName,'nomsg';
35753575

3576-
SET @SQLString = N'SELECT @HasDepen = COUNT(*)
3576+
SET @SQLString = N'SELECT @HasDepen = COUNT(1)
35773577
FROM sys.objects obj, sysdepends deps
35783578
WHERE obj.[type] =''V''
35793579
AND obj.[object_id] = deps.id
@@ -3804,7 +3804,7 @@ BEGIN
38043804
END
38053805

38063806
/* Validate database list */
3807-
IF (SELECT COUNT(*) FROM @IncludeDatabases) >= 1 AND (SELECT COUNT(*) FROM @ExcludeDatabases) >= 1
3807+
IF (SELECT COUNT(1) FROM @IncludeDatabases) >= 1 AND (SELECT COUNT(1) FROM @ExcludeDatabases) >= 1
38083808
BEGIN
38093809
SET @Msg = 'Both @IncludeDatabases and @ExcludeDatabases cannot be specified.';
38103810
RAISERROR(@Msg, 16, 1);
@@ -3814,7 +3814,7 @@ BEGIN
38143814
[database_name] SYSNAME NOT NULL);
38153815

38163816
/* Build database list if no parameters set */
3817-
IF (SELECT COUNT(*) FROM @IncludeDatabases) = 0 AND (SELECT COUNT(*) FROM @ExcludeDatabases) = 0
3817+
IF (SELECT COUNT(1) FROM @IncludeDatabases) = 0 AND (SELECT COUNT(1) FROM @ExcludeDatabases) = 0
38183818
BEGIN
38193819
INSERT INTO #Databases
38203820
SELECT [sd].[name]
@@ -3826,7 +3826,7 @@ BEGIN
38263826
AND DATABASEPROPERTYEX([sd].[name], 'STATUS') = N'ONLINE';
38273827
END;
38283828
/* Build database list from @IncludeDatabases */
3829-
ELSE IF (SELECT COUNT(*) FROM @IncludeDatabases) >= 1
3829+
ELSE IF (SELECT COUNT(1) FROM @IncludeDatabases) >= 1
38303830
BEGIN
38313831
INSERT INTO #Databases
38323832
SELECT [sd].[name]
@@ -3836,7 +3836,7 @@ BEGIN
38363836
AND DATABASEPROPERTYEX([sd].[name], 'USERACCESS') = N'MULTI_USER'
38373837
AND DATABASEPROPERTYEX([sd].[name], 'STATUS') = N'ONLINE';
38383838

3839-
IF (SELECT COUNT(*) FROM @IncludeDatabases) > (SELECT COUNT(*) FROM #Databases)
3839+
IF (SELECT COUNT(1) FROM @IncludeDatabases) > (SELECT COUNT(1) FROM #Databases)
38403840
BEGIN
38413841
DECLARE @ErrorDatabaseList NVARCHAR(MAX);
38423842

@@ -3855,7 +3855,7 @@ BEGIN
38553855
END;
38563856
END;
38573857
/* Build database list from @ExcludeDatabases */
3858-
ELSE IF (SELECT COUNT(*) FROM @ExcludeDatabases) >= 1
3858+
ELSE IF (SELECT COUNT(1) FROM @ExcludeDatabases) >= 1
38593859
BEGIN
38603860
INSERT INTO #Databases
38613861
SELECT [sd].[name]
@@ -4554,18 +4554,18 @@ BEGIN
45544554
FROM #Indexes; '
45554555

45564556
+ /* Find duplicate indexes */ +
4557-
N'SELECT COUNT(*) AS [num_dup_indexes], [ix_incl_checksum], [object_id]
4557+
N'SELECT COUNT(1) AS [num_dup_indexes], [ix_incl_checksum], [object_id]
45584558
INTO #MatchingIdxInclChecksum
45594559
FROM #IdxChecksum
45604560
GROUP BY [ix_incl_checksum], [object_id]
4561-
HAVING COUNT(*) > 1; '
4561+
HAVING COUNT(1) > 1; '
45624562

45634563
+ /* Find overlapping indexes with same indexed columns */ +
4564-
N'SELECT COUNT(*) AS [num_dup_indexes], [ix_checksum], [object_id]
4564+
N'SELECT COUNT(1) AS [num_dup_indexes], [ix_checksum], [object_id]
45654565
INTO #MatchingIdxChecksum
45664566
FROM #IdxChecksum
45674567
GROUP BY [ix_checksum], [object_id]
4568-
HAVING COUNT(*) > 1
4568+
HAVING COUNT(1) > 1
45694569
45704570
INSERT INTO #DuplicateIndex
45714571
SELECT N''Inefficient Indexes - Duplicate'' AS [check_type]

‎sp_estindex.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ BEGIN TRY
353353
WHERE COALESCE([equality_columns] + ', ', '') + [inequality_columns] = @QuotedKeyColumns
354354
AND ([included_columns] = @QuotedInclColumns OR [included_columns] IS NULL);
355355

356-
IF (SELECT COUNT(*) FROM ##TempMissingIndex) = 0 AND (@Verbose = 1)
356+
IF (SELECT COUNT(1) FROM ##TempMissingIndex) = 0 AND (@Verbose = 1)
357357
BEGIN;
358358
SET @Msg = 'No matching missing index statistics found.';
359359
RAISERROR(@Msg, 10, 1) WITH NOWAIT;

‎sp_helpme.sql‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,13 @@ BEGIN
120120
END;
121121

122122
/* Check for Hidden Columns feature */
123-
IF 1 = (SELECT COUNT(*) FROM sys.all_columns AS ac WHERE ac.name = 'is_hidden' AND OBJECT_NAME(ac.object_id) = 'all_columns')
123+
IF 1 = (SELECT COUNT(1) FROM sys.all_columns AS ac WHERE ac.name = 'is_hidden' AND OBJECT_NAME(ac.object_id) = 'all_columns')
124124
BEGIN
125125
SET @HasHidden = 1;
126126
END;
127127

128128
/* Check for Masked Columns feature */
129-
IF 1 = (SELECT COUNT(*) FROM sys.all_columns AS ac WHERE ac.name = 'is_masked' AND OBJECT_NAME(ac.object_id) = 'all_columns')
129+
IF 1 = (SELECT COUNT(1) FROM sys.all_columns AS ac WHERE ac.name = 'is_masked' AND OBJECT_NAME(ac.object_id) = 'all_columns')
130130
BEGIN
131131
SET @HasMasked = 1;
132132
END;
@@ -424,7 +424,7 @@ BEGIN
424424
EXEC sys.sp_helpindex @ObjectName;
425425
EXEC sys.sp_helpconstraint @ObjectName,'nomsg';
426426

427-
SET @SQLString = N'SELECT @HasDepen = COUNT(*)
427+
SET @SQLString = N'SELECT @HasDepen = COUNT(1)
428428
FROM sys.objects obj, sysdepends deps
429429
WHERE obj.[type] =''V''
430430
AND obj.[object_id] = deps.id

‎sp_sizeoptimiser.sql‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ BEGIN
179179
END
180180

181181
/* Validate database list */
182-
IF (SELECT COUNT(*) FROM @IncludeDatabases) >= 1 AND (SELECT COUNT(*) FROM @ExcludeDatabases) >= 1
182+
IF (SELECT COUNT(1) FROM @IncludeDatabases) >= 1 AND (SELECT COUNT(1) FROM @ExcludeDatabases) >= 1
183183
BEGIN
184184
SET @Msg = 'Both @IncludeDatabases and @ExcludeDatabases cannot be specified.';
185185
RAISERROR(@Msg, 16, 1);
@@ -189,7 +189,7 @@ BEGIN
189189
[database_name] SYSNAME NOT NULL);
190190

191191
/* Build database list if no parameters set */
192-
IF (SELECT COUNT(*) FROM @IncludeDatabases) = 0 AND (SELECT COUNT(*) FROM @ExcludeDatabases) = 0
192+
IF (SELECT COUNT(1) FROM @IncludeDatabases) = 0 AND (SELECT COUNT(1) FROM @ExcludeDatabases) = 0
193193
BEGIN
194194
INSERT INTO #Databases
195195
SELECT [sd].[name]
@@ -201,7 +201,7 @@ BEGIN
201201
AND DATABASEPROPERTYEX([sd].[name], 'STATUS') = N'ONLINE';
202202
END;
203203
/* Build database list from @IncludeDatabases */
204-
ELSE IF (SELECT COUNT(*) FROM @IncludeDatabases) >= 1
204+
ELSE IF (SELECT COUNT(1) FROM @IncludeDatabases) >= 1
205205
BEGIN
206206
INSERT INTO #Databases
207207
SELECT [sd].[name]
@@ -211,7 +211,7 @@ BEGIN
211211
AND DATABASEPROPERTYEX([sd].[name], 'USERACCESS') = N'MULTI_USER'
212212
AND DATABASEPROPERTYEX([sd].[name], 'STATUS') = N'ONLINE';
213213

214-
IF (SELECT COUNT(*) FROM @IncludeDatabases) > (SELECT COUNT(*) FROM #Databases)
214+
IF (SELECT COUNT(1) FROM @IncludeDatabases) > (SELECT COUNT(1) FROM #Databases)
215215
BEGIN
216216
DECLARE @ErrorDatabaseList NVARCHAR(MAX);
217217

@@ -230,7 +230,7 @@ BEGIN
230230
END;
231231
END;
232232
/* Build database list from @ExcludeDatabases */
233-
ELSE IF (SELECT COUNT(*) FROM @ExcludeDatabases) >= 1
233+
ELSE IF (SELECT COUNT(1) FROM @ExcludeDatabases) >= 1
234234
BEGIN
235235
INSERT INTO #Databases
236236
SELECT [sd].[name]
@@ -929,18 +929,18 @@ BEGIN
929929
FROM #Indexes; '
930930

931931
+ /* Find duplicate indexes */ +
932-
N'SELECT COUNT(*) AS [num_dup_indexes], [ix_incl_checksum], [object_id]
932+
N'SELECT COUNT(1) AS [num_dup_indexes], [ix_incl_checksum], [object_id]
933933
INTO #MatchingIdxInclChecksum
934934
FROM #IdxChecksum
935935
GROUP BY [ix_incl_checksum], [object_id]
936-
HAVING COUNT(*) > 1; '
936+
HAVING COUNT(1) > 1; '
937937

938938
+ /* Find overlapping indexes with same indexed columns */ +
939-
N'SELECT COUNT(*) AS [num_dup_indexes], [ix_checksum], [object_id]
939+
N'SELECT COUNT(1) AS [num_dup_indexes], [ix_checksum], [object_id]
940940
INTO #MatchingIdxChecksum
941941
FROM #IdxChecksum
942942
GROUP BY [ix_checksum], [object_id]
943-
HAVING COUNT(*) > 1
943+
HAVING COUNT(1) > 1
944944
945945
INSERT INTO #DuplicateIndex
946946
SELECT N''Inefficient Indexes - Duplicate'' AS [check_type]

‎uninstall_dba-multitool.sql‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
SET ANSI_NULLS ON;
2+
GO
3+
4+
SET QUOTED_IDENTIFIER ON;
5+
GO
6+
7+
SET NOCOUNT ON;
8+
GO
9+
110
/* Drop sp_doc */
211
IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[sp_doc]') AND [type] IN (N'P', N'PC'))
312
BEGIN;

0 commit comments

Comments
 (0)