From c92bc71454c59c8ba0f0117a89ce113f307cdce8 Mon Sep 17 00:00:00 2001 From: Cory Rivera Date: Tue, 13 Jun 2023 16:04:23 -0700 Subject: [PATCH] Exclude Data Warehouse as an option when creating an Azure database (#2100) --- .../Admin/Database/AzureSqlDbHelper.cs | 4 ++-- .../ObjectManagement/DatabaseHandlerTests.cs | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/AzureSqlDbHelper.cs b/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/AzureSqlDbHelper.cs index 33f5be2e..5c1b176a 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/AzureSqlDbHelper.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/Admin/Database/AzureSqlDbHelper.cs @@ -527,10 +527,10 @@ namespace Microsoft.SqlTools.ServiceLayer.Admin yield return AzureEdition.Basic; yield return AzureEdition.Standard; yield return AzureEdition.Premium; - yield return AzureEdition.DataWarehouse; - yield return AzureEdition.BusinessCritical; yield return AzureEdition.GeneralPurpose; yield return AzureEdition.Hyperscale; + yield return AzureEdition.BusinessCritical; + // Excluding DataWarehouse here since creating a new one is deprecated } } } diff --git a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/ObjectManagement/DatabaseHandlerTests.cs b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/ObjectManagement/DatabaseHandlerTests.cs index 6cfd5a30..532cfb98 100644 --- a/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/ObjectManagement/DatabaseHandlerTests.cs +++ b/test/Microsoft.SqlTools.ServiceLayer.IntegrationTests/ObjectManagement/DatabaseHandlerTests.cs @@ -196,7 +196,6 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.ObjectManagement { AzureEdition.Basic, "Basic" }, { AzureEdition.Standard, "S0" }, { AzureEdition.Premium, "P1" }, - { AzureEdition.DataWarehouse, "DW400" }, { AzureEdition.BusinessCritical, "BC_Gen5_2" }, { AzureEdition.GeneralPurpose, "GP_Gen5_2" }, { AzureEdition.Hyperscale, "HS_Gen5_2" } @@ -236,7 +235,6 @@ namespace Microsoft.SqlTools.ServiceLayer.IntegrationTests.ObjectManagement { AzureEdition.Basic, "2GB" }, { AzureEdition.Standard, "250GB" }, { AzureEdition.Premium, "500GB" }, - { AzureEdition.DataWarehouse, "10240GB" }, { AzureEdition.BusinessCritical, "32GB" }, { AzureEdition.GeneralPurpose, "32GB" }, { AzureEdition.Hyperscale, "0MB" }