Better support for SQL naming vs system naming

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

Author: worksofliam

src/connection/manager.ts

@@ -118,13 +118,25 @@ 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)
 
     const statement = await this.getPagingStatement<T>(query, opts);
     const results = await statement.execute(rowsToFetch);
     statement.close();
+
+    this.resetCurrentSchema(query, this.jobs[this.selectedJob].job);
     return results.data;
   }
 
@@ -136,12 +148,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()) {

src/connection/sqlJob.ts

@@ -14,16 +14,25 @@ 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) {
-        return result.data[0]['00001'];
+        this.currentSchemaStore = result.data[0]['00001'];
+        return this.currentSchemaStore;
       }
     }
 

src/language/providers/completionProvider.ts

@@ -219,6 +219,7 @@ async function getCompletionItemsForTriggerDot(
   offset: number,
   trigger: string
 ): Promise<CompletionItem[]> {
+  const defaultLibrary = await getDefaultSchema();
   let list: CompletionItem[] = [];
 
   const curRef = currentStatement.getReferenceByOffset(offset);
@@ -236,7 +237,7 @@ async function getCompletionItemsForTriggerDot(
   // Set the default schema for all references without one
   for (let ref of objectRefs) {
     if (!ref.object.schema) {
-      ref.object.schema = getDefaultSchema();
+      ref.object.schema = defaultLibrary;
     }
   }
 
@@ -284,7 +285,7 @@ async function getCompletionItemsForTriggerDot(
   } else {
 
     if (currentStatement.type === StatementType.Call) {
-      const procs = await getProcedures([curRef], getDefaultSchema());
+      const procs = await getProcedures([curRef], defaultLibrary);
       list.push(...procs);
 
     } else {
@@ -332,6 +333,7 @@ function createCompletionItemForAlias(ref: ObjectRef) {
 }
 
 async function getCompletionItemsForRefs(currentStatement: LanguageStatement.default, offset: number, cteColumns?: string[]) {
+  const defaultSchema = await getDefaultSchema();
   const objectRefs = currentStatement.getObjectReferences();
   const cteList = currentStatement.getCTEReferences();
 
@@ -350,7 +352,7 @@ async function getCompletionItemsForRefs(currentStatement: LanguageStatement.def
   // Set the default schema for all references without one
   for (let ref of objectRefs) {
     if (!ref.object.schema) {
-      ref.object.schema = getDefaultSchema();
+      ref.object.schema = defaultSchema;
     }
   }
 
@@ -395,7 +397,7 @@ async function getCompletionItemsForRefs(currentStatement: LanguageStatement.def
   if (tokenAtOffset === undefined && (emptyObjectRefs || curClause !== ClauseType.Unknown)) {
     // get all the completion items for objects in each referenced schema
     completionItems.push(
-      ...(await getObjectCompletions(getDefaultSchema(), completionTypes))
+      ...(await getObjectCompletions(defaultSchema, completionTypes))
     );
   } else {
     // content assist invoked during incomplete reference
@@ -453,7 +455,7 @@ async function getCompletionItems(
   currentStatement: LanguageStatement.default|undefined,
   offset?: number
 ) {
-
+  const defaultSchema = await getDefaultSchema();
   const s = currentStatement ? currentStatement.getTokenByOffset(offset) : null;
 
   if (trigger === "." || (s && s.type === `dot`) || trigger === "/") {
@@ -479,7 +481,7 @@ async function getCompletionItems(
   if (currentStatement && currentStatement.type === StatementType.Call) {
     const curClause = currentStatement.getClauseForOffset(offset);
     if (curClause === ClauseType.Unknown) {
-      return getProcedures(currentStatement.getObjectReferences(), getDefaultSchema());
+      return getProcedures(currentStatement.getObjectReferences(), defaultSchema);
     }
   }
 
@@ -623,7 +625,11 @@ export const completionProvider = languages.registerCompletionItemProvider(
   "/"
 );
 
-const getDefaultSchema = (): string => {
+const getDefaultSchema = () => {
   const currentJob = JobManager.getSelection();
-  return currentJob && currentJob.job.options.libraries[0] ? currentJob.job.options.libraries[0] : `QGPL`;
+  if (currentJob) {
+    return currentJob.job.getCurrentSchema()
+  } else {
+    return Promise.resolve(`QGPL`);
+  }
 }

src/language/providers/hoverProvider.ts

@@ -15,12 +15,16 @@ import { CallableSignature } from "../../database/callable";
 
 export const openProvider = workspace.onDidOpenTextDocument(async (document) => {
   if (document.languageId === `sql`) {
-    if (remoteAssistIsEnabled()) {
+    const selected = remoteAssistIsEnabled();
+
+    if (selected) {
       const sqlDoc = getSqlDocument(document);
-      const defaultSchema = getDefaultSchema();
+      const defaultSchema = await selected.job.getCurrentSchema();
 
       if (!sqlDoc) return;
 
+      // TODO: we need to stop hard coding default schema here!!
+
       for (const statement of sqlDoc.statements) {
         const refs = statement.getObjectReferences();
         if (refs.length) {
@@ -60,9 +64,10 @@ export const openProvider = workspace.onDidOpenTextDocument(async (document) =>
 
 export const hoverProvider = languages.registerHoverProvider({ language: `sql` }, {
   async provideHover(document, position, token) {
-    if (!remoteAssistIsEnabled(true)) return;
+    const selected = remoteAssistIsEnabled(true);
+    if (!selected) return;
 
-    const defaultSchema = getDefaultSchema();
+    const defaultSchema = await selected.job.getCurrentSchema();
     const sqlDoc = getSqlDocument(document);
     const offset = document.offsetAt(position);
 
@@ -193,9 +198,4 @@ function lookupSymbol(name: string, schema: string | undefined, possibleNames: s
   schema = schema ? Statement.noQuotes(Statement.delimName(schema, true)) : undefined
 
   return DbCache.lookupSymbol(name, schema, possibleNames);
-}
-
-const getDefaultSchema = (): string => {
-  const currentJob = JobManager.getSelection();
-  return currentJob && currentJob.job.options.libraries[0] ? currentJob.job.options.libraries[0] : `QGPL`;
 }

src/language/providers/peekProvider.ts

@@ -14,7 +14,7 @@ export const peekProvider = languages.registerDefinitionProvider({ language: `sq
 
     if (!currentJob) return;
 
-    const defaultSchema = currentJob.job.getCurrentSchema();
+    const defaultSchema = await currentJob.job.getCurrentSchema();
     const naming = currentJob.job.getNaming();
 
     const sqlDoc = getSqlDocument(document);

src/views/jobManager/editJob/systemTab.ts

@@ -29,7 +29,7 @@ export default function getSystemTab(options: JDBCOptions) {
     .addInput(
       `libraries`,
       `Library list`,
-      `List of system libraries, separated by commas or spaces. First entry is the default library / current schema, and the remaining items make up the library list.`,
+      `List of system libraries, separated by commas or spaces. First entry is the default library, and the remaining items make up the library list. The library list is typically not used when SQL naming is used.`,
       { rows: 2, default: options.libraries ? options.libraries.join(`, `) : `QGPL` }
     )
     .addSelect(