Query Profiler database filter

extensions/mssql/AGENTS.md

@@ -65,6 +65,8 @@ yarn lint src/ test/
 
 #### Unit Tests
 
+See [test/unit/AGENTS.md](test/unit/AGENTS.md) for unit testing conventions and patterns.
+
 ```bash
 # Unit tests require VS Code download and cannot run in sandboxed environments
 # This is expected behavior - tests work in CI with proper VS Code setup

extensions/mssql/package.json

@@ -574,6 +574,11 @@
                     "when": "view == objectExplorer && viewItem =~ /\\btype=(disconnectedServer|Server)\\b/",
                     "group": "4_MSSQL_discoverAndProfile@2"
                 },
+                {
+                    "command": "mssql.profiler.launchFromDatabase",
+                    "when": "view == objectExplorer && viewItem =~ /\\btype=(Database)\\b/",
+                    "group": "1a_MSSQL_profiler@1"
+                },
                 {
                     "command": "mssql.schemaDesigner",
                     "when": "view === objectExplorer && viewItem =~ /\\btype=(Database|Server)\\b.*\\bsubType=(Database|DockerContainerDatabase)\\b/",
@@ -1447,6 +1452,11 @@
                 "title": "%mssql.profiler.launchFromObjectExplorer%",
                 "category": "MS SQL"
             },
+            {
+                "command": "mssql.profiler.launchFromDatabase",
+                "title": "%mssql.profiler.launchFromObjectExplorer%",
+                "category": "MS SQL"
+            },
             {
                 "command": "mssql.openAzureDataStudioMigration",
                 "title": "%mssql.openAzureDataStudioMigration%",

extensions/mssql/src/profiler/profilerConfigService.ts

@@ -20,6 +20,11 @@ import {
 import { defaultProfilerConfig } from "./profilerDefaultConfig";
 import { ProfilerSelectedEventDetails, ProfilerEventProperty } from "../sharedInterfaces/profiler";
 
+/**
+ * The canonical column/field name used for database-name filtering in profiler views.
+ */
+export const FIELD_DATABASE_NAME = "DatabaseName";
+
 /**
  * Service for managing profiler templates and view configurations.
  * Maps between views and sessions are computed at runtime from the templates'

extensions/mssql/src/profiler/profilerController.ts

@@ -20,6 +20,7 @@ import { Logger } from "../models/logger";
 import { Profiler as LocProfiler } from "../constants/locConstants";
 import * as Constants from "../constants/constants";
 import { TreeNodeInfo } from "../objectExplorer/nodes/treeNodeInfo";
+import { ObjectExplorerUtils } from "../objectExplorer/objectExplorerUtils";
 import { IConnectionProfile } from "../models/interfaces";
 import { getServerTypes, isAzureSqlDbCompatible } from "../models/connectionInfo";
 import { getErrorMessage, uuid } from "../utils/utils";
@@ -59,9 +60,11 @@ export class ProfilerController {
      * Launches the profiler UI with a provided connection profile (from Object Explorer).
      * This is the main entry point - profiler can only be launched via right-click context menu.
      * @param connectionProfile - The connection profile to use for profiling
+     * @param databaseScopeFilter - If provided, pre-populates a DatabaseName filter in the profiler UI
      */
     public async launchProfilerWithConnection(
         connectionProfile: IConnectionProfile,
+        databaseScopeFilter?: string,
     ): Promise<void> {
         this._logger.verbose(
             `Launching profiler with connection to ${connectionProfile.server}...`,
@@ -90,13 +93,23 @@ export class ProfilerController {
             // For Azure SQL and Fabric, we need to ensure a user database is selected
             let profileToUse = connectionProfile;
             if (isAzureOrFabric) {
-                const updatedProfile = await this.ensureAzureDatabaseSelected(connectionProfile);
+                // When launched from a Database node, pre-fill the database so
+                // the user is not prompted to select one again.
+                if (databaseScopeFilter) {
+                    profileToUse = { ...connectionProfile, database: databaseScopeFilter };
+                }
+
+                const updatedProfile = await this.ensureAzureDatabaseSelected(profileToUse);
                 if (!updatedProfile) {
                     // User cancelled database selection
                     this._logger.verbose("User cancelled database selection");
                     return;
                 }
                 profileToUse = updatedProfile;
+
+                // Azure sessions are already database-scoped via ON DATABASE,
+                // so skip the client-side DatabaseName filter entirely.
+                databaseScopeFilter = undefined;
             }
 
             // Generate a unique URI for this profiler connection
@@ -118,7 +131,7 @@ export class ProfilerController {
             this._profilerEngineTypes.set(profilerUri, this._currentEngineType);
 
             // Use the common setup method - pass engine type to avoid race condition
-            await this.setupProfilerUI(profilerUri, this._currentEngineType);
+            await this.setupProfilerUI(profilerUri, this._currentEngineType, databaseScopeFilter);
         } catch (e) {
             this._logger.error(`Error launching profiler: ${e}`);
             vscode.window.showErrorMessage(LocProfiler.failedToLaunchProfiler(getErrorMessage(e)));
@@ -245,6 +258,31 @@ export class ProfilerController {
             ),
         );
 
+        // Launch Profiler from a Database node in Object Explorer (pre-filters by database)
+        this._context.subscriptions.push(
+            vscode.commands.registerCommand(
+                "mssql.profiler.launchFromDatabase",
+                async (treeNodeInfo: TreeNodeInfo) => {
+                    try {
+                        const connectionProfile = treeNodeInfo.connectionProfile;
+                        // Use ObjectExplorerUtils.getDatabaseName to reliably get the database name.
+                        // connectionProfile.database is often empty for Database nodes because they
+                        // inherit the parent Server node's connection profile unchanged.
+                        const databaseName = ObjectExplorerUtils.getDatabaseName(treeNodeInfo);
+                        this._logger.verbose(
+                            `Launching profiler from database node: ${databaseName}`,
+                        );
+                        await this.launchProfilerWithConnection(connectionProfile, databaseName);
+                    } catch (e) {
+                        this._logger.error(`Command error: ${e}`);
+                        vscode.window.showErrorMessage(
+                            LocProfiler.failedToLaunchProfiler(getErrorMessage(e)),
+                        );
+                    }
+                },
+            ),
+        );
+
         // Open XEL File command
         this._context.subscriptions.push(
             vscode.commands.registerCommand("mssql.profiler.openXelFile", async () => {
@@ -524,8 +562,13 @@ export class ProfilerController {
      * and auto-starts profiling.
      * @param profilerUri - The URI of the established profiler connection
      * @param engineType - The engine type for filtering templates
+     * @param databaseScopeFilter - If provided, pre-populates a DatabaseName filter in the profiler UI
      */
-    private async setupProfilerUI(profilerUri: string, engineType: EngineType): Promise<void> {
+    private async setupProfilerUI(
+        profilerUri: string,
+        engineType: EngineType,
+        databaseScopeFilter?: string,
+    ): Promise<void> {
         this._profilerUri = profilerUri;
 
         // Step 1: Show template selection quick pick (filtered by engine type)
@@ -616,6 +659,11 @@ export class ProfilerController {
             selectedTemplate.template.id,
         );
 
+        // If launched from a database node, set the initial database filter
+        if (databaseScopeFilter) {
+            webviewController.setInitialDatabaseFilter(databaseScopeFilter);
+        }
+
         // Track this webview controller along with its profiler URI for cleanup
         const webviewId = uuid();
         const webviewProfilerUri = profilerUri; // Capture for cleanup