Skip to content

Commit 2394cf4

Browse files
lowlydbalowlydba
authored
Azure sql compatibility (#111)
1 parent 6824dd9 commit 2394cf4

File tree

10 files changed

+46
-30
lines changed

10 files changed

+46
-30
lines changed

‎appveyor/appveyor.yml‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,24 +37,28 @@ environment:
3737
DB_INSTANCE: (local)\SQL2017
3838
LINT_CONFIG: appveyor\tsqllint\.tsqllintrc_140
3939
LATEST: False
40+
AzureSQL: False
4041

4142
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
4243
MSSQL: SQL2016
4344
DB_INSTANCE: (local)\SQL2016
4445
LINT_CONFIG: appveyor\tsqllint\.tsqllintrc_130
4546
LATEST: False
47+
AzureSQL: False
4648

4749
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
4850
MSSQL: SQL2014
4951
DB_INSTANCE: (local)\SQL2014
5052
LINT_CONFIG: appveyor\tsqllint\.tsqllintrc_120
5153
LATEST: False
54+
AzureSQL: False
5255

5356
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
5457
MSSQL: SQL2012SP1
5558
DB_INSTANCE: (local)\SQL2012SP1
5659
LINT_CONFIG: appveyor\tsqllint\.tsqllintrc_110
5760
LATEST: False
61+
AzureSQL: False
5862

5963
clone_script:
6064
- git config --global credential.helper store
@@ -100,23 +104,24 @@ for:
100104
- codecov -f %COV_REPORT%
101105
- ps: .\appveyor\push_git_changes.ps1
102106

103-
# Azure SQL - Code cov & Upload
107+
# Azure SQL
104108
-
105109
matrix:
106110
only:
107111
- AzureSQL: True
108112

109113
install:
110-
- ps: .\appveyor\install_azuresql.ps1
114+
- ps: .\appveyor\install_dependencies.ps1
115+
- ps: .\appveyor\install_tsqlt.ps1
111116

112117
# Setup codecov, SQL Cover
113-
before_test:
114-
- ps: .\appveyor\install_coverage_dependencies.ps1
118+
#before_test:
119+
# - ps: .\appveyor\install_coverage_dependencies.ps1
115120

116121
# Run tests with SQL Cover analysis
117-
test_script:
118-
- ps: .\appveyor\sqlcover\Run_SQLCover.ps1
122+
#test_script:
123+
# - ps: .\appveyor\sqlcover\Run_SQLCover.ps1
119124

120125
# Upload code coverage report, push generated files
121-
on_success:
122-
- codecov -f %COV_REPORT%
126+
#on_success:
127+
# - codecov -f %COV_REPORT%

‎appveyor/build_tsqlt_tests.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ param(
33
[string]$SqlInstance = $env:DB_INSTANCE,
44
[string]$Database = $env:TARGET_DB,
55
[string]$TestPath = "tests\build",
6-
[string]$IsAzureSQL = $env:AzureSQL,
6+
[bool]$IsAzureSQL = [System.Convert]::ToBoolean($env:AzureSQL),
77
[string]$User = $env:AZURE_SQL_USER,
88
[string]$Pass = $env:AZURE_SQL_PASS,
99
$Color = "Green"
1010
)
1111

1212
Write-Host "Building tSQLt Tests..." -ForegroundColor $Color
1313

14-
If ($IsAzureSQL -eq "True") {
14+
If ($IsAzureSQL) {
1515
ForEach ($filename in Get-Childitem -Path $TestPath -Filter "*.sql") {
1616
Invoke-SqlCmd -ServerInstance $SqlInstance -Database $Database -InputFile $filename.fullname -Username $User -Password $Pass
1717
}

‎appveyor/install_expsql.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ param(
22
[Parameter()]
33
[string]$SqlInstance = $env:DB_INSTANCE,
44
[string]$Database = $env:TARGET_DB,
5-
[string]$IsAzureSQL = $env:AzureSQL,
5+
[bool]$IsAzureSQL = [System.Convert]::ToBoolean($env:AzureSQL),
66
[string]$User = $env:AZURE_SQL_USER,
77
[string]$Pass = $env:AZURE_SQL_PASS,
88
[string]$Color = "Green"
99
)
1010

1111
Write-Host "Installing ExpressSQL scripts..." -ForegroundColor $Color
1212

13-
If ($IsAzureSQL -eq "True") {
13+
If ($IsAzureSQL) {
1414
Invoke-SqlCmd -ServerInstance $SqlInstance -Database $Database -InputFile "install_expsql.sql" -Username $User -Password $Pass
1515
}
1616
Else {

‎appveyor/install_tsqlt.ps1‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,19 @@ param(
66
[String]$CreateDBScript = "tests\tSQLt\CreateDatabase.sql",
77
[String]$tSQLtInstallScript = "tests\tSQLt\tSQLt.class.sql",
88
[String]$Color = "Green",
9-
[String]$Master = "master"
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)
1013
)
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ param(
33
[string]$FilePath = "tests\run",
44
[string]$SqlInstance = $env:DB_INSTANCE,
55
[string]$Database = $env:TARGET_DB,
6-
[string]$IsAzureSQL = $env:AzureSQL,
6+
[bool]$IsAzureSQL = [System.Convert]::ToBoolean($env:AzureSQL),
77
[string]$User = $env:AZURE_SQL_USER,
88
[string]$Pass = $env:AZURE_SQL_PASS,
99
[string]$Color = "Green"
1010
)
1111

1212
Write-Host "Running tSQLt Tests..." -ForegroundColor $Color
1313
Try {
14-
If ($IsAzureSQL -eq "True") {
14+
If ($IsAzureSQL) {
1515
ForEach ($filename in Get-Childitem -Path $FilePath -Filter "*.sql") {
1616
Invoke-SqlCmd -ServerInstance $SqlInstance -Database $Database -InputFile $filename.fullname -Verbose -Username $User -Password $Pass | Out-Null
1717
}

‎appveyor/sqlcover/Coverage.opencoverxml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@
300300
<SequencePoint vc="1" uspid="273" ordinal="153" offset="27239" sl="640" sc="4" el="640" ec="88" />
301301
<SequencePoint vc="1" uspid="274" ordinal="154" offset="27330" sl="641" sc="4" el="641" ec="38" />
302302
<SequencePoint vc="5" uspid="275" ordinal="155" offset="27398" sl="644" sc="12" el="644" ec="36" />
303-
<SequencePoint vc="0" uspid="276" ordinal="156" offset="27470" sl="646" sc="11" el="659" ec="41" />
303+
<SequencePoint vc="0" uspid="276" ordinal="156" offset="27472" sl="646" sc="11" el="659" ec="41" />
304304
<SequencePoint vc="5" uspid="277" ordinal="157" offset="28441" sl="664" sc="2" el="664" ec="37" />
305305
<SequencePoint vc="5" uspid="278" ordinal="158" offset="28481" sl="665" sc="2" el="665" ec="19" />
306306
<SequencePoint vc="1" uspid="279" ordinal="159" offset="28515" sl="667" sc="4" el="667" ec="86" />

‎appveyor/sqlcover/Run_SQLCover.ps1‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,15 @@ param(
77
[string]$Database = $env:TARGET_DB,
88
[string]$TrustedConnection = "yes",
99
[string]$CoverageXMLPath = $env:COV_REPORT,
10-
[string]$IsAzureSQL = $env:AzureSQL,
10+
[bool]$IsAzureSQL = [System.Convert]::ToBoolean($env:AzureSQL),
1111
[string]$User = $env:AZURE_SQL_USER,
1212
[string]$Pass = $env:AZURE_SQL_PASS,
1313
[string]$Color = "Green"
1414
)
1515

1616
# Setup vars
1717
If ($IsAzureSQL) {
18-
$TrustedConnection = "no"
19-
$ConnString = "server=$SqlInstance;initial catalog=$Database;Trusted_Connection=$TrustedConnection;User Id=$User;Password=$Pass"
18+
$ConnString = "server=$SqlInstance;initial catalog=$Database;User Id=$User;pwd=$Pass"
2019
}
2120
Else {
2221
$ConnString = "server=$SqlInstance;initial catalog=$Database;Trusted_Connection=$TrustedConnection"
@@ -37,7 +36,7 @@ $IsCoverStarted = $SQLCover.Start()
3736

3837
If ($IsCoverStarted) {
3938
# Run Tests
40-
. .\appveyor\run_tsqlt_tests.ps1 -SqlInstance $SqlInstance -Database $Database
39+
. .\appveyor\run_tsqlt_tests.ps1 -SqlInstance $SqlInstance -Database $Database -IsAzureSQL $IsAzureSQL -User $User -Pass $Pass
4140

4241
# Stop covering
4342
Write-Host "Stopping SQLCover..." -ForegroundColor $Color

‎docs/README.md‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# Express SQL
22

33
![License](https://img.shields.io/github/license/LowlyDBA/ExpressSQL?color=blue)
4-
![SQL Server](https://img.shields.io/badge/SQL%20Server-2012--2019-red?logo=microsoft-sql-server)
4+
![SQL Server](https://img.shields.io/badge/SQL%20Server-2012--2019-blue?logo=microsoft-sql-server)
5+
![Azure SQL](https://img.shields.io/badge/Azure%20SQL-vCurrent-blue?logo=data:image/svg+xml;base64,PHN2ZyBkYXRhLXNsdWctaWQ9InNxbC1kYXRhYmFzZS1ibHVlIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0OSA0OSI+DQogIDxwYXRoIGQ9Im02LjQwNDIxIDcuNDA0NDJ2MzQuMTk1NzhjMCAzLjUyNDMgNy44ODk2OSA2LjQ3NzIgMTcuNjgwMzkgNi40Nzcydi00MC42NzI5OHoiIGZpbGw9IiM4MDgwODAiLz4NCiAgPHBhdGggZD0ibTIzLjg5NDYgNDguMDc3NGguMjg1MmM5Ljc5MDcgMCAxNy42ODA0LTIuODU3NiAxNy42ODA0LTYuNDc3MnYtMzQuMTk1NzhoLTE3Ljk2NTZ6IiBmaWxsPSIjODA4MDgwIi8+DQogIDxwYXRoIGQ9Im0yMy43MDQzIDQ4LjA3NzloLjI4NTJjOS44ODU4IDAgMTcuOTY1Ni0yLjg1NzYgMTcuOTY1Ni02LjQ3NzJ2LTM0LjI5MTAxaC0xOC4xNTU3eiIgZmlsbD0iIzgwODA4MCIvPg0KICA8cGF0aCBkPSJtNDEuODU4NCA3LjQwNTUzYzAgMy41MjQzNy03Ljg4OTcgNi40NzcxNy0xNy42ODA1IDYuNDc3MTctOS43OTA3IDAtMTcuNjgwMzktMi44NTc2LTE3LjY4MDM5LTYuNDc3MTcgMC0zLjYxOTYgNy44ODk2OS02LjQ3NzE4NSAxNy42ODAzOS02LjQ3NzE4NSA5Ljc5MDggMCAxNy42ODA1IDIuOTUyODM1IDE3LjY4MDUgNi40NzcxODV6IiBmaWxsPSIjZmZmIi8+PHBhdGggZD0ibTM4LjI0ODEgNy4wMjM4YzAgMi4zODEzMi02LjI3MzcgNC4yODY0LTE0LjA2ODMgNC4yODY0cy0xNC4wNjgzLTEuOTA1MDgtMTQuMDY4My00LjI4NjQgNi4yNzM3LTQuMjg2MzcgMTQuMDY4My00LjI4NjM3IDE0LjA2ODMgMS45MDUwNSAxNC4wNjgzIDQuMjg2Mzd6IiBmaWxsPSIjODA4MDgwIi8+DQogIDxwYXRoIGQ9Im0zNS4zMDEzIDkuNTk1NjNjMS44MDYxLS43NjIwMiAyLjk0NjgtMS42MTkzIDIuOTQ2OC0yLjU3MTgzIDAtMi4zODEzMi02LjI3MzctNC4yODYzNy0xNC4wNjgzLTQuMjg2MzdzLTE0LjA2ODMgMS45MDUwNS0xNC4wNjgzIDQuMjg2MzdjMCAuOTUyNTMgMS4xNDA3IDEuOTA1MDYgMi45NDY3IDIuNTcxODMgMi41NjY1LTEuMDQ3NzggNi42NTQtMS42MTkzIDExLjEyMTYtMS42MTkzczguNTU1LjY2Njc3IDExLjEyMTUgMS42MTkzeiIgZmlsbD0iIzgwODA4MCIvPg0KICA8ZyBmaWxsPSIjZmZmIj4NCiAgICA8cGF0aCBkPSJtMTguNDc1MiAzMS4xMjJjMCAxLjA0NzgtLjM4MDMgMS45MDUxLTEuMTQwNyAyLjQ3NjYtLjc2MDUuNTcxNS0xLjgwNjEuODU3My0zLjIzMTkuODU3My0xLjE0MDcgMC0yLjA5MTMtLjE5MDUtMi44NTE3LS42NjY4di0yLjQ3NjZjLjg1NTUuNzYyMSAxLjkwMTEgMS4xNDMxIDIuOTQ2NyAxLjE0MzEuNDc1MyAwIC45NTA2LS4wOTUzIDEuMjM1OC0uMjg1OC4yODUxLS4xOTA1LjM4MDItLjQ3NjIuMzgwMi0uODU3MyAwLS4zODEtLjA5NTEtLjY2NjctLjM4MDItLjg1NzItLjI4NTItLjI4NTgtLjg1NTUtLjU3MTUtMS43MTEtLjk1MjYtMS43MTExLS43NjItMi41NjY2LTEuOTA1LTIuNTY2Ni0zLjIzODYgMC0xLjA0NzcuMzgwMy0xLjgwOTggMS4xNDA3LTIuMzgxMy43NjA1LS41NzE1IDEuNzExLS45NTI1IDIuOTQ2Ny0uOTUyNSAxLjA0NTcgMCAxLjk5NjIuMTkwNSAyLjc1NjcuNDc2M3YyLjM4MTNjLS43NjA1LS40NzYzLTEuNjE2LS43NjItMi41NjY1LS43NjItLjQ3NTMgMC0uODU1NS4wOTUyLTEuMTQwNy4yODU3cy0uMzgwMi40NzYzLS4zODAyLjg1NzMuMDk1LjY2NjguMzgwMi44NTczYy4xOTAxLjE5MDUuNjY1NC40NzYyIDEuNDI1OC44NTcyIDEuMDQ1Ni40NzYzIDEuODA2MS45NTI2IDIuMjgxNCAxLjUyNDEuMjg1MS4zODEuNDc1My45NTI1LjQ3NTMgMS43MTQ1eiIvPjxwYXRoIGQ9Im0yNy44ODY4IDI4Ljc0MTJjMC0xLjE0My0uMjg1Mi0yLjAwMDMtLjc2MDQtMi42NjcxLS40NzUzLS42NjY3LTEuMTQwNy0uOTUyNS0xLjk5NjItLjk1MjVzLTEuNjE2LjI4NTgtMi4wOTEzLjk1MjVjLS41NzAzLjY2NjgtLjc2MDQgMS41MjQxLS43NjA0IDIuNjY3MSAwIDEuMDQ3OC4yODUyIDIuMDAwMy43NjA0IDIuNjY3MS40NzUzLjY2NjggMS4yMzU4Ljk1MjUgMi4wOTEzLjk1MjVzMS41MjA5LS4yODU3IDIuMDkxMi0uOTUyNWMuMzgwMi0uNjY2OC42NjU0LTEuNTI0MS42NjU0LTIuNjY3MXptMi42NjE2LS4wOTUyYzAgMS4zMzM1LS4yODUyIDIuNDc2NS0uODU1NSAzLjQyOTEtLjU3MDQuOTUyNS0xLjQyNTkgMS42MTkzLTIuNTY2NSAyLjAwMDNsMy4yMzE5IDMuMDQ4MWgtMy4yMzE5bC0yLjI4MTQtMi41NzE5Yy0uOTUwNiAwLTEuOTAxMS0uMjg1Ny0yLjY2MTYtLjc2Mi0uNzYwNC0uNDc2My0xLjQyNTgtMS4xNDMtMS44MDYtMi4wMDAzLS40NzUzLS44NTczLS42NjU0LTEuODA5OC0uNjY1NC0yLjg1NzYgMC0xLjE0My4xOTAxLTIuMTkwOC42NjU0LTMuMTQzMy40NzUzLS45NTI2IDEuMTQwNi0xLjYxOTMgMS45OTYyLTIuMDk1Ni44NTU1LS40NzYzIDEuODA2LS43NjIgMi45NDY3LS43NjIgMS4wNDU2IDAgMS45OTYyLjE5MDUgMi43NTY2LjY2NjguODU1NS40NzYyIDEuNDI1OSAxLjE0MyAxLjkwMTEgMi4wMDAzLjM4MDMuOTUyNS41NzA0IDEuOTA1LjU3MDQgMy4wNDgxeiIvPjxwYXRoIGQ9Im0zOS4xMDM2IDM0LjI2NTNoLTYuNzQ5di0xMS4xNDQ2aDIuNTY2NnY5LjE0NDNoNC4xODI0eiIvPg0KICA8L2c+DQo8L3N2Zz4NCg==)
6+
57
[![Build status](https://ci.appveyor.com/api/projects/status/bak6km5grc3j63s8?svg=true)](https://ci.appveyor.com/project/LowlyDBA/expresssql)
68
![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/LowlyDBA/ExpressSQL/Lint%20Code%20Base/master?label=lint%20code%20master)
79
[![codecov](https://codecov.io/gh/LowlyDBA/ExpressSQL/branch/master/graph/badge.svg)](https://codecov.io/gh/LowlyDBA/ExpressSQL)
@@ -20,7 +22,7 @@ To quickly install or update all the scripts below, use `install_expsql.sql`.
2022

2123
## Compatibility
2224

23-
Tested on AppVeyor:
25+
Tested on:
2426

2527
* Azure SQL
2628
* SQL Server 2019
@@ -29,6 +31,8 @@ Tested on AppVeyor:
2931
* SQL Server 2014
3032
* SQL Server 2012 SP1
3133

32-
## More
34+
## Contributing
35+
36+
Missing a feature? Found a bug? Open an [issue][issue] to get some :heart:.
3337

34-
Complimentary SQL Server Express guides at [expressdb.io](https://expressdb.io).
38+
[issue]: https://github.com/LowlyDBA/ExpressSQL/issues

‎install_expsql.sql‎

0 Bytes
Binary file not shown.

‎sp_sizeoptimiser.sql‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -680,8 +680,8 @@ BEGIN
680680
RAISERROR(@Msg, 10, 1) WITH NOWAIT;
681681
END;
682682
BEGIN;
683-
IF (@EngineEdition <> 5) --Azure SQL
684-
BEGIN
683+
IF (@EngineEdition <> 5) --Not Azure SQL
684+
BEGIN
685685
INSERT INTO #results ([check_num], [check_type], [obj_type], [db_name], [obj_name], [col_name], [message], [ref_link])
686686
SELECT @CheckNumber
687687
,N'File Growth'
@@ -696,7 +696,7 @@ BEGIN
696696
INNER JOIN #Databases AS [d] ON [d].[database_name] = [sd].[name]
697697
WHERE [mf].[is_percent_growth] = 1
698698
AND [mf].[data_space_id] = 1; --ignore log files
699-
END;
699+
END;
700700
END; -- User DB or model db growth set to % Check
701701

702702
/* Default fill factor (EXPRESS ONLY)*/

0 commit comments

Comments
 (0)