Merge bcf58e8 into 0f52dfb

microsoft · Jan 28, 2020 · 3caa561 · 3caa561
2 parents 0f52dfb + bcf58e8
commit 3caa561
Show file tree

Hide file tree

Showing 20 changed files with 855 additions and 180 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -36,13 +36,21 @@ gulp.task('ext:lint', () => {
 });
 
 // Copy icons for OE
-gulp.task('ext:copy-assets', (done) => {
+gulp.task('ext:copy-OE-assets', (done) => {
     return gulp.src([
         config.paths.project.root + '/src/objectExplorer/objectTypes/*'
     ])
     .pipe(gulp.dest('out/src/objectExplorer/objectTypes'));
 });
 
+// Copy icons for Query History
+gulp.task('ext:copy-queryHistory-assets', (done) => {
+    return gulp.src([
+        config.paths.project.root + '/src/queryHistory/icons/*'
+    ])
+    .pipe(gulp.dest('out/src/queryHistory/icons'));
+});
+
 // Compile source
 gulp.task('ext:compile-src', (done) => {
     return gulp.src([
@@ -208,7 +216,7 @@ gulp.task('ext:compile-tests', (done) => {
 
 });
 
-gulp.task('ext:compile', gulp.series('ext:compile-src', 'ext:compile-tests', 'ext:copy-assets'));
+gulp.task('ext:compile', gulp.series('ext:compile-src', 'ext:compile-tests', 'ext:copy-OE-assets', 'ext:copy-queryHistory-assets'));
 
 gulp.task('ext:copy-tests', () => {
     return gulp.src(config.paths.project.root + '/test/resources/**/*')

diff --git a/images/start.svg b/images/start.svg
diff --git a/images/start_inverse.svg b/images/start_inverse.svg
diff --git a/images/stop.svg b/images/stop.svg
diff --git a/images/stop_inverse.svg b/images/stop_inverse.svg
diff --git a/localization/xliff/enu/constants/localizedConstants.enu.xlf b/localization/xliff/enu/constants/localizedConstants.enu.xlf
@@ -251,9 +251,24 @@
         <trans-unit id="msgPromptFirewallRuleCreated">
             <source xml:lang="en">Firewall rule successfully created.</source>
         </trans-unit>
+        <trans-unit id="msgChooseQueryHistoryListing">
+            <source xml:lang="en">Choose Query History</source>
+        </trans-unit>
+        <trans-unit id="msgChooseQueryHistoryAction">
+            <source xml:lang="en">Choose An Action</source>
+        </trans-unit>
+        <trans-unit id="msgOpenQueryHistoryListing">
+            <source xml:lang="en">Open Query History</source>
+        </trans-unit>
+        <trans-unit id="msgRunQueryHistoryListing">
+            <source xml:lang="en">Run Query History</source>
+        </trans-unit>
         <trans-unit id="msgInvalidIpAddress">
             <source xml:lang="en">Invalid IP Address </source>
         </trans-unit>
+        <trans-unit id="msgNoQueriesAvailable">
+            <source xml:lang="en">No Queries Available</source>
+        </trans-unit>
         <trans-unit id="retryLabel">
             <source xml:lang="en">Retry</source>
         </trans-unit>

diff --git a/package.json b/package.json
@@ -151,6 +151,11 @@
         {
           "id": "objectExplorer",
           "name": "%extension.connections%"
+        },
+        {
+          "id": "queryHistory",
+          "name": "%extension.queryHistory%",
+          "when": "config.mssql.enableQueryHistoryFeature"
         }
       ]
     },
@@ -204,6 +209,24 @@
           "when": "view == objectExplorer",
           "title": "%mssql.addObjectExplorer%",
           "group": "navigation"
+        },
+        {
+          "command": "mssql.startQueryHistoryCapture",
+          "when": "view == queryHistory && config.mssql.enableQueryHistoryFeature && !config.mssql.enableQueryHistoryCapture",
+          "title": "%mssql.startQueryHistoryCapture%",
+          "group": "navigation"
+        },
+        {
+          "command": "mssql.pauseQueryHistoryCapture",
+          "when": "view == queryHistory && config.mssql.enableQueryHistoryFeature && config.mssql.enableQueryHistoryCapture",
+          "title": "%mssql.pauseQueryHistoryCapture%",
+          "group": "navigation"
+        },
+        {
+          "command": "mssql.clearAllQueryHistory",
+          "when": "view == queryHistory",
+          "title": "%mssql.clearAllQueryHistory%",
+          "group": "secondary"
         }
       ],
       "view/item/context": [
@@ -251,6 +274,21 @@
           "command": "mssql.scriptAlter",
           "when": "view == objectExplorer && viewItem =~ /^(AggregateFunction|PartitionFunction|ScalarValuedFunction|StoredProcedure|TableValuedFunction|View)$/",
           "group": "MS_SQL@4"
+        },
+        {
+          "command": "mssql.openQueryHistory",
+          "when": "view == queryHistory && viewItem == queryHistoryNode",
+          "group": "MS_SQL@1"
+        },
+        {
+          "command": "mssql.runQueryHistory",
+          "when": "view == queryHistory && viewItem == queryHistoryNode",
+          "group": "MS_SQL@2"
+        },
+        {
+          "command": "mssql.deleteQueryHistory",
+          "when": "view == queryHistory && viewItem == queryHistoryNode",
+          "group": "MS_SQL@3"
         }
       ],
       "commandPalette": [
@@ -293,6 +331,14 @@
         {
           "command": "mssql.toggleSqlCmd",
           "when": "editorFocus && editorLangId == 'sql'"
+        },
+        {
+          "command": "mssql.startQueryHistoryCapture",
+          "when": "config.mssql.enableQueryHistoryFeature && !config.mssql.enableQueryHistoryCapture"
+        },
+        {
+          "command": "mssql.pauseQueryHistoryCapture",
+          "when": "config.mssql.enableQueryHistoryFeature && config.mssql.enableQueryHistoryCapture"
         }
       ]
     },
@@ -303,7 +349,7 @@
         "category": "MS SQL",
         "icon": {
           "light": "images/start.svg",
-          "dark": "images/start_inverse.svg"
+          "dark": "images/start.svg"
         }
       },
       {
@@ -317,7 +363,7 @@
         "category": "MS SQL",
         "icon": {
           "light": "images/stop.svg",
-          "dark": "images/stop_inverse.svg"
+          "dark": "images/stop.svg"
         }
       },
       {
@@ -418,6 +464,49 @@
         "command": "mssql.scriptAlter",
         "title": "%mssql.scriptAlter%",
         "group": "MS SQL"
+      },
+      {
+        "command": "mssql.openQueryHistory",
+        "title": "%mssql.openQueryHistory%",
+        "group": "MS SQL"
+      },
+      {
+        "command": "mssql.runQueryHistory",
+        "title": "%mssql.runQueryHistory%",
+        "group": "MS SQL"
+      },
+      {
+        "command": "mssql.deleteQueryHistory",
+        "title": "%mssql.deleteQueryHistory%",
+        "group": "MS SQL"
+      },
+      {
+        "command": "mssql.clearAllQueryHistory",
+        "title": "%mssql.clearAllQueryHistory%",
+        "group": "MS SQL"
+      },
+      {
+        "command": "mssql.startQueryHistoryCapture",
+        "title": "%mssql.startQueryHistoryCapture%",
+        "group": "MS SQL",
+        "icon": {
+          "light": "images/start.svg",
+          "dark": "images/start.svg"
+        }
+      },
+      {
+        "command": "mssql.pauseQueryHistoryCapture",
+        "title": "%mssql.pauseQueryHistoryCapture%",
+        "group": "MS SQL",
+        "icon": {
+          "light": "images/stop.svg",
+          "dark": "images/stop.svg"
+        }
+      },
+      {
+        "command": "mssql.commandPaletteQueryHistory",
+        "title": "%mssql.commandPaletteQueryHistory%",
+        "group": "MS SQL"
       }
     ],
     "keybindings": [
@@ -826,6 +915,24 @@
           "default": false,
           "description": "%mssql.persistQueryResultTabs%",
           "scope": "window"
+        },
+        "mssql.queryHistoryLimit": {
+          "type": "number",
+          "default": 20,
+          "description": "%mssql.queryHistoryLimit%",
+          "scope": "window"
+        },
+        "mssql.enableQueryHistoryCapture": {
+          "type": "boolean",
+          "default": true,
+          "description": "%mssql.enableQueryHistoryCapture%",
+          "scope": "window"
+        },
+        "mssql.enableQueryHistoryFeature": {
+          "type": "boolean",
+          "default": true,
+          "description" : "%mssql.enableQueryHistoryFeature%",
+          "scope": "window"
         }
       }
     }

diff --git a/package.nls.json b/package.nls.json
@@ -8,9 +8,18 @@
 "mssql.scriptDelete":"Script as Drop",
 "mssql.scriptExecute":"Script as Execute",
 "mssql.scriptAlter":"Script as Alter",
+"mssql.openQueryHistory":"Open Query",
+"mssql.runQueryHistory":"Run Query",
+"mssql.deleteQueryHistory":"Delete",
+"mssql.clearAllQueryHistory":"Clear All History",
+"mssql.enableQueryHistoryCapture":"Enable Query History Capture",
+"mssql.startQueryHistoryCapture":"Start Query History Capture",
+"mssql.pauseQueryHistoryCapture":"Pause Query History Capture",
+"mssql.commandPaletteQueryHistory":"Open Query History in Command Palette",
 "mssql.removeObjectExplorerNode":"Remove",
 "mssql.refreshObjectExplorerNode":"Refresh",
 "extension.connections":"Connections",
+"extension.queryHistory":"Query History",
 "mssql.connect":"Connect",
 "mssql.disconnect":"Disconnect",
 "mssql.manageProfiles":"Manage Connection Profiles",
@@ -79,6 +88,8 @@
 "mssql.intelliSense.enableErrorChecking":"Should IntelliSense error checking be enabled",
 "mssql.intelliSense.enableSuggestions":"Should IntelliSense suggestions be enabled",
 "mssql.intelliSense.enableQuickInfo":"Should IntelliSense quick info be enabled",
+"mssql.enableQueryHistoryFeature":"Should Query History feature be enabled",
 "mssql.intelliSense.lowerCaseSuggestions":"Should IntelliSense suggestions be lowercase",
-"mssql.persistQueryResultTabs":"Should query result selections and scroll positions be saved when switching tabs (may impact performance)"
+"mssql.persistQueryResultTabs":"Should query result selections and scroll positions be saved when switching tabs (may impact performance)",
+"mssql.queryHistoryLimit":"Number of query history entries to show in the Query History view"
 }
diff --git a/src/constants/constants.ts b/src/constants/constants.ts
@@ -9,6 +9,8 @@ export const extensionName = 'mssql';
 export const extensionConfigSectionName = 'mssql';
 export const mssqlProviderName = 'MSSQL';
 export const noneProviderName = 'None';
+export const objectExplorerId = 'objectExplorer';
+export const queryHistory = 'queryHistory';
 export const connectionApplicationName = 'vscode-mssql';
 export const outputChannelName = 'MSSQL';
 export const connectionConfigFilename = 'settings.json';
@@ -24,6 +26,14 @@ export const cmdChooseDatabase = 'mssql.chooseDatabase';
 export const cmdChooseLanguageFlavor = 'mssql.chooseLanguageFlavor';
 export const cmdShowReleaseNotes = 'mssql.showReleaseNotes';
 export const cmdShowGettingStarted = 'mssql.showGettingStarted';
+export const cmdRefreshQueryHistory = 'mssql.refreshQueryHistory';
+export const cmdClearAllQueryHistory = 'mssql.clearAllQueryHistory';
+export const cmdDeleteQueryHistory = 'mssql.deleteQueryHistory';
+export const cmdOpenQueryHistory = 'mssql.openQueryHistory';
+export const cmdRunQueryHistory = 'mssql.runQueryHistory';
+export const cmdStartQueryHistory = 'mssql.startQueryHistoryCapture';
+export const cmdPauseQueryHistory = 'mssql.pauseQueryHistoryCapture';
+export const cmdCommandPaletteQueryHistory = 'mssql.commandPaletteQueryHistory';
 export const cmdNewQuery = 'mssql.newQuery';
 export const cmdManageConnectionProfiles = 'mssql.manageProfiles';
 export const cmdRebuildIntelliSenseCache = 'mssql.rebuildIntelliSenseCache';
@@ -107,6 +117,9 @@ export const sqlToolsServiceDownloadUrlConfigKey = 'downloadUrl';
 export const extConfigResultFontFamily = 'resultsFontFamily';
 export const configApplyLocalization = 'applyLocalization';
 export const configPersistQueryResultTabs = 'persistQueryResultTabs';
+export const configQueryHistoryLimit = 'queryHistoryLimit';
+export const configEnableQueryHistoryCapture = 'enableQueryHistoryCapture';
+export const configEnableQueryHistoryFeature = 'enableQueryHistoryFeature';
 
 // ToolsService Constants
 export const serviceInstallingTo = 'Installing SQL tools service to';