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

Author: lowlydba

appveyor/appveyor.yml

@@ -90,7 +90,6 @@ for:
   # Setup codecov, SQL Cover
   before_test:
     - 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/install_dependencies.ps1

@@ -35,6 +35,9 @@ If ($CodeCoverage.IsPresent) {
     If (!(Get-Package -Name GOEddie.SQLCover -ErrorAction SilentlyContinue)) {
         Install-Package GOEddie.SQLCover -Force | Out-Null
     }
+
+    # Install codecov tracker
+    choco install codecov --no-progress --limit-output | Out-Null
 }
 
 # Wait for Jobs before proceeding

appveyor/install_tsqlt.ps1

@@ -1,35 +1,67 @@
-param( 
-    [Parameter()] 
+param(
+    [Parameter()]
     [String]$SqlInstance = $env:DB_INSTANCE,
     [String]$Database = $env:TARGET_DB,
-    [String]$CLRScript = "tests\tSQLt\SetClrEnabled.sql",
-    [String]$CreateDBScript = "tests\tSQLt\CreateDatabase.sql",
-    [String]$tSQLtInstallScript = "tests\tSQLt\tSQLt.class.sql",
     [String]$Color = "Green",
-    [String]$Master = "master",
     [string]$User = $env:AZURE_SQL_USER,
     [string]$Pass = $env:AZURE_SQL_PASS,
     [bool]$IsAzureSQL = [System.Convert]::ToBoolean($env:AzureSQL)
 )
 
-Write-Host "Installing tSQLt..." -ForegroundColor $Color
+Write-Host "Downloading and installing tSQLt..." -ForegroundColor $Color
+
+# BaseUrl gets the latest version by default - blocked by https://github.com/LowlyDBA/dba-multitool/issues/165 
+$Version = "1-0-5873-27393"
+$DownloadUrl = "http://tsqlt.org/download/tsqlt/?version=" + $Version
+$TempPath = [System.IO.Path]::GetTempPath()
+$ZipFile = Join-Path $TempPath "tSQLt.zip"
+$ZipFolder = Join-Path $TempPath "tSQLt"
+#$SetupFile = Join-Path $ZipFolder "PrepareServer.sql" # Used in latest version after 1.0.5873.27393
+$SetupFile = Join-Path $ZipFolder "SetClrEnabled.sql"
+$InstallFile = Join-Path $ZipFolder "tSQLt.class.sql"
+$CreateDbQuery = "CREATE DATABASE [tSQLt];"
+$CLRSecurityQuery = "
+/* Turn off CLR Strict for 2017+ fix */
+IF EXISTS (SELECT 1 FROM sys.configurations WHERE name = 'clr strict security')
+BEGIN
+	EXEC sp_configure 'show advanced options', 1;
+	RECONFIGURE;
+	
+	EXEC sp_configure 'clr strict security', 0;
+	RECONFIGURE;
+END
+GO"
+
+
+# Download
+Try {
+    Invoke-WebRequest -Uri $DownloadUrl -OutFile $ZipFile -ErrorAction Stop -UseBasicParsing
+    Expand-Archive -Path $ZipFile -DestinationPath $ZipFolder -Force
+}
+
+Catch {
+    Write-Error -Message "Error downloading tSQLt - try manually fetching from $DownloadUrl"
+}
 
 $Hash = @{
     SqlInstance     = $SqlInstance
-    Database        = $Database  
+    Database        = $Database
     EnableException = $true
 }
 
+# Setup
 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 -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 @Hash -File $tSQLtInstallScript -MessagesToOutput
+    Invoke-DbaQuery -SqlInstance $SqlInstance -Database "master" -Query $CreateDbQuery
+    # DbaQuery doesn't play nice with the setup script GOs - default back to sqlcmd
+    Invoke-Command -ScriptBlock { sqlcmd -S $SqlInstance -d $Database -i $SetupFile } | Out-Null
+    Invoke-DbaQuery @Hash -Query $CLRSecurityQuery
 }
+
+# Install
+Invoke-DbaQuery @Hash -File $InstallFile

appveyor/sqlcover/Coverage.opencoverxml

@@ -8,7 +8,7 @@ BeforeAll {
 Describe "sp_sizeoptimiser" {
     Context "tSQLt Tests" {
         BeforeAll {
-            $StoredProc = $StoredProc
+            $StoredProc = "sp_sizeoptimiser"
             $TestPath = "tests\"
             $RunTestQuery = "EXEC tSQLt.Run '$StoredProc'"