From 6873b42a6bda11c696ddb2fdffb65832f9182a83 Mon Sep 17 00:00:00 2001 From: Sai Avishkar Sreerama <74571829+ssreerama@users.noreply.github.com> Date: Mon, 11 Sep 2023 12:56:31 -0500 Subject: [PATCH] queryStore WaitStatistics options should be a dropdown #24372 (#2228) --- .../ObjectTypes/Database/DatabaseHandler.cs | 16 ++++++++-------- .../ObjectTypes/Database/DatabaseInfo.cs | 2 +- .../ObjectTypes/Database/DatabaseViewInfo.cs | 2 +- .../Utility/CommonConstants.cs | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectManagement/ObjectTypes/Database/DatabaseHandler.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectManagement/ObjectTypes/Database/DatabaseHandler.cs index 20dd1c2a..0c7b1439 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/ObjectManagement/ObjectTypes/Database/DatabaseHandler.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/ObjectManagement/ObjectTypes/Database/DatabaseHandler.cs @@ -59,7 +59,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectManagement internal static readonly string[] AzureEditionNames; internal static readonly string[] AzureBackupLevels; - internal static readonly string[] DscOnOffOptions; + internal static readonly string[] PropertiesOnOffOptions; internal static readonly string[] DscElevateOptions; internal static readonly string[] DscEnableDisableOptions; internal static readonly AzureEditionDetails[] AzureMaxSizes; @@ -125,13 +125,13 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectManagement displaySizeBasedCleanupMode.TryAdd(QueryStoreSizeBasedCleanupMode.Off, SR.queryStoreSizeBasedCleanupMode_Off); displaySizeBasedCleanupMode.TryAdd(QueryStoreSizeBasedCleanupMode.Auto, SR.queryStoreSizeBasedCleanupMode_Auto); - DscOnOffOptions = new[]{ - CommonConstants.DatabaseScopedConfigurations_Value_On, - CommonConstants.DatabaseScopedConfigurations_Value_Off + PropertiesOnOffOptions = new[]{ + CommonConstants.PropertiesDropdown_Value_On, + CommonConstants.PropertiesDropdown_Value_Off }; DscElevateOptions = new[]{ - CommonConstants.DatabaseScopedConfigurations_Value_Off, + CommonConstants.PropertiesDropdown_Value_Off, CommonConstants.DatabaseScopedConfigurations_Value_When_supported, CommonConstants.DatabaseScopedConfigurations_Value_Fail_Unsupported }; @@ -270,7 +270,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectManagement }; if (prototype is DatabasePrototype140) { - ((DatabaseInfo)databaseViewInfo.ObjectInfo).QueryStoreOptions!.WaitStatisticsCaptureMode = smoDatabase.QueryStoreOptions.WaitStatsCaptureMode == QueryStoreWaitStatsCaptureMode.On; + ((DatabaseInfo)databaseViewInfo.ObjectInfo).QueryStoreOptions!.WaitStatisticsCaptureMode = smoDatabase.QueryStoreOptions.WaitStatsCaptureMode.ToString(); }; if (prototype is DatabasePrototype150) { @@ -310,7 +310,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectManagement databaseScopedConfigurationsCollection = smoDatabase.IsSupportedObject() ? smoDatabase.DatabaseScopedConfigurations : null; databaseViewInfo.FileTypesOptions = displayFileTypes.Values.ToArray(); } - databaseViewInfo.DscOnOffOptions = DscOnOffOptions; + databaseViewInfo.PropertiesOnOffOptions = PropertiesOnOffOptions; databaseViewInfo.DscElevateOptions = DscElevateOptions; databaseViewInfo.DscEnableDisableOptions = DscEnableDisableOptions; databaseViewInfo.OperationModeOptions = displayOperationModeOptions.Values.ToArray(); @@ -804,7 +804,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectManagement db130.QueryStoreOptions.StaleQueryThresholdInDays = database.QueryStoreOptions.StaleQueryThresholdInDays; if (prototype is DatabasePrototype140 db140 && database.QueryStoreOptions.WaitStatisticsCaptureMode != null) { - db140.QueryStoreOptions.WaitStatsCaptureMode = (bool)database.QueryStoreOptions.WaitStatisticsCaptureMode ? QueryStoreWaitStatsCaptureMode.On : QueryStoreWaitStatsCaptureMode.Off; + db140.QueryStoreOptions.WaitStatsCaptureMode = database.QueryStoreOptions.WaitStatisticsCaptureMode == CommonConstants.PropertiesDropdown_Value_On ? QueryStoreWaitStatsCaptureMode.On : QueryStoreWaitStatsCaptureMode.Off; } if (prototype is DatabasePrototype150 db150 && database.QueryStoreOptions.QueryStoreCaptureMode == SR.querystorecapturemode_custom diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectManagement/ObjectTypes/Database/DatabaseInfo.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectManagement/ObjectTypes/Database/DatabaseInfo.cs index cb37316e..cc4b9e92 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/ObjectManagement/ObjectTypes/Database/DatabaseInfo.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/ObjectManagement/ObjectTypes/Database/DatabaseInfo.cs @@ -91,7 +91,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectManagement public string QueryStoreCaptureMode { get; set; } public string SizeBasedCleanupMode { get; set; } public long StaleQueryThresholdInDays { get; set; } - public bool? WaitStatisticsCaptureMode { get; set; } + public string? WaitStatisticsCaptureMode { get; set; } public QueryStoreCapturePolicyOptions? CapturePolicyOptions { get; set; } public long CurrentStorageSizeInMB { get; set; } } diff --git a/src/Microsoft.SqlTools.ServiceLayer/ObjectManagement/ObjectTypes/Database/DatabaseViewInfo.cs b/src/Microsoft.SqlTools.ServiceLayer/ObjectManagement/ObjectTypes/Database/DatabaseViewInfo.cs index 0a3be48e..04a6cf55 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/ObjectManagement/ObjectTypes/Database/DatabaseViewInfo.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/ObjectManagement/ObjectTypes/Database/DatabaseViewInfo.cs @@ -24,7 +24,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectManagement public AzureEditionDetails[] AzureMaxSizes { get; set; } public string[] PageVerifyOptions { get; set; } public string[] RestrictAccessOptions { get; set; } - public string[] DscOnOffOptions { get; set; } + public string[] PropertiesOnOffOptions { get; set; } public string[] DscElevateOptions { get; set; } public string[] DscEnableDisableOptions { get; set; } public string[] FileTypesOptions { get; set; } diff --git a/src/Microsoft.SqlTools.SqlCore/Utility/CommonConstants.cs b/src/Microsoft.SqlTools.SqlCore/Utility/CommonConstants.cs index d2f753d2..8468926f 100644 --- a/src/Microsoft.SqlTools.SqlCore/Utility/CommonConstants.cs +++ b/src/Microsoft.SqlTools.SqlCore/Utility/CommonConstants.cs @@ -18,8 +18,8 @@ namespace Microsoft.SqlTools.SqlCore.Utility public const string DefaultBatchSeperator = "GO"; // Database scoped configurations property values - public const string DatabaseScopedConfigurations_Value_On = "ON"; - public const string DatabaseScopedConfigurations_Value_Off = "OFF"; + public const string PropertiesDropdown_Value_On = "ON"; + public const string PropertiesDropdown_Value_Off = "OFF"; public const string DatabaseScopedConfigurations_Value_Primary = "PRIMARY"; public const string DatabaseScopedConfigurations_Value_When_supported = "WHEN_SUPPORTED"; public const string DatabaseScopedConfigurations_Value_Fail_Unsupported = "FAIL_UNSUPPORTED";