Skip to content

Commit c0d63b7

Browse files
lowlydbalowlydba
committed
Merge branch 'master' into development
2 parents 7b957a8 + 9a3d516 commit c0d63b7

17 files changed

+971
-415
lines changed

‎appveyor/appveyor.yml‎

Lines changed: 46 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ max_jobs: 1
77
environment:
88
access_token:
99
secure: 'E5I+i+CQyj9EHusDrPSQKHRXmzmpTujYAoFxlvJjvSRSEQHHzqTBIFR1VuPbwLMi'
10+
AZURE_SQL_PASS:
11+
secure: 'rYm3nE1kwpbdE7QtyLb8CjvA1ENjY3usz3Qqskf1TXU='
1012

1113
APPVEYOR_RDP_PASSWORD: Np^VNSzJI5#OmRdUNqro2T9UVkCdZ
1214
TARGET_DB: tSQLt
@@ -18,26 +20,45 @@ environment:
1820
DB_INSTANCE: (local)\SQL2019
1921
LINT_CONFIG: appveyor\tsqllint\.tsqllintrc_150
2022
LATEST: True
23+
24+
# Azure SQL Env
25+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
26+
MSSQL: AZURESQL
27+
LINT_CONFIG: appveyor\tsqllint\.tsqllintrc_150
28+
TARGET_DB: expresssql
29+
DB_INSTANCE: expresssql.database.windows.net
30+
LATEST: False
31+
COV_REPORT: appveyor\sqlcover\Coverage_azuresql.opencoverxml
32+
AZURE_SQL_USER: lowlysa
33+
AzureSQL: True
2134

2235
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
2336
MSSQL: SQL2017
2437
DB_INSTANCE: (local)\SQL2017
2538
LINT_CONFIG: appveyor\tsqllint\.tsqllintrc_140
39+
LATEST: False
40+
AzureSQL: False
2641

2742
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
2843
MSSQL: SQL2016
2944
DB_INSTANCE: (local)\SQL2016
3045
LINT_CONFIG: appveyor\tsqllint\.tsqllintrc_130
46+
LATEST: False
47+
AzureSQL: False
3148

3249
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
3350
MSSQL: SQL2014
3451
DB_INSTANCE: (local)\SQL2014
3552
LINT_CONFIG: appveyor\tsqllint\.tsqllintrc_120
53+
LATEST: False
54+
AzureSQL: False
3655

3756
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
3857
MSSQL: SQL2012SP1
3958
DB_INSTANCE: (local)\SQL2012SP1
4059
LINT_CONFIG: appveyor\tsqllint\.tsqllintrc_110
60+
LATEST: False
61+
AzureSQL: False
4162

4263
clone_script:
4364
- git config --global credential.helper store
@@ -63,9 +84,9 @@ test_script:
6384
- ps: .\appveyor\run_tsqllint.ps1
6485
- ps: .\appveyor\run_tsqlt_tests.ps1
6586

66-
# Only run code cov & push changes on latest build env
6787
for:
68-
-
88+
# Latest SQL Server - Code cov & Upload
89+
-
6990
matrix:
7091
only:
7192
- LATEST: True
@@ -81,4 +102,26 @@ for:
81102
# Upload code coverage report, push generated files
82103
on_success:
83104
- codecov -f %COV_REPORT%
84-
- ps: .\appveyor\push_git_changes.ps1
105+
- ps: .\appveyor\push_git_changes.ps1
106+
107+
# Azure SQL
108+
-
109+
matrix:
110+
only:
111+
- AzureSQL: True
112+
113+
install:
114+
- ps: .\appveyor\install_dependencies.ps1
115+
- ps: .\appveyor\install_tsqlt.ps1
116+
117+
# Setup codecov, SQL Cover
118+
#before_test:
119+
# - ps: .\appveyor\install_coverage_dependencies.ps1
120+
121+
# Run tests with SQL Cover analysis
122+
#test_script:
123+
# - ps: .\appveyor\sqlcover\Run_SQLCover.ps1
124+
125+
# Upload code coverage report, push generated files
126+
#on_success:
127+
# - codecov -f %COV_REPORT%

‎appveyor/build_tsqlt_tests.ps1‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,23 @@
11
param(
22
[Parameter()]
3-
$SqlInstance = $env:DB_INSTANCE,
4-
$Database = $env:TARGET_DB,
5-
$TestPath = "tests\build",
3+
[string]$SqlInstance = $env:DB_INSTANCE,
4+
[string]$Database = $env:TARGET_DB,
5+
[string]$TestPath = "tests\build",
6+
[bool]$IsAzureSQL = [System.Convert]::ToBoolean($env:AzureSQL),
7+
[string]$User = $env:AZURE_SQL_USER,
8+
[string]$Pass = $env:AZURE_SQL_PASS,
69
$Color = "Green"
710
)
811

912
Write-Host "Building tSQLt Tests..." -ForegroundColor $Color
1013

11-
ForEach ($filename in Get-Childitem -Path $TestPath -Filter "*.sql") {
12-
Invoke-SqlCmd -ServerInstance $SqlInstance -Database $Database -InputFile $filename.fullname
13-
}
14+
If ($IsAzureSQL) {
15+
ForEach ($filename in Get-Childitem -Path $TestPath -Filter "*.sql") {
16+
Invoke-SqlCmd -ServerInstance $SqlInstance -Database $Database -InputFile $filename.fullname -Username $User -Password $Pass
17+
}
18+
}
19+
Else {
20+
ForEach ($filename in Get-Childitem -Path $TestPath -Filter "*.sql") {
21+
Invoke-SqlCmd -ServerInstance $SqlInstance -Database $Database -InputFile $filename.fullname
22+
}
23+
}

‎appveyor/install_azuresql.ps1‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
param(
2+
[Parameter()]
3+
[String]$SqlInstance = $env:DB_INSTANCE,
4+
[String]$Database = $env:TARGET_DB,
5+
[String]$tSQLtInstallScript = "tests\tSQLt\tSQLt.class.sql",
6+
[string]$User = $env:AZURE_SQL_USER,
7+
[string]$Pass = $env:AZURE_SQL_PASS,
8+
[String]$Color = "Green"
9+
)
10+
11+
Write-Host "Installing tSQLt..." -ForegroundColor $Color
12+
Invoke-SqlCmd -ServerInstance $SqlInstance -Database $Database -InputFile $tSQLtInstallScript -Username $User -Password $Pass

‎appveyor/install_dependencies.ps1‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ param(
66
Write-Host "Installing dependencies..." -ForegroundColor $Color
77

88
# TSQLLinter
9-
npm install tsqllint -g
9+
# Try/Catch to stop appveyor unnecessary errors
10+
Try { npm install tsqllint -g | Out-Null }
11+
Catch { }
12+
1013

1114
# SQLServer Module
1215
if (!(Get-Module -ListAvailable -Name SqlServer)) {

‎appveyor/install_expsql.ps1‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,19 @@
11
param(
22
[Parameter()]
3-
$SqlInstance = $env:DB_INSTANCE,
4-
$Database = $env:TARGET_DB,
5-
$Color = "Green"
3+
[string]$SqlInstance = $env:DB_INSTANCE,
4+
[string]$Database = $env:TARGET_DB,
5+
[bool]$IsAzureSQL = [System.Convert]::ToBoolean($env:AzureSQL),
6+
[string]$User = $env:AZURE_SQL_USER,
7+
[string]$Pass = $env:AZURE_SQL_PASS,
8+
[string]$Color = "Green"
69
)
710

811
Write-Host "Installing ExpressSQL scripts..." -ForegroundColor $Color
912

10-
Invoke-SqlCmd -ServerInstance $SqlInstance -Database $Database -InputFile "install_expsql.sql"
13+
If ($IsAzureSQL) {
14+
Invoke-SqlCmd -ServerInstance $SqlInstance -Database $Database -InputFile "install_expsql.sql" -Username $User -Password $Pass
15+
}
16+
Else {
17+
Invoke-SqlCmd -ServerInstance $SqlInstance -Database $Database -InputFile "install_expsql.sql"
18+
19+
}

‎appveyor/install_tsqlt.ps1‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,24 @@
11
param(
22
[Parameter()]
3-
$SqlInstance = $env:DB_INSTANCE,
4-
$Database = $env:TARGET_DB,
5-
$CLRScript = "tests\tSQLt\SetClrEnabled.sql",
6-
$CreateDBScript = "tests\tSQLt\CreateDatabase.sql",
7-
$tSQLtInstallScript = "tests\tSQLt\tSQLt.class.sql",
8-
$Color = "Green"
3+
[String]$SqlInstance = $env:DB_INSTANCE,
4+
[String]$Database = $env:TARGET_DB,
5+
[String]$CLRScript = "tests\tSQLt\SetClrEnabled.sql",
6+
[String]$CreateDBScript = "tests\tSQLt\CreateDatabase.sql",
7+
[String]$tSQLtInstallScript = "tests\tSQLt\tSQLt.class.sql",
8+
[String]$Color = "Green",
9+
[String]$Master = "master",
10+
[string]$User = $env:AZURE_SQL_USER,
11+
[string]$Pass = $env:AZURE_SQL_PASS,
12+
[bool]$IsAzureSQL = [System.Convert]::ToBoolean($env:AzureSQL)
913
)
10-
$Master = "master"
1114

1215
Write-Host "Installing tSQLt..." -ForegroundColor $Color
1316

14-
Invoke-SqlCmd -ServerInstance $SqlInstance -Database $Master -InputFile $clrscript | Out-Null
15-
Invoke-SqlCmd -ServerInstance $SqlInstance -Database $Master -InputFile $CreateDBScript | Out-Null
16-
Invoke-SqlCmd -ServerInstance $SqlInstance -Database $Database -InputFile $tSQLtInstallScript
17+
If ($IsAzureSQL) {
18+
Invoke-SqlCmd -ServerInstance $SqlInstance -Database $Database -InputFile $tSQLtInstallScript -Username $User -Password $Pass
19+
}
20+
Else {
21+
Invoke-SqlCmd -ServerInstance $SqlInstance -Database $Master -InputFile $clrscript | Out-Null
22+
Invoke-SqlCmd -ServerInstance $SqlInstance -Database $Master -InputFile $CreateDBScript | Out-Null
23+
Invoke-SqlCmd -ServerInstance $SqlInstance -Database $Database -InputFile $tSQLtInstallScript
24+
}

‎appveyor/run_tsqlt_tests.ps1‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,27 @@
11
param(
22
[Parameter()]
3-
$FilePath = "tests\run",
4-
$SqlInstance = $env:DB_INSTANCE,
5-
$Database = $env:TARGET_DB,
6-
$Color = "Green"
3+
[string]$FilePath = "tests\run",
4+
[string]$SqlInstance = $env:DB_INSTANCE,
5+
[string]$Database = $env:TARGET_DB,
6+
[bool]$IsAzureSQL = [System.Convert]::ToBoolean($env:AzureSQL),
7+
[string]$User = $env:AZURE_SQL_USER,
8+
[string]$Pass = $env:AZURE_SQL_PASS,
9+
[string]$Color = "Green"
710
)
811

912
Write-Host "Running tSQLt Tests..." -ForegroundColor $Color
10-
11-
ForEach ($filename in Get-Childitem -Path $FilePath -Filter "*.sql") {
12-
Invoke-SqlCmd -ServerInstance $SqlInstance -Database $Database -InputFile $filename.fullname -Verbose | Out-Null
13+
Try {
14+
If ($IsAzureSQL) {
15+
ForEach ($filename in Get-Childitem -Path $FilePath -Filter "*.sql") {
16+
Invoke-SqlCmd -ServerInstance $SqlInstance -Database $Database -InputFile $filename.fullname -Verbose -Username $User -Password $Pass | Out-Null
17+
}
18+
}
19+
Else {
20+
ForEach ($filename in Get-Childitem -Path $FilePath -Filter "*.sql") {
21+
Invoke-SqlCmd -ServerInstance $SqlInstance -Database $Database -InputFile $filename.fullname -Verbose | Out-Null
22+
}
23+
}
24+
}
25+
Catch {
26+
Write-Error "Unit test error!"
1327
}

0 commit comments

Comments
 (0)