Merge pull request #113 from LowlyDBA/development

Development

Author: lowlydba

appveyor/appveyor.yml

@@ -7,15 +7,10 @@ max_jobs: 1
 environment:
   access_token:
     secure: 'E5I+i+CQyj9EHusDrPSQKHRXmzmpTujYAoFxlvJjvSRSEQHHzqTBIFR1VuPbwLMi'
+  AZURE_SQL_PASS:
+    secure: 'rYm3nE1kwpbdE7QtyLb8CjvA1ENjY3usz3Qqskf1TXU='
 
   APPVEYOR_RDP_PASSWORD: Np^VNSzJI5#OmRdUNqro2T9UVkCdZ
-  MSSQL_LOGIN: sa
-  MSSQL_PASS: Password12!
-  TSQLTSETCLR: tests\tSQLt\SetClrEnabled.sql
-  TSQLTCREATEDB: tests\tSQLt\CreateDatabase.sql
-  TSQLTINSTALL: tests\tSQLt\tSQLt.class.sql
-  TSQLTBUILDPATH: tests\build
-  TSQLTTESTPATH: tests\run
   TARGET_DB: tSQLt
   COV_REPORT: appveyor\sqlcover\Coverage.opencoverxml
 
@@ -25,64 +20,80 @@ environment:
     DB_INSTANCE: (local)\SQL2019
     LINT_CONFIG: appveyor\tsqllint\.tsqllintrc_150
     LATEST: True
+
+  # Azure SQL Env
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+    MSSQL: AZURESQL
+    LINT_CONFIG: appveyor\tsqllint\.tsqllintrc_150
+    TARGET_DB: expresssql
+    DB_INSTANCE: expresssql.database.windows.net
+    LATEST: False
+    COV_REPORT: appveyor\sqlcover\Coverage_azuresql.opencoverxml
+    AZURE_SQL_USER: lowlysa
+    AzureSQL: True
 
   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     MSSQL: SQL2017
     DB_INSTANCE: (local)\SQL2017
     LINT_CONFIG: appveyor\tsqllint\.tsqllintrc_140
+    LATEST: False
+    AzureSQL: False
 
   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     MSSQL: SQL2016
     DB_INSTANCE: (local)\SQL2016
     LINT_CONFIG: appveyor\tsqllint\.tsqllintrc_130
+    LATEST: False
+    AzureSQL: False
 
   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
     MSSQL: SQL2014
     DB_INSTANCE: (local)\SQL2014
     LINT_CONFIG: appveyor\tsqllint\.tsqllintrc_120
+    LATEST: False
+    AzureSQL: False
 
   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
     MSSQL: SQL2012SP1
     DB_INSTANCE: (local)\SQL2012SP1
     LINT_CONFIG: appveyor\tsqllint\.tsqllintrc_110
+    LATEST: False
+    AzureSQL: False
 
 clone_script:
-- git config --global credential.helper store
-- ps: Add-Content "$HOME\.git-credentials" "https://$($env:access_token):[email protected]`n" -NoNewLine
-- git config --global user.email "[email protected]"
-- git config --global user.name "Appveyor"
-- git config --global core.safecrlf false
-- git clone -q --single-branch --branch=%APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH% https://github.com/LowlyDBA/ExpressSQL.git %APPVEYOR_BUILD_FOLDER%
-- cd %APPVEYOR_BUILD_FOLDER%
+  - git config --global credential.helper store
+  - ps: Add-Content "$HOME\.git-credentials" "https://$($env:access_token):[email protected]`n" -NoNewLine
+  - git config --global user.email "[email protected]"
+  - git config --global user.name "Appveyor"
+  - git config --global core.safecrlf false
+  - git clone -q --single-branch --branch=%APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH% https://github.com/LowlyDBA/ExpressSQL.git %APPVEYOR_BUILD_FOLDER%
+  - cd %APPVEYOR_BUILD_FOLDER%
 
 install:
-- ps: Install-Module SqlServer -Force -AllowClobber
-- npm install tsqllint -g
-- ps: .\appveyor\start_sqlserver.ps1
-- ps: .\appveyor\install_tsqlt.ps1
+  - ps: .\appveyor\install_dependencies.ps1
+  - ps: .\appveyor\start_sqlserver.ps1
+  - ps: .\appveyor\install_tsqlt.ps1
 
 build_script:
-- ps: .\appveyor\make_combined_script.ps1
-- ps: .\appveyor\install_expsql.ps1
-- ps: .\appveyor\build_tsqlt_tests.ps1
-- echo Running TSQLLint tests
-- npx tsqllint -c %LINT_CONFIG% *.sql
+  - ps: .\appveyor\make_combined_script.ps1
+  - ps: .\appveyor\install_expsql.ps1
+  - ps: .\appveyor\build_tsqlt_tests.ps1
 
 # Non-covered test run
 test_script:
-- ps: .\appveyor\run_tsqlt_tests.ps1
+  - ps: .\appveyor\run_tsqllint.ps1
+  - ps: .\appveyor\run_tsqlt_tests.ps1
 
-# Only run code cov & push changes on latest build env
 for:
--
+# Latest SQL Server - Code cov & Upload
+- 
   matrix:
     only:
       - LATEST: True
 
   # Setup codecov, SQL Cover
   before_test:
-  - ps: Install-Package GOEddie.SQLCover -Force | Out-Null
-  - ps: choco install codecov --no-progress --limit-output | Out-Null
+    - ps: .\appveyor\install_coverage_dependencies.ps1
 
   # Run tests with SQL Cover analysis
   test_script:
@@ -91,4 +102,26 @@ for:
   # Upload code coverage report, push generated files
   on_success:
     - codecov -f %COV_REPORT%
-    - ps: .\appveyor\push_git_changes.ps1
+    - ps: .\appveyor\push_git_changes.ps1
+
+# Azure SQL
+-  
+  matrix:
+    only:
+      - AzureSQL: True
+
+  install:
+    - ps: .\appveyor\install_dependencies.ps1
+    - ps: .\appveyor\install_tsqlt.ps1
+
+  # Setup codecov, SQL Cover
+  #before_test:
+  #  - ps: .\appveyor\install_coverage_dependencies.ps1
+
+  # Run tests with SQL Cover analysis
+  #test_script:
+  # - ps: .\appveyor\sqlcover\Run_SQLCover.ps1
+
+  # Upload code coverage report, push generated files
+  #on_success:
+  #  - codecov -f %COV_REPORT%

appveyor/build_tsqlt_tests.ps1

@@ -1,5 +1,23 @@
-Write-Host "Building tSQLt Tests"
+param( 
+    [Parameter()] 
+    [string]$SqlInstance = $env:DB_INSTANCE,
+    [string]$Database = $env:TARGET_DB,
+    [string]$TestPath = "tests\build",
+    [bool]$IsAzureSQL = [System.Convert]::ToBoolean($env:AzureSQL),
+    [string]$User = $env:AZURE_SQL_USER,
+    [string]$Pass = $env:AZURE_SQL_PASS,
+    $Color = "Green"
+    )
 
-ForEach ($filename in Get-Childitem -Path $env:TSQLTBUILDPATH -Filter "*.sql") {
-    Invoke-SqlCmd -ServerInstance $env:DB_INSTANCE -Database $env:TARGET_DB -InputFile $filename.fullname -Username $env:MSSQL_LOGIN -Password $env:MSSQL_PASS
-}
+Write-Host "Building tSQLt Tests..." -ForegroundColor $Color
+
+If ($IsAzureSQL) {
+    ForEach ($filename in Get-Childitem -Path $TestPath -Filter "*.sql") {
+        Invoke-SqlCmd -ServerInstance $SqlInstance -Database $Database -InputFile $filename.fullname -Username $User -Password $Pass
+    }
+}
+Else {
+    ForEach ($filename in Get-Childitem -Path $TestPath -Filter "*.sql") {
+        Invoke-SqlCmd -ServerInstance $SqlInstance -Database $Database -InputFile $filename.fullname
+    }
+}

appveyor/install_azuresql.ps1

@@ -0,0 +1,12 @@
+param( 
+    [Parameter()] 
+    [String]$SqlInstance = $env:DB_INSTANCE,
+    [String]$Database = $env:TARGET_DB,
+    [String]$tSQLtInstallScript = "tests\tSQLt\tSQLt.class.sql",
+    [string]$User = $env:AZURE_SQL_USER,
+    [string]$Pass = $env:AZURE_SQL_PASS,
+    [String]$Color = "Green"
+    )
+
+Write-Host "Installing tSQLt..." -ForegroundColor $Color
+Invoke-SqlCmd -ServerInstance $SqlInstance -Database $Database -InputFile $tSQLtInstallScript -Username $User -Password $Pass

appveyor/install_coverage_dependencies.ps1

@@ -0,0 +1,5 @@
+# Install code coverage tool
+Install-Package GOEddie.SQLCover -Force | Out-Null
+
+# Install codecov.io uploader
+choco install codecov --no-progress --limit-output | Out-Null

appveyor/install_dependencies.ps1

@@ -0,0 +1,17 @@
+param( 
+    [Parameter()] 
+    $Color = "Green"
+    )
+
+Write-Host "Installing dependencies..." -ForegroundColor $Color
+
+# TSQLLinter
+# Try/Catch to stop appveyor unnecessary errors
+Try { npm install tsqllint -g | Out-Null }
+Catch { }
+
+
+# SQLServer Module
+if (!(Get-Module -ListAvailable -Name SqlServer)) {
+    Install-Module SqlServer -Force -AllowClobber
+}

appveyor/install_expsql.ps1

@@ -1,3 +1,19 @@
-Write-Host "Installing ExpressSQL Scripts"
+param( 
+    [Parameter()] 
+    [string]$SqlInstance = $env:DB_INSTANCE,
+    [string]$Database = $env:TARGET_DB,
+    [bool]$IsAzureSQL = [System.Convert]::ToBoolean($env:AzureSQL),
+    [string]$User = $env:AZURE_SQL_USER,
+    [string]$Pass = $env:AZURE_SQL_PASS,
+    [string]$Color = "Green"
+    )
 
-Invoke-SqlCmd -ServerInstance $env:DB_INSTANCE -Database $env:TARGET_DB -InputFile "install_expsql.sql" -Username $env:MSSQL_LOGIN -Password $env:MSSQL_PASS
+Write-Host "Installing ExpressSQL scripts..." -ForegroundColor $Color
+
+If ($IsAzureSQL) {
+    Invoke-SqlCmd -ServerInstance $SqlInstance -Database $Database -InputFile "install_expsql.sql" -Username $User -Password $Pass
+}
+Else {
+    Invoke-SqlCmd -ServerInstance $SqlInstance -Database $Database -InputFile "install_expsql.sql"
+
+}

appveyor/install_tsqlt.ps1

@@ -1,9 +1,24 @@
-Write-Host "Installing tSQLt"
+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)
+    )
 
-$CLRScript = Join-Path $env:APPVEYOR_BUILD_FOLDER $env:TSQLTSETCLR
-$CreateDBScript = Join-Path $env:APPVEYOR_BUILD_FOLDER $env:TSQLTCREATEDB
-$tSQLtInstallScript = Join-Path $env:APPVEYOR_BUILD_FOLDER $env:TSQLTINSTALL
+Write-Host "Installing tSQLt..." -ForegroundColor $Color
 
-Invoke-SqlCmd -ServerInstance $env:DB_INSTANCE -Database "master" -InputFile $clrscript -Username $env:MSSQL_LOGIN -Password $env:MSSQL_PASS | Out-Null
-Invoke-SqlCmd -ServerInstance $env:DB_INSTANCE -Database "master" -InputFile $CreateDBScript -Username $env:MSSQL_LOGIN -Password $env:MSSQL_PASS | Out-Null
-Invoke-SqlCmd -ServerInstance $env:DB_INSTANCE -Database $env:TARGET_DB -InputFile $tSQLtInstallScript -Username $env:MSSQL_LOGIN -Password $env:MSSQL_PASS
+If ($IsAzureSQL) {
+    Invoke-SqlCmd -ServerInstance $SqlInstance -Database $Database -InputFile $tSQLtInstallScript -Username $User -Password $Pass
+}
+Else {
+    Invoke-SqlCmd -ServerInstance $SqlInstance -Database $Master -InputFile $clrscript | Out-Null
+    Invoke-SqlCmd -ServerInstance $SqlInstance -Database $Master -InputFile $CreateDBScript | Out-Null
+    Invoke-SqlCmd -ServerInstance $SqlInstance -Database $Database -InputFile $tSQLtInstallScript
+}

appveyor/run_tsqllint.ps1

@@ -0,0 +1,8 @@
+param( 
+    [Parameter()] 
+    $Config = $env:LINT_CONFIG,
+    $Color = "Green"
+    )
+
+Write-Host "Running TSQLLint with config $Config..." -ForegroundColor $Color
+tsqllint -c $Config *.sql

appveyor/run_tsqlt_tests.ps1

@@ -1,20 +1,27 @@
 param( 
     [Parameter()] 
-    $FilePath = $env:TSQLTTESTPATH,
-    $SqlInstance = $env:DB_INSTANCE,
-    $Database = $env:TARGET_DB,
-    $SqlUser = $env:MSSQL_LOGIN,
-    $SqlPass = $env:MSSQL_PASS,
-    $SQLAuth = $true
+    [string]$FilePath = "tests\run",
+    [string]$SqlInstance = $env:DB_INSTANCE,
+    [string]$Database = $env:TARGET_DB,
+    [bool]$IsAzureSQL = [System.Convert]::ToBoolean($env:AzureSQL),
+    [string]$User = $env:AZURE_SQL_USER,
+    [string]$Pass = $env:AZURE_SQL_PASS,
+    [string]$Color = "Green"
     )
 
-Write-Host "Run tSQLt Tests"
-
-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
+Write-Host "Running tSQLt Tests..." -ForegroundColor $Color
+Try {
+    If ($IsAzureSQL) {
+        ForEach ($filename in Get-Childitem -Path $FilePath -Filter "*.sql") {
+            Invoke-SqlCmd -ServerInstance $SqlInstance -Database $Database -InputFile $filename.fullname -Verbose -Username $User -Password $Pass | Out-Null
+        }
     }
     Else {
-        Invoke-SqlCmd -ServerInstance $SqlInstance -Database $Database -InputFile $filename.fullname -Verbose | Out-Null
+        ForEach ($filename in Get-Childitem -Path $FilePath -Filter "*.sql") {
+            Invoke-SqlCmd -ServerInstance $SqlInstance -Database $Database -InputFile $filename.fullname -Verbose | Out-Null
+        }
     }
+}
+Catch {
+    Write-Error "Unit test error!"
 }