Merge pull request #271 from codefori/fix/content_assist_for_routines

Fix bug where parameters and columns were sharing the same cache keys

Author: worksofliam

src/language/providers/callable.ts

@@ -3,6 +3,9 @@ import Callable, { CallableSignature, CallableType } from "../../database/callab
 import { ObjectRef, QualifiedObject, CallableReference } from "../sql/types";
 import Statement from "../../database/statement";
 import { completionItemCache, createCompletionItem, getParmAttributes } from "./completion";
+import { toKey } from "./completionItemCache";
+
+const SIGNATURE_CONTEXT_KEY = `sigs`;
 
 /**
  * Checks if the ref exists as a procedure or function. Then,
@@ -13,7 +16,7 @@ export async function isCallableType(ref: ObjectRef, type: CallableType) {
     ref.object.schema = Statement.noQuotes(Statement.delimName(ref.object.schema, true));
     ref.object.name = Statement.noQuotes(Statement.delimName(ref.object.name, true));
 
-    const cacheKey = toCacheKey(ref.object);
+    const cacheKey = toKey(SIGNATURE_CONTEXT_KEY, ref.object);
 
     if (completionItemCache.has(cacheKey)) {
       return true;
@@ -149,12 +152,8 @@ export function getPositionData(ref: CallableReference, offset: number) {
 }
 
 export function getCachedSignatures(ref: CallableReference): CallableSignature[] | undefined {
-  const key = toCacheKey(ref.parentRef.object);
+  const key = toKey(SIGNATURE_CONTEXT_KEY, ref.parentRef.object);
   if (completionItemCache.has(key)) {
     return completionItemCache.get(key);
   }
-}
-
-function toCacheKey(sqlObj: QualifiedObject): string {
-  return sqlObj.schema + sqlObj.name;
 }

src/language/providers/completionItemCache.ts

@@ -1,5 +1,6 @@
 import { CompletionItem } from "vscode";
 import LRU from "lru-cache";
+import { QualifiedObject } from "../sql/types";
 
 export let changedCache: Set<string> = new Set<string>();
 
@@ -15,3 +16,7 @@ export default class CompletionItemCache extends LRU {
     });
   }
 }
+
+export function toKey(context: string, sqlObj: QualifiedObject|string) {
+  return `${context}-` + (typeof sqlObj === `string` ? sqlObj : `${sqlObj.schema}.${sqlObj.name}`).toUpperCase();
+}

src/language/providers/completionProvider.ts

@@ -10,7 +10,7 @@ import Table from "../../database/table";
 import Document from "../sql/document";
 import * as LanguageStatement from "../sql/statement";
 import { CTEReference, CallableReference, ClauseType, ObjectRef, StatementType } from "../sql/types";
-import CompletionItemCache, { changedCache } from "./completionItemCache";
+import CompletionItemCache, { changedCache, toKey } from "./completionItemCache";
 import Callable, { CallableType } from "../../database/callable";
 import { ServerComponent } from "../../connection/serverComponent";
 import { prepareParamType, createCompletionItem, getParmAttributes, completionItemCache } from "./completion";
@@ -91,10 +91,11 @@ async function getObjectColumns(
   isUDTF = false
 ): Promise<CompletionItem[]> {
 
-  const databaseObj = (schema + name).toUpperCase();
-  const tableUpdate: boolean = changedCache.delete(databaseObj);
+  const cacheKey = toKey(`columns`, schema + name)
+  const tableUpdate: boolean = changedCache.delete(cacheKey);
+  const isCached = completionItemCache.has(cacheKey);
 
-  if (!completionItemCache.has(databaseObj) || tableUpdate) {
+  if (!isCached || tableUpdate) {
     schema = Statement.noQuotes(Statement.delimName(schema, true));
     name = Statement.noQuotes(Statement.delimName(name, true));
 
@@ -104,7 +105,7 @@ async function getObjectColumns(
       const resultSet = await Callable.getResultColumns(schema, name, true);
 
       if (!resultSet?.length ? true : false) {
-        completionItemCache.set(databaseObj, []);
+        completionItemCache.set(cacheKey, []);
         return [];
       }
 
@@ -122,7 +123,7 @@ async function getObjectColumns(
       const columns = await Table.getItems(schema, name);
 
       if (!columns?.length ? true : false) {
-        completionItemCache.set(databaseObj, []);
+        completionItemCache.set(cacheKey, []);
         return [];
       }
 
@@ -139,9 +140,10 @@ async function getObjectColumns(
 
     const allCols = getAllColumns(name, schema, completionItems);
     completionItems.push(allCols);
-    completionItemCache.set(databaseObj, completionItems);
+    completionItemCache.set(cacheKey, completionItems);
   }
-  return completionItemCache.get(databaseObj);
+
+  return completionItemCache.get(cacheKey);
 }
 
 /**
@@ -172,6 +174,7 @@ async function getObjectCompletions(
       .filter((result) => result.status == "fulfilled")
       .map((result) => (result as PromiseFulfilledResult<any>).value)
       .flat();
+
     completionItemCache.set(forSchema, list);
   }
   return completionItemCache.get(forSchema);