Skip to content

Commit 79cad00

Browse files
committed
Merge branch 'VSCCIxxx' into VSCCI
2 parents e7fd38f + dc2562b commit 79cad00

5 files changed

+41
-2
lines changed

Build/SQL/DisableExternalAccess.sql

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
EXEC tSQLt.EnableExternalAccess @try = 0, @enable=0;

Build/SQL/EnableExternalAccess.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
EXEC tSQLt.EnableExternalAccess @try = 1;
1+
EXEC tSQLt.EnableExternalAccess @try = 0, @enable=1;

Build/tSQLt_BuildTests.ps1

+1
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ try{
140140
"Install(tSQLtAssemblyKey).sql",
141141
"ChangeDbAndExecuteStatement(tSQLt.Build).sql",
142142
"EnableExternalAccess.sql",
143+
"DisableExternalAccess.sql",
143144
"Drop(master.tSQLt_testutil).sql",
144145
"Install(master.tSQLt_testutil).sql",
145146
"GetFailedTestCount.sql",

Build/tSQLt_ValidateRuntSQLtTests.ps1

+36
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,18 @@ if($DeploySource -eq "class"){
3838
# Write-Warning('-->>------------>>--')
3939
# Get-FriendlySQLServerVersion -SqlServerConnection $SqlServerConnection
4040
# Write-Warning('--<<------------<<--')
41+
Log-Output('Run All Tests... Disabling External Access...')
42+
$parameters = @{
43+
SqlServerConnection = $SqlServerConnection
44+
HelperSQLPath = $HelperSQLPath
45+
Elevated = $true
46+
Files = @(
47+
(Join-Path $TestsPath "DisableExternalAccess.sql" | Resolve-Path)
48+
)
49+
DatabaseName = $TestDbName
50+
}
51+
Invoke-SQLFileOrQuery @parameters;
52+
4153
Log-Output('Run All Tests... Run Bootstrap Tests...')
4254
$parameters = @{
4355
SqlServerConnection = $SqlServerConnection
@@ -112,6 +124,18 @@ $parameters = @{
112124
}
113125
Invoke-TestsFromFile @parameters;
114126

127+
Log-Output('Run All Tests... Installing Assembly Key (needed for 2016 only)...')
128+
$parameters = @{
129+
SqlServerConnection = $SqlServerConnection
130+
HelperSQLPath = $HelperSQLPath
131+
Elevated = $true
132+
Files = @(
133+
(Join-Path $TestsPath "Install(tSQLtAssemblyKey).sql" | Resolve-Path)
134+
)
135+
DatabaseName = $TestDbName
136+
}
137+
Invoke-SQLFileOrQuery @parameters;
138+
115139
Log-Output('Run All Tests... tSQLt EXTERNAL_ACCESS_KEY_EXISTS Tests...')
116140
$parameters = @{
117141
SqlServerConnection = $SqlServerConnection
@@ -123,6 +147,18 @@ $parameters = @{
123147
}
124148
Invoke-TestsFromFile @parameters;
125149

150+
Log-Output('Run All Tests... Enabling External Access...')
151+
$parameters = @{
152+
SqlServerConnection = $SqlServerConnection
153+
HelperSQLPath = $HelperSQLPath
154+
Elevated = $true
155+
Files = @(
156+
(Join-Path $TestsPath "EnableExternalAccess.sql" | Resolve-Path)
157+
)
158+
DatabaseName = $TestDbName
159+
}
160+
Invoke-SQLFileOrQuery @parameters;
161+
126162
Log-Output('Run All Tests... tSQLt EXTERNAL_ACCESS Tests...')
127163
$parameters = @{
128164
SqlServerConnection = $SqlServerConnection

CI/Azure-DevOps/CreateSQLVM_azcli.ps1

+2-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ Log-Output "SQLVersionEditionInfo: ", $SQLVersionEditionInfo;
8181
Log-Output "TemplateFile: ", $TemplateFile;
8282

8383
Log-Output "START: Creating Resource Group $ResourceGroupName";
84-
$output = az group create --location "$Location" --name "$ResourceGroupName" | ConvertFrom-Json;
84+
85+
$output = az group create --location "$Location" --name "$ResourceGroupName" --tags Department="tSQLtCI" Ephemeral="True" | ConvertFrom-Json;
8586
if (!$output) {
8687
Write-Error "Error creating Resource Group";
8788
return

0 commit comments

Comments
 (0)