Cleanup of fetch

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

Author: worksofliam

src/database/schemas.ts

@@ -5,7 +5,7 @@ import { JobManager } from "../config";
 import { ResolvedSqlObject, BasicSQLObject } from "../types";
 
 export type SQLType = "schemas" | "tables" | "views" | "aliases" | "constraints" | "functions" | "variables" | "indexes" | "procedures" | "sequences" | "packages" | "triggers" | "types" | "logicals";
-export type PageData = { filter?: string, offset?: number, limit?: number };
+export type PageData = { filter?: string, offset?: number, limit?: number, sort?: boolean };
 
 const typeMap = {
   'tables': [`T`, `P`, `M`],
@@ -353,9 +353,21 @@ export default class Schemas {
       }
     }
 
-    const query = `with results as (${selects.join(
-      " UNION ALL "
-    )}) select * from results Order by QSYS2.DELIMIT_NAME(NAME) asc`;
+    let query: string;
+
+    if (selects.length > 1) {
+      if (details.sort) {
+        query = `with results as (${selects.join(
+          " UNION ALL "
+        )}) select * from results Order by QSYS2.DELIMIT_NAME(NAME) asc`;
+      } else {
+        query = selects.join(` UNION ALL `);
+      }
+  
+    } else {
+      // TODO: sort single
+      query = selects[0];
+    }
 
     const objects: any[] = await JobManager.runSQL(
       [

src/language/providers/completionProvider.ts

@@ -143,28 +143,19 @@ async function getObjectCompletions(
   forSchema: string,
   sqlTypes: { [index: string]: CompletionType }
 ): Promise<CompletionItem[]> {
-  forSchema = Statement.noQuotes(Statement.delimName(forSchema, true));
-  
-  const promises = Object.entries(sqlTypes).map(async ([_, value]) => {
-    const data = await DbCache.getObjects(forSchema, [value.type]);
-    return data.map((table) =>
-      createCompletionItem(
-        Statement.prettyName(table.name),
-        value.icon,
-        value.label,
-        `Schema: ${table.schema}`,
-        value.order
+  const allObjects = await DbCache.getObjects(forSchema, Object.values(sqlTypes).map(k => k.type));
+
+  return allObjects.map((value) => {
+      const completionData = completionTypes[value.type];
+      return createCompletionItem(
+        Statement.prettyName(value.name),
+        completionData.icon,
+        completionData.label,
+        `Schema: ${value.schema}`,
+        completionData.order
       )
-    );
-  });
-
-  const results = await Promise.allSettled(promises);
-  const list = results
-    .filter((result) => result.status == "fulfilled")
-    .map((result) => (result as PromiseFulfilledResult<any>).value)
-    .flat();
-
-  return list;
+    }
+  );
 }
 
 async function getCompletionItemsForSchema(