Merge pull request #105 from LowlyDBA/development

lowlydba · web-flow · commit 4328465e5172 · 2020-07-31T16:19:00.000-04:00
Increase code cov
diff --git a/appveyor/run_tsqlt_tests.ps1 b/appveyor/run_tsqlt_tests.ps1
@@ -1,5 +1,20 @@
+param( 
+    [Parameter()] 
+    $FilePath = $env:TSQLTTESTPATH,
+    $SqlInstance = $env:DB_INSTANCE,
+    $Database = $env:TARGET_DB,
+    $SqlUser = $env:MSSQL_LOGIN,
+    $SqlPass = $env:MSSQL_PASS,
+    $SQLAuth = $true
+    )
+
 Write-Host "Run tSQLt Tests"
 
-ForEach ($filename in Get-Childitem -Path $env:TSQLTTESTPATH -Filter "*.sql") {
-    Invoke-SqlCmd -ServerInstance $env:DB_INSTANCE -Database $env:TARGET_DB -InputFile $filename.fullname -Username $env:MSSQL_LOGIN -Password $env:MSSQL_PASS -Verbose | Out-Null
+ForEach ($filename in Get-Childitem -Path $FilePath -Filter "*.sql") {
+    If ($SQLAuth) {
+        Invoke-SqlCmd -ServerInstance $SqlInstance -Database $Database -InputFile $filename.fullname -Username $SqlUser -Password $SqlPass -Verbose | Out-Null
+    }
+    Else {
+        Invoke-SqlCmd -ServerInstance $SqlInstance -Database $Database -InputFile $filename.fullname -Verbose | Out-Null
+    }
 }
diff --git a/appveyor/sqlcover/Coverage.opencoverxml b/appveyor/sqlcover/Coverage.opencoverxml
diff --git a/appveyor/sqlcover/[dbo].[sp_helpme] b/appveyor/sqlcover/[dbo].[sp_helpme]
@@ -210,7 +210,6 @@ BEGIN
 		IF @ObjID IS NULL
 		BEGIN
 			RAISERROR(15009,-1,-1,@objname,@DbName);
-			RETURN(1);
 		END
 
 		-- Data Type help (prec/scale only valid for numerics)
@@ -480,23 +479,10 @@ BEGIN
 	END
 	ELSE IF @SysObj_Type IN ('V ')
 	BEGIN
-		-- Views dont have constraints, but print these messages because 6.5 did
-		RAISERROR(15469,-1,-1,@objname); -- No constraints defined for reference table '%ls'.
-		RAISERROR(15470,-1,-1,@objname); -- No foreign keys for reference table '%ls'.
 		EXEC sys.sp_helpindex @objname;
 	END
 
 	RETURN (0); -- sp_helpme
 END;
-/* Cleanup existing versions */
-IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[sp_sizeoptimiser]'))
-	BEGIN
-		DROP PROCEDURE [dbo].[sp_sizeoptimiser];
-	END;
-
-IF EXISTS (SELECT * FROM sys.types st JOIN sys.schemas ss ON st.schema_id = ss.schema_id WHERE st.name = N'SizeOptimiserTableType' AND ss.name = N'dbo')
-	BEGIN
-		DROP TYPE [dbo].[SizeOptimiserTableType];
-	END;
 
 
diff --git a/appveyor/sqlcover/[dbo].[sp_sizeoptimiser] b/appveyor/sqlcover/[dbo].[sp_sizeoptimiser]
@@ -1,15 +1,15 @@
 
 CREATE PROCEDURE [dbo].[sp_sizeoptimiser]
-	@IndexNumThreshold SMALLINT 	= 10
+	@IndexNumThreshold SMALLINT = 10
 	,@IncludeDatabases [dbo].[SizeOptimiserTableType] READONLY
 	,@ExcludeDatabases [dbo].[SizeOptimiserTableType] READONLY
-	,@IncludeSysDatabases BIT 		= 0
-	,@IncludeSSRSDatabases BIT 		= 0
-	,@Verbose BIT					= 1
+	,@IncludeSysDatabases BIT = 0
+	,@IncludeSSRSDatabases BIT = 0
+	,@Verbose BIT = 1
 	/* Parameters defined here for testing only */
-	,@IsExpress BIT 				= NULL
-	,@SqlMajorVersion TINYINT 		= NULL
-	,@SqlMinorVersion SMALLINT 		= NULL
+	,@IsExpress BIT = NULL
+	,@SqlMajorVersion TINYINT = NULL
+	,@SqlMinorVersion SMALLINT = NULL
 
 WITH RECOMPILE
 AS
@@ -50,8 +50,6 @@ Example:
 
 BEGIN
 	SET NOCOUNT ON;
-	SET ANSI_NULLS ON;
-	SET QUOTED_IDENTIFIER ON;
 
 	BEGIN TRY
 
@@ -130,10 +128,13 @@ BEGIN
 				INSERT INTO #Databases
 				SELECT [sd].[name]
 				FROM [sys].[databases] AS [sd]
-				WHERE NOT EXISTS (SELECT [d].[database_name] FROM @IncludeDatabases AS [d] WHERE [sd].[name] COLLATE database_default = REPLACE(REPLACE([d].[database_name], '[', ''), ']', ''))
+				WHERE NOT EXISTS (SELECT [d].[database_name] 
+									FROM @IncludeDatabases AS [d] 
+									WHERE [sd].[name] COLLATE database_default = REPLACE(REPLACE([d].[database_name], '[', ''), ']', ''))
 					AND DATABASEPROPERTYEX([sd].[name], 'UPDATEABILITY') = N'READ_WRITE'
 					AND DATABASEPROPERTYEX([sd].[name], 'USERACCESS') = N'MULTI_USER'
-					AND DATABASEPROPERTYEX([sd].[name], 'STATUS') = N'ONLINE';
+					AND DATABASEPROPERTYEX([sd].[name], 'STATUS') = N'ONLINE'
+				AND [sd].[name] <> 'tempdb';
 			END
 
 		/* Find edition */
diff --git a/install_expsql.sql b/install_expsql.sql
diff --git a/sp_helpme.sql b/sp_helpme.sql
@@ -221,7 +221,6 @@ BEGIN
 		IF @ObjID IS NULL
 		BEGIN
 			RAISERROR(15009,-1,-1,@objname,@DbName);
-			RETURN(1);
 		END
 
 		-- Data Type help (prec/scale only valid for numerics)
@@ -491,11 +490,9 @@ BEGIN
 	END
 	ELSE IF @SysObj_Type IN ('V ')
 	BEGIN
-		-- Views dont have constraints, but print these messages because 6.5 did
-		RAISERROR(15469,-1,-1,@objname); -- No constraints defined for reference table '%ls'.
-		RAISERROR(15470,-1,-1,@objname); -- No foreign keys for reference table '%ls'.
 		EXEC sys.sp_helpindex @objname;
 	END
 
 	RETURN (0); -- sp_helpme
 END;
+GO
diff --git a/sp_sizeoptimiser.sql b/sp_sizeoptimiser.sql
@@ -1,4 +1,12 @@
+SET ANSI_NULLS ON;
+GO
+
+SET QUOTED_IDENTIFIER ON;
+GO
+
+/******************************/
 /* Cleanup existing versions */
+/*****************************/
 IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[sp_sizeoptimiser]'))
 	BEGIN
 		DROP PROCEDURE [dbo].[sp_sizeoptimiser];
@@ -31,16 +39,16 @@ IF NOT EXISTS(SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[sp_
 GO
 
 ALTER PROCEDURE [dbo].[sp_sizeoptimiser]
-	@IndexNumThreshold SMALLINT 	= 10
+	@IndexNumThreshold SMALLINT = 10
 	,@IncludeDatabases [dbo].[SizeOptimiserTableType] READONLY
 	,@ExcludeDatabases [dbo].[SizeOptimiserTableType] READONLY
-	,@IncludeSysDatabases BIT 		= 0
-	,@IncludeSSRSDatabases BIT 		= 0
-	,@Verbose BIT					= 1
+	,@IncludeSysDatabases BIT = 0
+	,@IncludeSSRSDatabases BIT = 0
+	,@Verbose BIT = 1
 	/* Parameters defined here for testing only */
-	,@IsExpress BIT 				= NULL
-	,@SqlMajorVersion TINYINT 		= NULL
-	,@SqlMinorVersion SMALLINT 		= NULL
+	,@IsExpress BIT = NULL
+	,@SqlMajorVersion TINYINT = NULL
+	,@SqlMinorVersion SMALLINT = NULL
 
 WITH RECOMPILE
 AS
@@ -81,8 +89,6 @@ Example:
 
 BEGIN
 	SET NOCOUNT ON;
-	SET ANSI_NULLS ON;
-	SET QUOTED_IDENTIFIER ON;
 
 	BEGIN TRY
 
@@ -161,10 +167,13 @@ BEGIN
 				INSERT INTO #Databases
 				SELECT [sd].[name]
 				FROM [sys].[databases] AS [sd]
-				WHERE NOT EXISTS (SELECT [d].[database_name] FROM @IncludeDatabases AS [d] WHERE [sd].[name] COLLATE database_default = REPLACE(REPLACE([d].[database_name], '[', ''), ']', ''))
+				WHERE NOT EXISTS (SELECT [d].[database_name] 
+									FROM @IncludeDatabases AS [d] 
+									WHERE [sd].[name] COLLATE database_default = REPLACE(REPLACE([d].[database_name], '[', ''), ']', ''))
 					AND DATABASEPROPERTYEX([sd].[name], 'UPDATEABILITY') = N'READ_WRITE'
 					AND DATABASEPROPERTYEX([sd].[name], 'USERACCESS') = N'MULTI_USER'
-					AND DATABASEPROPERTYEX([sd].[name], 'STATUS') = N'ONLINE';
+					AND DATABASEPROPERTYEX([sd].[name], 'STATUS') = N'ONLINE'
+				AND [sd].[name] <> 'tempdb';
 			END
 
 		/* Find edition */
diff --git a/tests/build/sp_doc_tests.sql b/tests/build/sp_doc_tests.sql
@@ -30,10 +30,11 @@ AS
 BEGIN;
 
 DECLARE @db SYSNAME = 'tSQLt';
+DECLARE @command NVARCHAR(MAX) = '[dbo].[sp_doc] @DatabaseName = ' + @db + ';';
 
 --Assert
 EXEC [tSQLt].[ExpectNoException];
-EXEC [dbo].[sp_doc] @DatabaseName = @db;
+EXEC [tSQLt].[SuppressOutput] @command = @command;
 
 END;
 GO
@@ -61,9 +62,11 @@ CREATE PROCEDURE [sp_doc].[test sp succeeds on current db if none given]
 AS
 BEGIN;
 
+DECLARE @command NVARCHAR(MAX) = '[dbo].[sp_doc];';
+
 --Assert
 EXEC [tSQLt].[ExpectNoException];
-EXEC [dbo].[sp_doc];
+EXEC [tSQLt].[SuppressOutput] @command = @command;
 
 END;
 GO
@@ -92,9 +95,11 @@ AS
 BEGIN;
 
 DECLARE @version TINYINT = 13;
+DECLARE @command NVARCHAR(MAX) = '[dbo].[sp_doc] @SqlMajorVersion = ' + CAST(@version AS NVARCHAR(4)) + ';';
+
 --Assert
-EXEC [tSQLt].[ExpectNoException]
-EXEC [dbo].[sp_doc] @SqlMajorVersion = @version;
+EXEC [tSQLt].[ExpectNoException];
+EXEC [tSQLt].[SuppressOutput] @command = @command;
 
 END;
 GO
diff --git a/tests/build/sp_sizeoptimiser_tests.sql b/tests/build/sp_sizeoptimiser_tests.sql
@@ -114,14 +114,14 @@ AS
 BEGIN;
 
 --Build
-DECLARE @version TINYINT = 11;
+DECLARE @version TINYINT = 10;
 DECLARE @IncludeDatabases [dbo].[SizeOptimiserTableType]; 
 
 INSERT INTO @IncludeDatabases
 VALUES ('master');
 
 --Assert
-EXEC [tSQLt].[ExpectNoException]
+EXEC [tSQLt].[ExpectException] @ExpectedMessage = N'SQL Server versions below 2012 are not supported, sorry!', @ExpectedSeverity = 16, @ExpectedState = 1, @ExpectedErrorNumber = 50000
 EXEC [dbo].[sp_sizeoptimiser] @IncludeDatabases = @IncludeDatabases, @SqlMajorVersion = @version, @Verbose = 0;
 
 END;
@@ -134,6 +134,26 @@ CREATE PROCEDURE [sp_sizeoptimiser].[test sp succeeds on supported version]
 AS
 BEGIN;
 
+--Build
+DECLARE @version TINYINT = 13;
+DECLARE @IncludeDatabases [dbo].[SizeOptimiserTableType];
+DECLARE @command NVARCHAR(MAX) = N'EXEC [dbo].[sp_sizeoptimiser] @SqlMajorVersion = ' + CAST(@version AS NVARCHAR(2)) + ', @Verbose = 0;'
+
+--Assert
+EXEC [tSQLt].[ExpectNoException]
+EXEC [tSQLt].[SuppressOutput] @command = @command;
+
+END;
+GO
+
+
+/*
+test success on supported SQL Server >= v12
+*/
+CREATE PROCEDURE [sp_sizeoptimiser].[test sp succeeds with verbose mode]
+AS
+BEGIN;
+
 --Build
 DECLARE @version TINYINT = 13;
 DECLARE @IncludeDatabases [dbo].[SizeOptimiserTableType]; 
@@ -143,11 +163,72 @@ VALUES ('master');
 
 --Assert
 EXEC [tSQLt].[ExpectNoException]
-EXEC [dbo].[sp_sizeoptimiser] @IncludeDatabases = @IncludeDatabases, @SqlMajorVersion = @version, @Verbose = 0;
+DECLARE @command NVARCHAR(MAX) = 'EXEC [dbo].[sp_sizeoptimiser] @Verbose = 1;';
+EXEC [tSQLt].[SuppressOutput] @command = @command;
+
+END;
+GO
+
+/*
+test success on @ExcludeDatabases
+*/
+CREATE PROCEDURE [sp_sizeoptimiser].[test sp succeeds with @ExcludeDatabases]
+AS
+BEGIN;
+
+--Build
+DECLARE @version TINYINT = 13;
+DECLARE @ExcludeDatabases [dbo].[SizeOptimiserTableType]; 
+
+INSERT INTO @ExcludeDatabases
+VALUES ('master');
+
+--Assert
+EXEC [tSQLt].[ExpectNoException]
+EXEC [dbo].[sp_sizeoptimiser] @ExcludeDatabases = @ExcludeDatabases, @Verbose = 0;
+
+END;
+GO
+
+/*
+test fail on non-existant databases
+*/
+CREATE PROCEDURE [sp_sizeoptimiser].[test sp fails with imaginary database]
+AS
+BEGIN;
+
+--Build
+DECLARE @IncludeDatabases [dbo].[SizeOptimiserTableType]; 
+DECLARE @DbName SYSNAME = 'BlackLivesMatter';
+DECLARE @ExpectedMessage NVARCHAR(MAX) = FORMATMESSAGE('Supplied databases do not exist or are not accessible: %s.', @DbName);
+
+INSERT INTO @IncludeDatabases
+VALUES (@DbName);
+
+--Assert
+EXEC [tSQLt].[ExpectException] @ExpectedMessage = @ExpectedMessage, @ExpectedSeverity = 16, @ExpectedState = 1, @ExpectedErrorNumber = 50000
+EXEC [dbo].[sp_sizeoptimiser] @IncludeDatabases = @IncludeDatabases;
+
+END;
+GO
+
+/*
+test success on SQLExpress
+*/
+CREATE PROCEDURE [sp_sizeoptimiser].[test sp succeeds in Express Mode]
+AS
+BEGIN;
+
+--Build
+DECLARE @IsExpress BIT = 1;
+
+--Assert
+EXEC [tSQLt].[ExpectNoException]
+EXEC [dbo].[sp_sizeoptimiser] @IsExpress = @IsExpress, @Verbose = 0;
 
 END;
 GO
 
 /************************************
 End sp_sizeoptimiser tests
-*************************************/
+*************************************/
