From f2f3d1c4ef1ef7794e3d98be1855da812d6928e7 Mon Sep 17 00:00:00 2001 From: Cheena Malhotra <13396919+cheenamalhotra@users.noreply.github.com> Date: Thu, 26 Jan 2023 13:50:21 -0800 Subject: [PATCH] Introduce 'Command Timeout' option for MSSQL connections (#21734) --- extensions/cms/package.json | 14 ++++++++++++++ extensions/cms/package.nls.json | 2 ++ extensions/mssql/package.json | 14 ++++++++++++++ extensions/mssql/package.nls.json | 2 ++ resources/xlf/en/cms.xlf | 6 ++++++ resources/xlf/en/mssql.xlf | 6 ++++++ 6 files changed, 44 insertions(+) diff --git a/extensions/cms/package.json b/extensions/cms/package.json index 4b3fed45d8..4007f4650f 100644 --- a/extensions/cms/package.json +++ b/extensions/cms/package.json @@ -179,6 +179,20 @@ "isRequired": false, "isArray": false }, + { + "specialValueType": null, + "isIdentity": false, + "name": "commandTimeout", + "displayName": "%cms.connectionOptions.commandTimeout.displayName%", + "description": "%cms.connectionOptions.commandTimeout.description%", + "groupName": "%cms.connectionOptions.groupName.initialization%", + "valueType": "number", + "defaultValue": "30", + "objectType": null, + "categoryValues": null, + "isRequired": false, + "isArray": false + }, { "specialValueType": null, "isIdentity": false, diff --git a/extensions/cms/package.nls.json b/extensions/cms/package.nls.json index 56dc5a601b..cc04169dd9 100644 --- a/extensions/cms/package.nls.json +++ b/extensions/cms/package.nls.json @@ -62,6 +62,8 @@ "cms.connectionOptions.applicationIntent.description": "Declares the application workload type when connecting to a server", "cms.connectionOptions.connectTimeout.displayName": "Connect timeout", "cms.connectionOptions.connectTimeout.description": "The length of time (in seconds) to wait for a connection to the server before terminating the attempt and generating an error", + "cms.connectionOptions.commandTimeout.displayName": "Command timeout", + "cms.connectionOptions.commandTimeout.description": "The length of time (in seconds) to wait for a command to execute before terminating the attempt and generating an error", "cms.connectionOptions.currentLanguage.displayName": "Current language", "cms.connectionOptions.currentLanguage.description": "The SQL Server language record name", "cms.connectionOptions.columnEncryptionSetting.displayName": "Column encryption", diff --git a/extensions/mssql/package.json b/extensions/mssql/package.json index 3523735ee6..0b44f17302 100644 --- a/extensions/mssql/package.json +++ b/extensions/mssql/package.json @@ -746,6 +746,20 @@ "isRequired": false, "isArray": false }, + { + "specialValueType": null, + "isIdentity": false, + "name": "commandTimeout", + "displayName": "%mssql.connectionOptions.commandTimeout.displayName%", + "description": "%mssql.connectionOptions.commandTimeout.description%", + "groupName": "%mssql.connectionOptions.groupName.initialization%", + "valueType": "number", + "defaultValue": "30", + "objectType": null, + "categoryValues": null, + "isRequired": false, + "isArray": false + }, { "specialValueType": null, "isIdentity": false, diff --git a/extensions/mssql/package.nls.json b/extensions/mssql/package.nls.json index 8d1f15063f..557522e261 100644 --- a/extensions/mssql/package.nls.json +++ b/extensions/mssql/package.nls.json @@ -105,6 +105,8 @@ "mssql.connectionOptions.applicationIntent.description": "Declares the application workload type when connecting to a server", "mssql.connectionOptions.connectTimeout.displayName": "Connect timeout", "mssql.connectionOptions.connectTimeout.description": "The length of time (in seconds) to wait for a connection to the server before terminating the attempt and generating an error", + "mssql.connectionOptions.commandTimeout.displayName": "Command timeout", + "mssql.connectionOptions.commandTimeout.description": "The length of time (in seconds) to wait for a command to execute before terminating the attempt and generating an error", "mssql.connectionOptions.currentLanguage.displayName": "Current language", "mssql.connectionOptions.currentLanguage.description": "The SQL Server language record name", "mssql.connectionOptions.columnEncryptionSetting.displayName": "Always Encrypted", diff --git a/resources/xlf/en/cms.xlf b/resources/xlf/en/cms.xlf index 11334eac6f..85909b700c 100644 --- a/resources/xlf/en/cms.xlf +++ b/resources/xlf/en/cms.xlf @@ -143,6 +143,12 @@ Connect timeout + + The length of time (in seconds) to wait for a command to execute before terminating the attempt and generating an error + + + Command timeout + Custom name of the connection diff --git a/resources/xlf/en/mssql.xlf b/resources/xlf/en/mssql.xlf index e8211de6d2..9b15a9d15a 100644 --- a/resources/xlf/en/mssql.xlf +++ b/resources/xlf/en/mssql.xlf @@ -208,6 +208,12 @@ Connect timeout + + The length of time (in seconds) to wait for a command to execute before terminating the attempt and generating an error + + + Command timeout + Custom name of the connection