Merge branch 'master' into patch-1

mtxr · May 6, 2020 · a7711b9 · a7711b9
2 parents ef162c4 + 640dc89
commit a7711b9
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 7 deletions.
diff --git a/packages/plugins/connection-manager/extension.ts b/packages/plugins/connection-manager/extension.ts
@@ -686,6 +686,7 @@ export default class ConnectionManagerPlugin implements IExtensionPlugin {
         this.changeTextEditorHandler(window.activeTextEditor);
       }, 5000);
     }
+    this.explorer.updateTreeRoot();
   }
 
   constructor(extension: IExtension) {

diff --git a/packages/ui/screens/Results/QueryResult.tsx b/packages/ui/screens/Results/QueryResult.tsx
@@ -3,6 +3,7 @@ import ResultsTable from './ResultsTable';
 import { Drawer, List, ListSubheader, ListItem, ListItemText, Button } from '@material-ui/core';
 import Syntax from '../../components/Syntax';
 import { NSDatabase } from '@sqltools/types';
+import getVscode from '../../lib/vscode';
 
 const QueryResults = ({ cols = [], error, query, messages = [], results = [], connId, pageSize = 50, page, total }: NSDatabase.IResult) => {
   const [showMessages, setShowMessages] = useState(!!(error || (results.length === 0 && messages.length > 0)));
@@ -23,15 +24,32 @@ const QueryResults = ({ cols = [], error, query, messages = [], results = [], co
         pageSize={showPagination ? pageSize : 0}
         error={error}
         openDrawerButton={
-          <Button
-            onClick={() => setShowMessages(!showMessages)}
-            className={'action-button' + (showMessages ? 'active' : '')}
-          >
-            Query Details
-          </Button>
+          <div>
+            <Button
+              onClick={() => setShowMessages(!showMessages)}
+              className={'action-button' + (showMessages ? 'active' : '')}
+            >
+              Query Details
+            </Button> &nbsp;
+            <Button
+              onClick={() => {
+                getVscode().postMessage({
+                  action: 'call',
+                  payload: {
+                    command: `${process.env.EXT_NAME}.executeQuery`,
+                    args: [query, connId],
+                  },
+                });
+              }}
+              className={'action-button' + (showMessages ? 'active' : '')}
+            >
+              Rerun Query
+            </Button>
+          </div>
         }
       />
-      <Drawer open={showMessages} onClose={() => setShowMessages(false)} anchor="right" id="messages-drawer" className={error ? 'width-75pct' : undefined }>
+
+      <Drawer open={showMessages} onClose={() => setShowMessages(false)} anchor="right" id="messages-drawer" className={error ? 'width-75pct' : undefined}>
         <List dense component="ul" subheader={<ListSubheader>Query</ListSubheader>}>
           <ListItem component="li" className={'query ' + (error ? 'error' : '')}>
             <Syntax code={query} language="sql" strong />