Merge pull request #136 from halcyon-tech/feature/schema_index_advice

Feature/schema_index_advice

Author: worksofliam

package.json

@@ -481,12 +481,12 @@
         },
         {
           "command": "vscode-db2i.advisedIndexes",
-          "when": "viewItem == table",
+          "when": "viewItem == table || viewItem == schema",
           "group": "db2idxAdv@1"
         },
         {
           "command": "vscode-db2i.clearAdvisedIndexes",
-          "when": "viewItem == table",
+          "when": "viewItem == table || viewItem == schema",
           "group": "db2idxAdv@2"
         },
         {

src/database/schemas.ts

@@ -13,7 +13,7 @@ const typeMap = {
   'aliases': [`A`]
 };
 
-export default class Database {
+export default class Schemas {
   /**
    * @param schema Not user input
    */
@@ -171,4 +171,14 @@ export default class Database {
   static isRoutineType(type: string): boolean {
     return type === `function` || type === `procedure`;
   }
+
+  static clearAdvisedIndexes(schema: string, name?: string) {
+    let query = `DELETE FROM QSYS2.SYSIXADV WHERE TABLE_SCHEMA = '${schema}'`;
+
+    if (name) {
+      query += `and TABLE_NAME = '${name}'`;
+    }
+
+    return getInstance().getContent().runSQL(query);
+  }
 }

src/database/table.ts

@@ -37,15 +37,6 @@ export default class Table {
     return JobManager.runSQL(sql);
   }
 
-  /**
-   * @param schema Not user input
-   * @param name Not user input
-   */
-  static clearAdvisedIndexes(schema: string, name: string) {
-    const query = `DELETE FROM QSYS2.SYSIXADV WHERE TABLE_SCHEMA = '${schema}' and TABLE_NAME = '${name}'`;
-    return getInstance().getContent().runSQL(query);
-  }
-
   static async clearFile(library: string, objectName: string): Promise<void> {
     const command = `CLRPFM ${library}/${objectName}`;
 

src/views/schemaBrowser/schemaBrowser.ts

@@ -151,7 +151,7 @@ export default class schemaBrowser {
 
           vscode.commands.executeCommand(`vscode-db2i.runEditorStatement`, {
             content,
-            type: `statement`,
+            qualifier: `statement`,
             open: false,
           });
         }
@@ -162,32 +162,44 @@ export default class schemaBrowser {
           const content = `SELECT * FROM QSYS2.SYSINDEXSTAT WHERE TABLE_SCHEMA = '${object.schema}' and TABLE_NAME = '${object.name}'`;
           vscode.commands.executeCommand(`vscode-db2i.runEditorStatement`, {
             content,
-            type: `statement`,
+            qualifier: `statement`,
             open: false,
           });
         }
       }),
 
-      vscode.commands.registerCommand(`vscode-db2i.advisedIndexes`, async (object: SQLObject) => { //table
+      vscode.commands.registerCommand(`vscode-db2i.advisedIndexes`, async (object: SQLObject|SchemaItem) => { //table
         if (object) {
-          const content = getAdvisedIndexesStatement(object.schema, object.name);
-          vscode.commands.executeCommand(`vscode-db2i.runEditorStatement`, {
-            content,
-            type: `statement`,
-            open: false,
-          });
+          let content: string|undefined;
+          if (`name` in object) {
+            content = getAdvisedIndexesStatement(object.schema, object.name);
+          }
+          else {
+            content = getAdvisedIndexesStatement(object.schema);
+          }
+          
+          if (content) {
+            vscode.commands.executeCommand(`vscode-db2i.runEditorStatement`, {
+              content,
+              qualifier: `statement`,
+              open: false,
+            });
+          }
         }
       }),
 
-      vscode.commands.registerCommand(`vscode-db2i.clearAdvisedIndexes`, async (object: SQLObject) => {
+      vscode.commands.registerCommand(`vscode-db2i.clearAdvisedIndexes`, async (object: SQLObject|SchemaItem) => {
         if (object) {
-          const result = await vscode.window.showWarningMessage(`Are you sure you want to clear all of the advised index rows from the Index Advisor for ${object.name}?`,  {
+          const isObject = `name` in object;
+          let result;
+
+          result = await vscode.window.showWarningMessage(`Are you sure you want to clear all of the advised index rows from the Index Advisor for ${object.schema}${isObject ? `${object.name}` : ''}?`,  {
             modal: true,
           }, 'No', 'Yes');
 
           if(result === 'Yes') {
             try {
-              await Table.clearAdvisedIndexes(object.schema, object.name);
+              await Schemas.clearAdvisedIndexes(object.schema, isObject ? object.name : undefined);
             } catch (e) {
               vscode.window.showErrorMessage(e.message);
             }
@@ -304,7 +316,7 @@ export default class schemaBrowser {
           const content = `SELECT * FROM ${Statement.delimName(object.schema)}.${Statement.delimName(object.name)} as a`;
           vscode.commands.executeCommand(`vscode-db2i.runEditorStatement`, {
             content,
-            type: `statement`,
+            qualifier: `statement`,
             open: true,
           });
         }

src/views/schemaBrowser/statements.ts

@@ -1,12 +1,12 @@
-export function getAdvisedIndexesStatement(schema: string, name: string) {
+export function getAdvisedIndexesStatement(schema: string, name?: string) {
   return [
     `select KEY_COLUMNS_ADVISED, Times_Advised, Most_Expensive_Query, Average_Query_Estimate,`,
     `   Last_Advised, MTI_USED_FOR_STATS, LAST_MTI_USED_FOR_STATS, Table_Size, MTI_USED, MTI_CREATED,`,
     `   LAST_MTI_USED, System_Table_Schema, Estimated_Creation_Time, Logical_Page_Size, INDEX_TYPE,`,
     `   TABLE_NAME, TABLE_SCHEMA, SYSTEM_TABLE_NAME, PARTITION_NAME, LOGICAL_PAGE_SIZE,`,
     `   NLSS_TABLE_NAME, NLSS_TABLE_SCHEMA, MAX_ROW`,
-    `from qsys2.condidxa`,
-    `where TABLE_NAME = '${name}' and`,
+    `from qsys2.condidxa where`,
+    ...(name ? [`TABLE_NAME = '${name}' and`] : []),
     `    Table_Schema = '${schema}'`,
     `    order by Times_Advised desc`,
   ].join(` `);