New API to get current schema

Signed-off-by: worksofliam <[email protected]>

Author: worksofliam

package.json

@@ -429,11 +429,6 @@
         "category": "Db2 for i",
         "icon": "$(output)"
       },
-      {
-        "command": "vscode-db2i.setCurrentSchema",
-        "title": "Set current schema",
-        "category": "Db2 for i"
-      },
       {
         "command": "vscode-db2i.setSchemaFilter",
         "title": "Set filter",
@@ -948,11 +943,6 @@
         }
       ],
       "view/item/context": [
-        {
-          "command": "vscode-db2i.setCurrentSchema",
-          "when": "viewItem == schema",
-          "group": "db2@1"
-        },
         {
           "command": "vscode-db2i.setSchemaFilter",
           "when": "viewItem == schema",

src/connection/sqlJob.ts

@@ -19,7 +19,14 @@ export class OldSQLJob extends SQLJob {
     return this.selfState;
   }
 
-  getCurrentSchema(): string {
+  async getCurrentSchema(): Promise<string> {
+    if (this.getNaming() === `sql`) {
+      const result = await this.execute<{'00001': string}>(`values (current schema)`);
+      if (result.success && result.data.length > 0) {
+        return result.data[0]['00001'];
+      }
+    }
+
     return this.options.libraries[0] || `QGPL`;
   }
 
@@ -178,19 +185,6 @@ export class OldSQLJob extends SQLJob {
       throw e;
     }
   }
-  
-  async setCurrentSchema(schema: string): Promise<QueryResult<any>> {
-    if (schema) {
-      const upperSchema = Statement.delimName(schema, true);
-      const result = await this.execute(`set current schema = ?`, {parameters: [upperSchema]});
-      if (result.success) {
-        this.options.libraries[0] = upperSchema;
-      }
-
-      return result;
-  
-    }
-  }
 
   getJobLog(): Promise<QueryResult<JobLogEntry>> {
     return this.query<JobLogEntry>(`select * from table(qsys2.joblog_info('*')) a`).execute();

src/views/schemaBrowser/contributes.json

@@ -95,11 +95,6 @@
         "category": "Db2 for i",
         "icon": "$(output)"
       },
-      {
-        "command": "vscode-db2i.setCurrentSchema",
-        "title": "Set current schema",
-        "category": "Db2 for i"
-      },
       {
         "command": "vscode-db2i.setSchemaFilter",
         "title": "Set filter",
@@ -127,11 +122,6 @@
         }
       ],
       "view/item/context": [
-        {
-          "command": "vscode-db2i.setCurrentSchema",
-          "when": "viewItem == schema",
-          "group": "db2@1"
-        },
         {
           "command": "vscode-db2i.setSchemaFilter",
           "when": "viewItem == schema",

src/views/schemaBrowser/index.ts

@@ -350,22 +350,6 @@ export default class schemaBrowser {
         }
       }),
 
-      vscode.commands.registerCommand(`vscode-db2i.setCurrentSchema`, async (node: SchemaItem) => {
-        if (node && node.contextValue === `schema`) {
-          const schema = node.schema.toUpperCase();
-
-          const config = getInstance().getConfig();
-          const currentLibrary = config.currentLibrary.toUpperCase();
-
-          if (schema && schema !== currentLibrary) {
-            config.currentLibrary = schema;
-            await getInstance().setConfig(config);
-          }
-
-          vscode.window.showInformationMessage(`Current schema set to ${schema}.`);
-        }
-      }),
-
       vscode.commands.registerCommand(`vscode-db2i.setSchemaFilter`, async (node: SchemaItem) => {
         if (node) {
           const value = await vscode.window.showInputBox({