Fix SR0007 issues

cagrin · Mar 7, 2024 · 112d38c · 112d38c
1 parent 624e7ec
commit 112d38c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/latest/SqlCodeAnalysisRules.props b/latest/SqlCodeAnalysisRules.props
@@ -1,6 +1,5 @@
 <Project>
     <PropertyGroup>
-        <CodeAnalysisRules>-Microsoft.Rules.Data.SR0007; $(CodeAnalysisRules)</CodeAnalysisRules>
         <CodeAnalysisRules>-Microsoft.Rules.Data.SR0013; $(CodeAnalysisRules)</CodeAnalysisRules>
         <CodeAnalysisRules>-Microsoft.Rules.Data.SR0014; $(CodeAnalysisRules)</CodeAnalysisRules>
         <CodeAnalysisRules>-Microsoft.Rules.Data.SR0015; $(CodeAnalysisRules)</CodeAnalysisRules>

diff --git a/latest/tSQLt.Edge/Internal/tSQLt.Internal_AssertStringIn.sql b/latest/tSQLt.Edge/Internal/tSQLt.Internal_AssertStringIn.sql
@@ -4,7 +4,12 @@ CREATE PROCEDURE tSQLt.Internal_AssertStringIn
     @Message NVARCHAR(MAX) = ''
 AS
 BEGIN
-    IF EXISTS (SELECT 1 FROM @Expected WHERE ([value] = @Actual) OR ([value] IS NULL AND @Actual IS NULL))
+    IF EXISTS
+    (
+        SELECT 1 FROM @Expected
+        WHERE ([value] IS NOT NULL AND ISNULL([value], '') = @Actual)
+        OR ([value] IS NULL AND @Actual IS NULL)
+    )
     BEGIN
         RETURN;
     END

diff --git a/latest/tSQLt.Edge/Private/tSQLt.Private_ResultLog.sql b/latest/tSQLt.Edge/Private/tSQLt.Private_ResultLog.sql
@@ -1,12 +1,12 @@
 CREATE PROCEDURE tSQLt.Private_ResultLog
 AS
 BEGIN
-    DECLARE @Failed INT = (SELECT ISNULL(COUNT(1), 0) FROM tSQLt.TestResult WHERE Result = 'Failure');
-    DECLARE @Passed INT = (SELECT ISNULL(COUNT(1), 0) FROM tSQLt.TestResult WHERE Result = 'Success');
+    DECLARE @Failed INT = (SELECT ISNULL(COUNT(1), 0) FROM tSQLt.TestResult WHERE ISNULL(Result, '') = 'Failure');
+    DECLARE @Passed INT = (SELECT ISNULL(COUNT(1), 0) FROM tSQLt.TestResult WHERE ISNULL(Result, '') = 'Success');
 
     SELECT Failed = @Failed, Passed = @Passed
 
     IF @Failed > 0
-        SELECT Name, Msg FROM tSQLt.TestResult WHERE Result = 'Failure'
+        SELECT Name, Msg FROM tSQLt.TestResult WHERE ISNULL(Result, '') = 'Failure'
 END;
 GO
diff --git a/latest/tSQLt.Edge/System/tSQLt.System_IndexColumns.sql b/latest/tSQLt.Edge/System/tSQLt.System_IndexColumns.sql
@@ -3,19 +3,19 @@ CREATE TYPE tSQLt.System_IndexColumnsType AS TABLE
 	[object_id] [int] NOT NULL,
 	[schema_name] [sysname] NOT NULL,
 	[table_name] [sysname] NOT NULL,
-	[index_name] [sysname] NULL,
-	[column_name] [sysname] NULL,
+	[index_name] [sysname] NOT NULL,
+	[column_name] [sysname] NOT NULL,
 	[key_ordinal] [tinyint] NOT NULL,
-	[is_descending_key] [bit] NULL,
+	[is_descending_key] [bit] NOT NULL,
 	[type_desc] [nvarchar](60) NULL,
-	[is_primary_key] [bit] NULL,
-	[is_unique] [bit] NULL,
-	[is_unique_constraint] [bit] NULL,
-	[has_filter] [bit] NULL,
+	[is_primary_key] [bit] NOT NULL,
+	[is_unique] [bit] NOT NULL,
+	[is_unique_constraint] [bit] NOT NULL,
+	[has_filter] [bit] NOT NULL,
 	[filter_definition] [nvarchar](max) NULL,
 	[column_id] [int] NOT NULL,
 	[is_computed] [bit] NOT NULL,
-	[is_nullable] [bit] NULL,
+	[is_nullable] [bit] NOT NULL,
 	[user_type_id] [int] NOT NULL,
 	[max_length] [smallint] NOT NULL,
 	[precision] [tinyint] NOT NULL,