Merge branch 'development' of https://github.com/LowlyDBA/dba-multitool into development

Author: lowlydba

.github/CONTRIBUTING.md

@@ -19,7 +19,7 @@ You can help contribute by:
 
 ## Testing Locally
 
-See the testing readme in `\tests\README.md`
+See the testing readme in the [tests directory README](../tests/README.md)
 
 ## Style Guide
 
@@ -28,9 +28,8 @@ Think :tshirt:, not :necktie:
 
 ### T-SQL
 
-While there is no hard rule on T-SQL style enforced or linted in this project, use
-your discretion to fit the existing style and favor readability over a strict
-adherence to a specific style.
+T-SQL is linted against this [configuration](../appveyor/tsqllint)
+of TSQLLint via a Pester test.
 
 ### Markdown
 
@@ -46,7 +45,8 @@ for your commits to be automatically linted using Github Actions.
 
 PowerShell is only used in the automation piece of this project, but could probably
 benefit from being better documented and standardized. Right now no particular
-style is enforced, but one may be used in the future.
+style is enforced, 
+but [PSScriptAnalyzer](https://github.com/PowerShell/PSScriptAnalyzer) is recommended.
 
 [mdconfig]: https://github.com/LowlyDBA/dba-multitool/blob/master/.github/linters/.markdown-lint.yml
 [mdlint]: https://github.com/DavidAnson/markdownlint

appveyor/appveyor.yml

@@ -3,6 +3,7 @@ version: 1.5.{build}
 pull_requests:
   do_not_increment_build_number: false
 max_jobs: 2
+build: off
 
 environment:
   access_token:
@@ -75,11 +76,6 @@ install:
   - ps: .\appveyor\start_sqlserver.ps1
   - ps: .\appveyor\install_tsqlt.ps1
 
-build_script:
-  - ps: .\appveyor\generate_combined_script.ps1
-  - ps: .\appveyor\install_tool.ps1
-  - ps: .\appveyor\build_tsqlt_tests.ps1
-
 # Non-covered test run
 test_script:
   - ps: .\appveyor\run_pester_tests.ps1
@@ -93,7 +89,8 @@ for:
 
   # Setup codecov, SQL Cover
   before_test:
-    - ps: .\appveyor\install_coverage_dependencies.ps1
+    - ps: .\appveyor\install_dependencies.ps1 -CodeCoverage
+    - ps: choco install codecov --no-progress --limit-output | Out-Null
 
   # Run tests with SQL Cover analysis
   test_script:

appveyor/build_tsqlt_tests.ps1

@@ -6,7 +6,7 @@ param(
     [string]$User = $env:AZURE_SQL_USER,
     [string]$Pass = $env:AZURE_SQL_PASS,
     [string]$Color = "Green"
-    )
+)
 
 $ErrorActionPreference = "Stop";
 $Url = "https://github.com/Microsoft/sql-server-samples/releases/download/wide-world-importers-v1.0/WideWorldImporters-Full.bak"

appveyor/generate_combined_script.ps1

@@ -1,5 +1,6 @@
 param( 
     [Parameter()] 
+    [switch]$CodeCoverage,
     $Color = "Green"
 )
 
@@ -28,10 +29,18 @@ if (!(Get-Module -Name Pester | Where-Object { $PSItem.Version -lt 5.0.0 })) {
     Import-Module Pester -MinimumVersion 4.0.0
 }
 
+# GoEddie SQLCover
+If ($CodeCoverage.IsPresent) {
+    # Install code coverage tool
+    If (!(Get-Package -Name GOEddie.SQLCover -ErrorAction SilentlyContinue)) {
+        Install-Package GOEddie.SQLCover -Force | Out-Null
+    }
+}
+
 # Wait for Jobs before proceeding
 If ($TSQLLintJob) {
     Wait-Job $TSQLLintJob.Id | Out-Null
 }
 If ($DbaToolsJob) {
     Wait-Job $DbaToolsJob.Id | Out-Null
-}
+}

appveyor/generate_sample_markdown.ps1

@@ -14,21 +14,22 @@ param(
 
 Write-Host "Installing tSQLt..." -ForegroundColor $Color
 
-If ($IsAzureSQL) {
-    $PWord = ConvertTo-SecureString -String $Pass -AsPlainText -Force
-    $Credential = New-Object -TypeName System.Management.Automation.PSCredential -ArgumentList $User, $PWord
+$Hash = @{
+    SqlInstance     = $SqlInstance
+    Database        = $Database  
+    EnableException = $true
+}
 
-    $hash = @{
-        SqlInstance   = $SqlInstance
-        Database      = $Database
-        File          = $tSQLtInstallScript    
-        SqlCredential = $Credential
-    }
+If ($IsAzureSQL) {
+    $SecPass = ConvertTo-SecureString -String $Pass -AsPlainText -Force
+    $Credential = New-Object -TypeName System.Management.Automation.PSCredential -ArgumentList $User, $SecPass
+    $Hash.add("SqlCredential", $Credential)
 
-    Invoke-DbaQuery @hash
+    Invoke-DbaQuery @hash -File $tSQLtInstallScript
 }
+
 Else {
     Invoke-DbaQuery -SqlInstance $SqlInstance -Database $Master -File $clrscript | Out-Null
     Invoke-DbaQuery -SqlInstance $SqlInstance -Database $Master -File $CreateDBScript | Out-Null
-    Invoke-DbaQuery -SqlInstance $SqlInstance -Database $Database -File $tSQLtInstallScript -MessagesToOutput
+    Invoke-DbaQuery @Hash -File $tSQLtInstallScript -MessagesToOutput
 }