Fix for delimited names

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

Author: worksofliam

src/database/schemas.ts

@@ -103,7 +103,8 @@ export default class Schemas {
    * Resolves to the following SQL types: SCHEMA, TABLE, VIEW, ALIAS, INDEX, FUNCTION and PROCEDURE
    */
   static async resolveObjects(
-    sqlObjects: ObjectReference[]
+    sqlObjects: ObjectReference[],
+    ignoreSystemTypes: string[] = []
   ): Promise<ResolvedSqlObject[]> {
     let statements: string[] = [];
     let parameters: BasicColumnType[] = [];
@@ -114,6 +115,13 @@ export default class Schemas {
 
     // First, we use OBJECT_STATISTICS to resolve the object based on the library list.
     // But, if the object is qualified with a schema, we need to use that schema to get the correct object.
+
+    let ignoreClause = ``;
+    if (ignoreSystemTypes.length > 0) {
+      ignoreSystemTypes = ignoreSystemTypes.map(i => i.toUpperCase());
+      ignoreClause = `where objtype not in (${ignoreSystemTypes.map((i) => `?`).join(`, `)})`;
+    }
+
     for (const obj of sqlObjects) {
       const cached = this.getCachedReference(obj);
       if (cached) {
@@ -123,14 +131,14 @@ export default class Schemas {
 
       if (obj.schema) {
         statements.push(
-          `${BASE_RESOLVE_SELECT} from table(qsys2.object_statistics(?, '*ALL', object_name => ?))`
+          `${BASE_RESOLVE_SELECT} from table(qsys2.object_statistics(?, '*ALL', object_name => ?)) ${ignoreClause}`
         );
-        parameters.push(obj.schema, obj.name);
+        parameters.push(obj.schema, obj.name, ...ignoreSystemTypes);
       } else {
         statements.push(
-          `${BASE_RESOLVE_SELECT} from table(qsys2.object_statistics('*LIBL', '*ALL', object_name => ?))`
+          `${BASE_RESOLVE_SELECT} from table(qsys2.object_statistics('*LIBL', '*ALL', object_name => ?)) ${ignoreClause}`
         );
-        parameters.push(obj.name);
+        parameters.push(obj.name, ...ignoreSystemTypes);
       }
     }
 

src/language/providers/peekProvider.ts

@@ -29,16 +29,16 @@ export const peekProvider = languages.registerDefinitionProvider({ language: `sq
       const ref = refs.find(ref => ref.tokens[0].range.start && offset <= ref.tokens[ref.tokens.length - 1].range.end);
 
       if (ref) {
-        const name = Statement.noQuotes(Statement.delimName(ref.object.name, true));
+        const name = Statement.delimName(ref.object.name, true);
 
         // 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 schema = ref.object.schema ? Statement.delimName(ref.object.schema, true) : naming === `sql` ? defaultSchema : undefined;
 
-        const possibleObjects = await Schemas.resolveObjects([{name, schema}]);
+        const possibleObjects = await Schemas.resolveObjects([{name, schema}], [`*LIB`]);
 
         if (possibleObjects.length === 1) {
           const obj = possibleObjects[0];