Merge pull request #278 from codefori/feature/peek

Go to Definition support

Author: worksofliam

package.json

@@ -186,12 +186,22 @@
         }
       },
       {
-        "id": "vscode-db2i.self",
-        "title": "SQL Error Logging Facility (SELF)",
+        "id": "vscode-db2i.jobManager",
+        "title": "SQL Job Manager",
         "properties": {
-          "vscode-db2i.jobSelfDefault": {
+          "vscode-db2i.jobManager.jobNamingDefault": {
             "type": "string",
             "order": 0,
+            "description": "Default naming mode for new jobs",
+            "default": "system",
+            "enum": [
+              "system",
+              "sql"
+            ]
+          },
+          "vscode-db2i.jobManager.jobSelfDefault": {
+            "type": "string",
+            "order": 1,
             "description": "Default SELF setting for new jobs",
             "default": "*NONE",
             "enum": [
@@ -200,7 +210,13 @@
               "*ERROR",
               "*WARNING"
             ]
-          },
+          }
+        }
+      },
+      {
+        "id": "vscode-db2i.self",
+        "title": "SQL Error Logging Facility (SELF)",
+        "properties": {
           "vscode-db2i.jobSelfViewAutoRefresh": {
             "type": "boolean",
             "title": "Auto-refresh SELF Codes view",
@@ -423,11 +439,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",
@@ -588,8 +599,8 @@
         "icon": "$(edit)"
       },
       {
-        "command": "vscode-db2i.jobManager.defaultSelfSettings",
-        "title": "SQL Error Logging Facility (SELF) - Default Setting",
+        "command": "vscode-db2i.jobManager.defaultSettings",
+        "title": "Default Job Settings",
         "category": "Db2 for i",
         "icon": "$(gear)"
       },
@@ -948,7 +959,7 @@
           "when": "view == jobManager"
         },
         {
-          "command": "vscode-db2i.jobManager.defaultSelfSettings",
+          "command": "vscode-db2i.jobManager.defaultSettings",
           "group": "navigation",
           "when": "view == jobManager"
         },
@@ -1014,11 +1025,6 @@
         }
       ],
       "view/item/context": [
-        {
-          "command": "vscode-db2i.setCurrentSchema",
-          "when": "viewItem == schema",
-          "group": "db2@1"
-        },
         {
           "command": "vscode-db2i.setSchemaFilter",
           "when": "viewItem == schema",
@@ -1375,7 +1381,7 @@
       },
       {
         "view": "vscode-db2i.self.nodes",
-        "contents": "🛠️ SELF Codes will appear here. You can set the SELF log level on specific jobs, or you can set the default for new jobs in the User Settings.\n\n[Set Default for New Jobs](command:vscode-db2i.jobManager.defaultSelfSettings)\n\n[Learn about SELF](command:vscode-db2i.self.help)"
+        "contents": "🛠️ SELF Codes will appear here. You can set the SELF log level on specific jobs, or you can set the default for new jobs in the User Settings.\n\n[Set Default for New Jobs](command:vscode-db2i.jobManager.defaultSettings)\n\n[Learn about SELF](command:vscode-db2i.self.help)"
       }
     ],
     "notebooks": [

src/connection/manager.ts

@@ -13,6 +13,8 @@ export interface JobInfo {
   job: OldSQLJob;
 }
 
+export type NamingFormats = "sql"|"system";
+
 const NO_SELECTED_JOB = -1;
 
 export class SQLJobManager {
@@ -27,11 +29,12 @@ export class SQLJobManager {
     if (ServerComponent.isInstalled()) {
 
       const instance = getInstance();
-      const config = instance.getConfig();
+      const connection = instance.getConnection()!;
+      const config = connection.getConfig();
 
       const newJob = predefinedJob || (new OldSQLJob({
         libraries: [config.currentLibrary, ...config.libraryList.filter((item) => item != config.currentLibrary)],
-        naming: `system`,
+        naming: SQLJobManager.getNamingDefault(),
         "full open": false,
         "transaction isolation": "none",
         "query optimize goal": "1",
@@ -117,6 +120,16 @@ export class SQLJobManager {
     return this.jobs[jobExists];
   }
 
+  private resetCurrentSchema(query: string, job: OldSQLJob) {
+    if (query.toUpperCase().startsWith(`SET`)) {
+      const newSchema = query.split(` `)[2];
+      if (newSchema) {
+        job.resetCurrentSchemaCache();
+      }
+    }
+    return query;
+  }
+
   async runSQL<T>(query: string, opts?: QueryOptions, rowsToFetch = 2147483647): Promise<T[]> {
     // 2147483647 is NOT arbitrary. On the server side, this is processed as a Java
     // int. This is the largest number available without overflow (Integer.MAX_VALUE)
@@ -128,10 +141,7 @@ export class SQLJobManager {
     const results = await statement.execute(rowsToFetch);
     statement.close();
 
-    // const e = performance.now()
-    // console.log(`Statement executed in ${e - s} ms. ${results.data.length} rows returned.`);
-    // console.log(`\t${query.padEnd(40).substring(0, 40)}`)
-
+    this.resetCurrentSchema(query, this.jobs[this.selectedJob].job);
     return results.data;
   }
 
@@ -143,12 +153,15 @@ export class SQLJobManager {
     const results = await statement.execute(rowsToFetch);
     statement.close();
 
+    this.resetCurrentSchema(query, this.jobs[this.selectedJob].job);
     return results;
   }
 
   async getPagingStatement<T>(query: string, opts?: QueryOptions): Promise<Query<T>> {
-    const selected = this.jobs[this.selectedJob]
+    const selected = this.jobs[this.selectedJob];
     if (ServerComponent.isInstalled() && selected) {
+      this.resetCurrentSchema(query, selected?.job);
+      
       return selected.job.query<T>(query, opts);
 
     } else if (!ServerComponent.isInstalled()) {
@@ -171,6 +184,10 @@ export class SQLJobManager {
   }
 
   static getSelfDefault(): SelfValue {
-    return Configuration.get<SelfValue>(`jobSelfDefault`) || `*NONE`;
+    return Configuration.get<SelfValue>(`jobManager.jobSelfDefault`) || `*NONE`;
+  }
+
+  static getNamingDefault(): NamingFormats {
+    return (Configuration.get<string>(`jobManager.jobNamingDefault`) || `system`) as NamingFormats;
   }
 }

src/connection/sqlJob.ts

@@ -5,6 +5,7 @@ import { SQLJob } from "@ibm/mapepire-js";
 import { ConnectionResult, QueryResult, ServerRequest, ServerResponse } from "@ibm/mapepire-js/dist/src/types";
 import { JobLogEntry, JobStatus } from "./types";
 import Statement from "../database/statement";
+import { NamingFormats } from "./manager";
 
 const DB2I_VERSION = (process.env[`DB2I_VERSION`] || `<version unknown>`) + ((process.env.DEV) ? ``:`-dev`);
 
@@ -13,11 +14,35 @@ export class OldSQLJob extends SQLJob {
   private selfState: SelfValue = "*NONE";
 
   id: string | undefined;
+  private currentSchemaStore: string | undefined;
 
   getSelfCode(): SelfValue {
     return this.selfState;
   }
 
+  resetCurrentSchemaCache() {
+    this.currentSchemaStore = undefined;
+  }
+
+  async getCurrentSchema(): Promise<string> {
+    if (this.getNaming() === `sql`) {
+      if (this.currentSchemaStore) 
+        return this.currentSchemaStore;
+
+      const result = await this.execute<{'00001': string}>(`values (current schema)`);
+      if (result.success && result.data.length > 0) {
+        this.currentSchemaStore = result.data[0]['00001'];
+        return this.currentSchemaStore;
+      }
+    }
+
+    return this.options.libraries[0] || `QGPL`;
+  }
+
+  getNaming(): NamingFormats {
+    return this.options.naming;
+  }
+
   public static async useExec() {
     let useExec = false;
 
@@ -169,19 +194,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/connection/syntaxChecker/index.ts

@@ -47,7 +47,7 @@ export class SQLStatementChecker implements IBMiComponent {
 
   private getLibrary(connection: IBMi) {
     if (!this.library) {
-      this.library = connection?.config?.tempLibrary.toUpperCase() || `ILEDITOR`;
+      this.library = connection?.getConfig()?.tempLibrary.toUpperCase() || `ILEDITOR`;
     }
 
     return this.library;
@@ -79,7 +79,7 @@ export class SQLStatementChecker implements IBMiComponent {
     return -1;
   }
 
-  async getRemoteState(connection: IBMi) {
+  async getRemoteState(connection: IBMi): Promise<ComponentState> {
     const lib = this.getLibrary(connection);
 
     const wrapperVersion = await SQLStatementChecker.getVersionOf(connection, lib, WRAPPER_NAME);
@@ -98,7 +98,7 @@ export class SQLStatementChecker implements IBMiComponent {
   update(connection: IBMi): ComponentState | Promise<ComponentState> {
     return connection.withTempDirectory(async tempDir => {
       const tempSourcePath = posix.join(tempDir, `sqlchecker.sql`);
-      await connection.content.writeStreamfileRaw(tempSourcePath, Buffer.from(this.getSource(connection), "utf-8"));
+      await connection.getConfig().writeStreamfileRaw(tempSourcePath, Buffer.from(this.getSource(connection), "utf-8"));
       const result = await connection.runCommand({
         command: `RUNSQLSTM SRCSTMF('${tempSourcePath}') COMMIT(*NONE) NAMING(*SYS)`,
         noLibList: true