diff --git a/localization/xliff/vscode-mssql.xlf b/localization/xliff/vscode-mssql.xlf index 432c59184f..3c4dc2098d 100644 --- a/localization/xliff/vscode-mssql.xlf +++ b/localization/xliff/vscode-mssql.xlf @@ -1954,7 +1954,7 @@ [Optional] Specify the length of time in seconds to wait for a command to execute before terminating the attempt and generating an error. The default value is 30 seconds. - [Optional] Specify the length of time in seconds to wait for a connection to the server before terminating connection attempt and generating an error. The default value is 15 seconds for on-premise and 30 seconds for Azure SQL Database connections. + [Optional] Specify the length of time in seconds to wait for a connection to the server before terminating connection attempt and generating an error. The default value is 30 seconds. [Optional] Specify the maximum number of connections allowed in the pool. diff --git a/package.json b/package.json index 8346502934..b378f4afa1 100644 --- a/package.json +++ b/package.json @@ -1087,7 +1087,7 @@ }, "connectTimeout": { "type": "number", - "default": 15, + "default": 30, "description": "%mssql.connection.connectTimeout%" }, "commandTimeout": { diff --git a/package.nls.json b/package.nls.json index 4bf03bd765..3436551e79 100644 --- a/package.nls.json +++ b/package.nls.json @@ -56,7 +56,7 @@ "mssql.connection.trustServerCertificate":"[Optional] When set to 'true', the SQL Server SSL certificate is automatically trusted when the communication layer is encrypted using SSL. Set 'false' for Azure SQL Database connection.", "mssql.connection.hostNameInCertificate":"[Optional] When specified (and encrypt=Mandatory and trustServerCertificate=false), SQL Server uses provided hostname for validating trust with the server certificate.", "mssql.connection.persistSecurityInfo":"[Optional] When set to false, security-sensitive information, such as the password, is not returned as part of the connection if the connection is open or has ever been in an open state.", -"mssql.connection.connectTimeout":"[Optional] Specify the length of time in seconds to wait for a connection to the server before terminating connection attempt and generating an error. The default value is 15 seconds for on-premise and 30 seconds for Azure SQL Database connections.", +"mssql.connection.connectTimeout":"[Optional] Specify the length of time in seconds to wait for a connection to the server before terminating connection attempt and generating an error. The default value is 30 seconds.", "mssql.connection.commandTimeout":"[Optional] Specify the length of time in seconds to wait for a command to execute before terminating the attempt and generating an error. The default value is 30 seconds.", "mssql.connection.connectRetryCount":"[Optional] Specify the number of attempts to restore connection.", "mssql.connection.connectRetryInterval":"[Optional] Specify the delay between attempts to restore connection.", diff --git a/src/connectionconfig/connectionDialogWebviewController.ts b/src/connectionconfig/connectionDialogWebviewController.ts index 88742d3873..662522c841 100644 --- a/src/connectionconfig/connectionDialogWebviewController.ts +++ b/src/connectionconfig/connectionDialogWebviewController.ts @@ -894,7 +894,7 @@ export class ConnectionDialogWebviewController extends ReactWebviewPanelControll private async loadEmptyConnection() { const emptyConnection = { authenticationType: AuthenticationType.SqlLogin, - connectTimeout: 15, // seconds + connectTimeout: 30, // seconds applicationName: "vscode-mssql", } as IConnectionDialogProfile; this.state.connectionProfile = emptyConnection;