ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-01-23 01:25:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

[brgrbic] SqlOD changes for cloud Server Type and minor bug fixes (#1092)

Browse Source 
* The ServerType of SQL OD in SMO is being changed to cloud. This is a minimal set of changes needed in sqltoolservice in order to keep everything working within ADS.

* SMO version update
This commit is contained in:
BranislavGrbicMDCS
2020-10-23 18:48:33 +02:00
committed by GitHub
parent dbfcf4ad61
commit 3e98a2f17b
8 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Microsoft.SqlTools.ServiceLayer/Admin/Database/DatabasePrototype.cs
View File

@@ -280,7 +280,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Admin
SELECT so.name as configured_slo_name, so2.name as current_slo_name
FROM dbo.slo_database_objectives do
INNER JOIN dbo.slo_service_objectives so ON do.configured_objective_id = so.objective_id
INNER JOIN dbo.slo_service_objectives so2 ON do.current_objective_id = so2.objective_id
INNER JOIN dbo.slo_service_objectives so2 ON do.current_objective_id = so2.objective_id
WHERE do.database_id = @DbID
";
@@ -586,7 +586,8 @@ WHERE do.database_id = @DbID
}
//Only fill in the Azure properties when connected to an Azure server
if (context.Server.ServerType == DatabaseEngineType.SqlAzureDatabase)
if (context.Server.ServerType == DatabaseEngineType.SqlAzureDatabase
&& context.Server.DatabaseEngineEdition != DatabaseEngineEdition.SqlOnDemand)
{
this.azureEditionDisplayValue = db.AzureEdition;
AzureEdition edition;