updating with main

build/npm/dirs.js

@@ -56,6 +56,7 @@ const dirs = [
 	'extensions/sql-database-projects',
 	'extensions/sql-migration',
 	'extensions/vscode-test-resolver',
+	'extensions/xml-language-features',
 	// {{SQL CARBON EDIT}} - End
 	'remote',
 	'remote/web',

extensions/azurecore/package.json

@@ -5,6 +5,7 @@
   "version": "0.1.0",
   "publisher": "Microsoft",
   "preview": true,
+  "aiKey": "29a207bb14f84905966a8f22524cb730-25407f35-11b6-4d4e-8114-ab9e843cb52f-7380",
   "engines": {
     "vscode": "^1.30.1",
     "azdata": "*"

extensions/azuremonitor/package.json

@@ -209,7 +209,7 @@
     "update-grammar": "node ../../build/npm/update-grammar.js Microsoft/vscode-azuremonitor ./syntaxes/azuremonitor.tmLanguage"
   },
   "dependencies": {
-    "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#1.3.6",
+    "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#1.3.7",
     "figures": "^2.0.0",
     "find-remove": "1.2.1",
     "@microsoft/ads-service-downloader": "^1.2.1",

extensions/azuremonitor/yarn.lock

@@ -75,9 +75,9 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-"dataprotocol-client@github:Microsoft/sqlops-dataprotocolclient#1.3.6":
-  version "1.3.6"
-  resolved "https://codeload.github.com/Microsoft/sqlops-dataprotocolclient/tar.gz/fdd415fd7c79c5c889f192a9122ba41dca66b35b"
+"dataprotocol-client@github:Microsoft/sqlops-dataprotocolclient#1.3.7":
+  version "1.3.7"
+  resolved "https://codeload.github.com/Microsoft/sqlops-dataprotocolclient/tar.gz/0f07d03394eeebc2924971746470ac8224348fa4"
   dependencies:
     vscode-languageclient "5.2.1"
 

extensions/data-workspace/src/common/promise.ts

@@ -17,9 +17,9 @@ export class Deferred<T = void> {
 		});
 	}
 
-	then<TResult>(onfulfilled?: (value: T) => TResult | Thenable<TResult>, onrejected?: (reason: any) => TResult | Thenable<TResult>): Thenable<TResult>;
-	then<TResult>(onfulfilled?: (value: T) => TResult | Thenable<TResult>, onrejected?: (reason: any) => void): Thenable<TResult>;
-	then<TResult>(onfulfilled?: (value: T) => TResult | Thenable<TResult>, onrejected?: (reason: any) => TResult | Thenable<TResult>): Thenable<TResult> {
-		return this.promise.then(onfulfilled, onrejected);
+	then<TResult>(onFulfilled?: (value: T) => TResult | Thenable<TResult>, onRejected?: (reason: any) => TResult | Thenable<TResult>): Thenable<TResult>;
+	then<TResult>(onFulfilled?: (value: T) => TResult | Thenable<TResult>, onRejected?: (reason: any) => void): Thenable<TResult>;
+	then<TResult>(onFulfilled?: (value: T) => TResult | Thenable<TResult>, onRejected?: (reason: any) => TResult | Thenable<TResult>): Thenable<TResult> {
+		return this.promise.then(onFulfilled, onRejected);
 	}
 }

extensions/datavirtualization/package.json

@@ -107,7 +107,7 @@
   "dependencies": {
     "@microsoft/ads-extension-telemetry": "^3.0.1",
     "@microsoft/ads-service-downloader": "^1.2.1",
-    "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#1.3.6",
+    "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#1.3.7",
     "vscode-nls": "^5.2.0"
   },
   "devDependencies": {

extensions/datavirtualization/yarn.lock

@@ -497,9 +497,9 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
   integrity sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==
 
-"dataprotocol-client@github:Microsoft/sqlops-dataprotocolclient#1.3.6":
-  version "1.3.6"
-  resolved "https://codeload.github.com/Microsoft/sqlops-dataprotocolclient/tar.gz/fdd415fd7c79c5c889f192a9122ba41dca66b35b"
+"dataprotocol-client@github:Microsoft/sqlops-dataprotocolclient#1.3.7":
+  version "1.3.7"
+  resolved "https://codeload.github.com/Microsoft/sqlops-dataprotocolclient/tar.gz/0f07d03394eeebc2924971746470ac8224348fa4"
   dependencies:
     vscode-languageclient "5.2.1"
 

extensions/import/package.json

@@ -77,7 +77,7 @@
     }
   },
   "dependencies": {
-    "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#1.3.6",
+    "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#1.3.7",
     "htmlparser2": "^3.10.1",
     "@microsoft/ads-service-downloader": "^1.2.1",
     "@microsoft/ads-extension-telemetry": "^3.0.1",

extensions/import/src/test/utils.test.ts

@@ -78,7 +78,7 @@ export class TestQueryProvider implements azdata.QueryProvider {
 	saveResults(requestParams: azdata.SaveResultsRequestParams): Thenable<azdata.SaveResultRequestResult> {
 		throw new Error('Method not implemented.');
 	}
-	copyResults(requestParams: azdata.CopyResultsRequestParams): Thenable<void> {
+	copyResults(requestParams: azdata.CopyResultsRequestParams): Thenable<azdata.CopyResultsRequestResult> {
 		throw new Error('Method not implemented.');
 	}
 	setQueryExecutionOptions(ownerUri: string, options: azdata.QueryExecutionOptions): Thenable<void> {

extensions/import/yarn.lock

@@ -572,9 +572,9 @@ crypt@~0.0.1:
   resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
   integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=
 
-"dataprotocol-client@github:Microsoft/sqlops-dataprotocolclient#1.3.6":
-  version "1.3.6"
-  resolved "https://codeload.github.com/Microsoft/sqlops-dataprotocolclient/tar.gz/fdd415fd7c79c5c889f192a9122ba41dca66b35b"
+"dataprotocol-client@github:Microsoft/sqlops-dataprotocolclient#1.3.7":
+  version "1.3.7"
+  resolved "https://codeload.github.com/Microsoft/sqlops-dataprotocolclient/tar.gz/0f07d03394eeebc2924971746470ac8224348fa4"
   dependencies:
     vscode-languageclient "5.2.1"
 

extensions/kusto/package.json

@@ -427,7 +427,7 @@
     }
   },
   "dependencies": {
-    "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#1.3.6",
+    "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#1.3.7",
     "figures": "^2.0.0",
     "find-remove": "1.2.1",
     "@microsoft/ads-service-downloader": "^1.2.1",

extensions/kusto/yarn.lock

@@ -124,9 +124,9 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-"dataprotocol-client@github:Microsoft/sqlops-dataprotocolclient#1.3.6":
-  version "1.3.6"
-  resolved "https://codeload.github.com/Microsoft/sqlops-dataprotocolclient/tar.gz/fdd415fd7c79c5c889f192a9122ba41dca66b35b"
+"dataprotocol-client@github:Microsoft/sqlops-dataprotocolclient#1.3.7":
+  version "1.3.7"
+  resolved "https://codeload.github.com/Microsoft/sqlops-dataprotocolclient/tar.gz/0f07d03394eeebc2924971746470ac8224348fa4"
   dependencies:
     vscode-languageclient "5.2.1"
 

extensions/mssql/config.json

@@ -1,6 +1,6 @@
 {
 	"downloadUrl": "https://github.com/Microsoft/sqltoolsservice/releases/download/{#version#}/microsoft.sqltools.servicelayer-{#fileName#}",
-	"version": "4.9.0.25",
+	"version": "4.9.0.37",
 	"downloadFileNames": {
 		"Windows_86": "win-x86-net7.0.zip",
 		"Windows_64": "win-x64-net7.0.zip",

extensions/mssql/package.json

@@ -31,10 +31,6 @@
       }
     ],
     "commands": [
-      {
-        "command": "objectExplorer.scriptAsAlter",
-        "title": "Script as Alter"
-      },
       {
         "command": "mssql.exportSqlAsNotebook",
         "title": "%mssql.exportSqlAsNotebook%"
@@ -117,6 +113,11 @@
         "category": "MSSQL",
         "title": "%title.detachDatabase%"
       },
+      {
+        "command": "mssql.attachDatabase",
+        "category": "MSSQL",
+        "title": "%title.attachDatabase%"
+      },
       {
         "command": "mssql.enableGroupBySchema",
         "category": "MSSQL",
@@ -152,6 +153,10 @@
           "dark": "resources/dark/groupBySchemaDisabled_inverse.svg",
           "light": "resources/light/groupBySchemaDisabled.svg"
         }
+      },
+      {
+        "command": "mssql.clearPooledConnections",
+        "title": "%mssql.connection.clearPooledConnections%"
       }
     ],
     "outputChannels": [
@@ -525,14 +530,13 @@
         {
           "command": "mssql.detachDatabase",
           "when": "false"
+        },
+        {
+          "command": "mssql.attachDatabase",
+          "when": "false"
         }
       ],
       "objectExplorer/item/context": [
-        {
-          "command": "objectExplorer.scriptAsAlter",
-          "when": "nodeType == Table",
-          "group": "0_query@5"
-        },
         {
           "command": "mssql.designTable",
           "when": "connectionProvider == MSSQL && nodeType == Table && nodeSubType != LedgerDropped",
@@ -579,6 +583,11 @@
           "when": "connectionProvider == MSSQL && nodeType == Database && !isCloud && !(nodePath =~ /^.*\\/System Databases\\/.*$/) && config.workbench.enablePreviewFeatures && (productQualityType =~ /^(insider|dev)$/ || isDevelopment)",
           "group": "1_objectManagement@2"
         },
+        {
+          "command": "mssql.attachDatabase",
+          "when": "connectionProvider == MSSQL && nodeType == Folder && objectType == Databases && !isCloud && config.workbench.enablePreviewFeatures",
+          "group": "1_objectManagement@2"
+        },
         {
           "command": "mssql.dropDatabase",
           "when": "connectionProvider == MSSQL && nodeType == Database && !(nodePath =~ /^.*\\/System Databases\\/.*$/) && config.workbench.enablePreviewFeatures",
@@ -1558,7 +1567,7 @@
   "dependencies": {
     "@microsoft/ads-extension-telemetry": "^3.0.1",
     "@microsoft/ads-service-downloader": "^1.2.1",
-    "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#1.3.6",
+    "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#1.3.7",
     "find-remove": "1.2.1",
     "vscode-languageclient": "5.2.1",
     "vscode-nls": "^4.0.0"

extensions/mssql/package.nls.json

@@ -84,7 +84,7 @@
 	"mssql.connectionOptions.connectionName.description": "Custom name of the connection",
 	"mssql.connectionOptions.serverName.displayName": "Server",
 	"mssql.connectionOptions.serverName.description": "Name of the SQL Server instance",
-	"mssql.connectionOptions.serverName.placeholder": "e.g. tcp:servername,1433",
+	"mssql.connectionOptions.serverName.placeholder": "e.g. servername,port",
 	"mssql.connectionOptions.databaseName.displayName": "Database",
 	"mssql.connectionOptions.databaseName.description": "The name of the initial catalog or database int the data source",
 	"mssql.connectionOptions.authType.displayName": "Authentication type",
@@ -174,9 +174,10 @@
 	"title.newTable": "New Table",
 	"title.designTable": "Design",
 	"title.changeNotebookConnection": "Change SQL Notebook Connection",
+	"mssql.connection.clearPooledConnections": "SQL Server: Clear Pooled Connections",
 	"mssql.parallelMessageProcessing": "[Experimental] Whether the requests to the SQL Tools Service should be handled in parallel. This is introduced to discover the issues there might be when handling all requests in parallel. The default value is false. Azure Data Studio is required to be relaunched when the value is changed.",
 	"mssql.enableSqlAuthenticationProvider": "Enables use of the Sql Authentication Provider for 'Active Directory Interactive' authentication mode when user selects 'AzureMFA' authentication. This enables Server-side resource endpoint integration when fetching access tokens. This option is only supported for 'MSAL' Azure Authentication Library. Azure Data Studio is required to be relaunched when the value is changed.",
-	"mssql.enableConnectionPooling": "Enables connection pooling on MSSQL connections to improve overall performance of Azure Data Studio connectivity. This setting is enabled by default. Azure Data Studio is required to be relaunched when the value is changed.",
+	"mssql.enableConnectionPooling": "Enables connection pooling on MSSQL connections to improve overall performance of Azure Data Studio connectivity. This setting is enabled by default. Azure Data Studio is required to be relaunched when the value is changed. To clear pooled connections, run the command: 'SQL Server: Clear Pooled Connections'",
 	"mssql.tableDesigner.preloadDatabaseModel": "Whether to preload the database model when the database node in the object explorer is expanded. When enabled, the loading time of table designer can be reduced. Note: You might see higher than normal memory usage if you need to expand a lot of database nodes.",
 	"mssql.tableDesigner.allowDisableAndReenableDdlTriggers": "Whether to allow table designer to disable and re-enable DDL triggers during publish",
 	"mssql.objectExplorer.groupBySchema": "When enabled, the database objects in Object Explorer will be categorized by schema.",
@@ -190,5 +191,6 @@
 	"title.objectProperties": "Properties (Preview)",
 	"title.dropObject": "Drop (Preview)",
 	"title.renameObject": "Rename (Preview)",
-	"title.detachDatabase": "Detach (Preview)"
+	"title.detachDatabase": "Detach (Preview)",
+	"title.attachDatabase": "Attach (Preview)"
 }

extensions/mssql/src/connection/commands.ts

@@ -0,0 +1,19 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { AppContext } from '../appContext';
+import * as vscode from 'vscode';
+import * as constants from './constants';
+import { ConnectionService } from './connectionService';
+
+export function registerConnectionCommands(appContext: AppContext) {
+	appContext.extensionContext.subscriptions.push(vscode.commands.registerCommand('mssql.clearPooledConnections', async () => {
+		await getConnectionService(appContext).clearPooledConnections();
+	}));
+}
+
+function getConnectionService(appContext: AppContext): ConnectionService {
+	return appContext.getService<ConnectionService>(constants.ConnectionService);
+}

extensions/mssql/src/connection/connectionService.ts

@@ -0,0 +1,33 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as constants from './constants';
+import * as contracts from '../contracts';
+
+import { BaseService, ISqlOpsFeature, SqlOpsDataClient } from 'dataprotocol-client';
+import { ClientCapabilities } from 'vscode-languageclient';
+import { AppContext } from '../appContext';
+
+export class ConnectionService extends BaseService {
+	public static asFeature(context: AppContext): ISqlOpsFeature {
+		return class extends ConnectionService {
+			constructor(client: SqlOpsDataClient) {
+				super(context, client);
+			}
+
+			fillClientCapabilities(_: ClientCapabilities): void { }
+			initialize(): void { }
+		};
+	}
+
+	private constructor(context: AppContext, client: SqlOpsDataClient) {
+		super(client);
+		context.registerService(constants.ConnectionService, this);
+	}
+
+	async clearPooledConnections(): Promise<void> {
+		return this.runWithErrorHandling(contracts.ClearPooledConnectionsRequest.type, {});
+	}
+}

extensions/mssql/src/connection/constants.ts

@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+export const ConnectionService = 'ConnectionService';

extensions/mssql/src/constants.ts

@@ -26,6 +26,7 @@ export const SqlAssessmentService = 'sqlAssessmentService';
 export const NotebookConvertService = 'notebookConvertService';
 export const AzureBlobService = 'azureBlobService';
 export const ObjectManagementService = 'objectManagementService';
+export const QueryStoreService = 'queryStoreService';
 
 // CONFIGURATION VALUES //////////////////////////////////////////////////////////
 export const configObjectExplorerGroupBySchemaFlagName = 'mssql.objectExplorer.groupBySchema';