Merge pull request #107 from LowlyDBA/development

Merge development

Author: lowlydba

.editorconfig

@@ -17,9 +17,10 @@ Steps to reproduce the behavior
 A clear and concise description of what you expected to happen.
 
 **Versions(please complete the following information):**
- - OS: [e.g. iOS]
- - SQL Server: [e.g. chrome, safari]
- - SSMS:
+
+* OS: [e.g. iOS]
+* SQL Server: [e.g. chrome, safari]
+* SSMS:
 
 **Additional context**
 Add any other context about the problem here.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -8,7 +8,7 @@ assignees: ''
 ---
 
 **Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+A clear and concise description of what the problem is.
 
 **Describe the solution you'd like**
 A clear and concise description of what you want to happen.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,2 +1,3 @@
 .markdownlint.json
-node_modules/*
+node_modules/*
+package-lock.json

codecov.yml renamed to .github/codecov.yml

@@ -67,10 +67,7 @@ members of the project's leadership.
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+[version 1.4](https://www.contributor-covenant.org/version/1/4/code-of-conduct.html).
 
 [homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq

.gitignore

@@ -57,7 +57,7 @@ clone_script:
 
 install:
 - ps: Install-Module SqlServer -Force -AllowClobber
-- npm install
+- npm install tsqllint -g
 - ps: .\appveyor\start_sqlserver.ps1
 - ps: .\appveyor\install_tsqlt.ps1
 

CODE_OF_CONDUCT.md

@@ -1,9 +1,15 @@
-$LocalTest = $false
-$SqlInstance = $env:DB_INSTANCE
-$Database = "tSQLt"
-$TestCommand = "EXEC tSQLt.RunAll"
-$TrustedConnection = "yes"
-$ConnString = "server=$SqlInstance;initial catalog=$Database;Trusted_Connection=$TrustedConnection"
+using namespace System.IO.Path
+
+param( 
+    [Parameter()] 
+    $LocalTest = $false,
+    $SqlInstance = $env:DB_INSTANCE,
+    $Database = $env:TARGET_DB,
+    $TrustedConnection = "yes",
+    $ConnString = "server=$SqlInstance;initial catalog=$Database;Trusted_Connection=$TrustedConnection",
+    $ReportDest = $PSSCriptRoot,
+    $TestPath = $env:TSQLTTESTPATH
+    )
 
 # Setup files
 $NugetPath = (Get-Package GOEddie.SQLCover).Source | Convert-Path
@@ -17,15 +23,28 @@ Add-Type -Path $SQLCoverDllFullPath
 # Start covering
 $SQLCover = new-object SQLCover.CodeCoverage($ConnString, $Database)
 $IsCoverStarted = $SQLCover.Start()
-If ($IsCoverStarted) { Write-Host "Starting SQL Cover" }
 
-# Run Tests
-. .\appveyor\run_tsqlt_tests.ps1
+If ($IsCoverStarted) {
+    # Run Tests
+    . .\appveyor\run_tsqlt_tests.ps1 -FilePath $TestPath -SqlInstance $SqlInstance -Database $Database -SQLAuth $false
 
-# Stop covering 
-$coverageResults = $SQLCover.Stop()
+    # Stop covering 
+    $coverageResults = $SQLCover.Stop()
 
-# Export results
-$xmlPath = Join-Path -Path $PSSCriptRoot -ChildPath "Coverage.opencoverxml"
-$coverageResults.OpenCoverXml() | Out-File $xmlPath -Encoding utf8
-$coverageResults.SaveSourceFiles($PSScriptRoot)    
+    # Export results
+    If (!($LocalTest)) {
+        $xmlPath = Join-Path -Path $ReportDest -ChildPath "Coverage.opencoverxml"
+        $coverageResults.OpenCoverXml() | Out-File $xmlPath -Encoding utf8
+        $coverageResults.SaveSourceFiles($ReportDest)    
+    }
+    Else { # Don't save any files and bring up html report for review
+        $tmpFile = Join-Path $env:TEMP "Coverage.html"
+        Set-Content -Path $tmpFile -Value $coverageResults.Html2() -Force
+        Invoke-Item $tmpFile
+        Start-Sleep -Seconds 1
+        Remove-Item $tmpFile
+    }
+}
+Else {
+    Write-Error "Could not start SQLCover - investigate issue."
+}

appveyor/appveyor.yml

@@ -48,7 +48,6 @@ BEGIN
 		,@ObjID INT
 		,@HasParam INT = 0
 		,@HasDepen BIT = 0
-		,@HasSparse BIT	= 0
 		,@HasHidden BIT = 0
 		,@HasMasked BIT = 0
 		,@SQLString NVARCHAR(MAX) = N''
@@ -73,12 +72,6 @@ BEGIN
 			RAISERROR(@Msg, 16, 1);
 		END;
 
-	/* Check for Sparse Columns feature */
-	IF 1 = (SELECT COUNT(*) FROM sys.all_columns AS ac WHERE ac.name = 'is_sparse' AND OBJECT_NAME(ac.object_id) = 'all_columns')
-		BEGIN
-			SET @HasSparse = 1;
-		END;
-
 	/* Check for Hidden Columns feature */
 	IF 1 = (SELECT COUNT(*) FROM sys.all_columns AS ac WHERE ac.name = 'is_hidden' AND OBJECT_NAME(ac.object_id) = 'all_columns')
 		BEGIN
@@ -214,22 +207,22 @@ BEGIN
 
 		-- Data Type help (prec/scale only valid for numerics)
 		SET @SQLString = N'SELECT
-								[Type_name]			= t.name,
-								[Storage_type]		= type_name(system_type_id),
-								[Length]			= max_length,
-								[Prec]				= [precision],
-								[Scale]				= [scale],
-								[Nullable]			= case when is_nullable=1 then @Yes else @No end,
-								[Default_name]		= isnull(object_name(default_object_id), @None),
-								[Rule_name]			= isnull(object_name(rule_object_id), @None),
-								[Collation]			= collation_name,
-								[ExtendedProperty]	= ep.[value]
-							FROM [sys].[types] AS [t]
-								LEFT JOIN [sys].[extended_properties] AS [ep] ON [ep].[major_id] = [t].[user_type_id]
-									AND [ep].[name] = @epname
-									AND [ep].[minor_id] = 0
-									AND [ep].[class] = 6
-							WHERE [user_type_id] = @ObjID';
+						[Type_name]			= t.name,
+						[Storage_type]		= type_name(system_type_id),
+						[Length]			= max_length,
+						[Prec]				= [precision],
+						[Scale]				= [scale],
+						[Nullable]			= case when is_nullable=1 then @Yes else @No end,
+						[Default_name]		= isnull(object_name(default_object_id), @None),
+						[Rule_name]			= isnull(object_name(rule_object_id), @None),
+						[Collation]			= collation_name,
+						[ExtendedProperty]	= ep.[value]
+					FROM [sys].[types] AS [t]
+						LEFT JOIN [sys].[extended_properties] AS [ep] ON [ep].[major_id] = [t].[user_type_id]
+							AND [ep].[name] = @epname
+							AND [ep].[minor_id] = 0
+							AND [ep].[class] = 6
+					WHERE [user_type_id] = @ObjID';
 		SET @ParmDefinition = N'@ObjID INT, @Yes VARCHAR(5), @No VARCHAR(5), @None VARCHAR(5), @epname SYSNAME';
 
 		EXECUTE sp_executesql @SQLString
@@ -326,10 +319,9 @@ BEGIN
 				BEGIN
 					SET @SQLString = @SQLString +  N'[Masked] = case when is_masked = 0 then ''no'' else ''yes'' end, ';
 				END
-			IF @HasSparse = 1
-				BEGIN
-					SET @SQLString = @SQLString + N'[Sparse] = case when is_sparse = 0 then ''no'' else ''yes'' end, ';
-				END
+				
+			SET @SQLString = @SQLString + N'[Sparse] = case when is_sparse = 0 then ''no'' else ''yes'' end, ';
+
 			IF @HasHidden = 1
 				BEGIN
 					SET @SQLString = @SQLString +  N'[Hidden] = case when is_hidden = 0 then ''no'' else ''yes'' end, ';
@@ -477,10 +469,6 @@ BEGIN
 				,@ObjID;
 		END
 	END
-	ELSE IF @SysObj_Type IN ('V ')
-	BEGIN
-		EXEC sys.sp_helpindex @objname;
-	END
 
 	RETURN (0); -- sp_helpme
 END;