Peek to support SQL and system naming

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

Author: worksofliam

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 {
@@ -163,7 +165,7 @@ export class SQLJobManager {
     return Configuration.get<SelfValue>(`jobManager.jobSelfDefault`) || `*NONE`;
   }
 
-  static getNamingDefault(): "sql"|"system" {
-    return (Configuration.get<string>(`jobManager.jobNamingDefault`) || `system`) as "system" | "sql";
+  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, JobStatus, QueryResult, ServerRequest, ServerResponse } from "@ibm/mapepire-js/dist/src/types";
 import { JobLogEntry } from "./types";
 import Statement from "../database/statement";
+import { NamingFormats } from "./manager";
 
 const DB2I_VERSION = (process.env[`DB2I_VERSION`] || `<version unknown>`) + ((process.env.DEV) ? ``:`-dev`);
 
@@ -18,6 +19,14 @@ export class OldSQLJob extends SQLJob {
     return this.selfState;
   }
 
+  getCurrentSchema(): string {
+    return this.options.libraries[0] || `QGPL`;
+  }
+
+  getNaming(): NamingFormats {
+    return this.options.naming;
+  }
+
   public static async useExec() {
     let useExec = false;
 

src/language/providers/peekProvider.ts

@@ -2,17 +2,21 @@ import { languages, workspace } from "vscode";
 import { getSqlDocument } from "./logic/parse";
 import { JobManager } from "../../config";
 import Statement from "../../database/statement";
-import { StatementType } from "../sql/types";
 import { remoteAssistIsEnabled } from "./logic/available";
-import Schemas, { AllSQLTypes, InternalTypes, SQLType } from "../../database/schemas";
+import Schemas, {  } from "../../database/schemas";
 
 
 export const peekProvider = languages.registerDefinitionProvider({ language: `sql` }, {
   async provideDefinition(document, position, token) {
-    const standardObjects: SQLType[] = AllSQLTypes.filter(type => ![`functions`, `procedures`].includes(type));
     if (!remoteAssistIsEnabled()) return;
 
-    const defaultSchema = getDefaultSchema();
+    const currentJob = JobManager.getSelection();
+
+    if (!currentJob) return;
+
+    const defaultSchema = currentJob.job.getCurrentSchema();
+    const naming = currentJob.job.getNaming();
+
     const sqlDoc = getSqlDocument(document);
     const offset = document.offsetAt(position);
 
@@ -26,7 +30,13 @@ export const peekProvider = languages.registerDefinitionProvider({ language: `sq
 
       if (ref) {
         const name = Statement.noQuotes(Statement.delimName(ref.object.name, true));
-        const schema = ref.object.schema ? Statement.noQuotes(Statement.delimName(ref.object.schema, true)) : undefined;
+
+        // Schema is based on a few things:
+        // If it's a fully qualified path, use the schema path
+        // Otherwise:
+        //  - if SQL naming is in use, then use the default schema
+        //  - if system naming is in use, then don't pass a library and the library list will be used
+        const schema = ref.object.schema ? Statement.noQuotes(Statement.delimName(ref.object.schema, true)) : naming === `sql` ? defaultSchema : undefined;
 
         const possibleObjects = await Schemas.resolveObjects([{name, schema}]);
 
@@ -45,9 +55,4 @@ export const peekProvider = languages.registerDefinitionProvider({ language: `sq
       }
     }
   }
-});
-
-const getDefaultSchema = (): string => {
-  const currentJob = JobManager.getSelection();
-  return currentJob && currentJob.job.options.libraries[0] ? currentJob.job.options.libraries[0] : `QGPL`;
-}
+});