Merge branch 'main' of github.com:halcyon-tech/vscode-db2i

Author: worksofliam

package-lock.json

@@ -1394,7 +1394,7 @@
     "webpack-cli": "^4.5.0"
   },
   "dependencies": {
-    "@ibm/mapepire-js": "^0.3.0",
+    "@ibm/mapepire-js": "^0.5.0",
     "@octokit/rest": "^21.1.1",
     "chart.js": "^4.4.2",
     "csv": "^6.1.3",

package.json

@@ -1,4 +1,4 @@
 
-export const VERSION = `2.1.4`;
+export const VERSION = `2.2.2`;
 export const SERVER_VERSION_TAG = `v${VERSION}`;
 export const SERVER_VERSION_FILE = `mapepire-server-${VERSION}.jar`;

src/connection/SCVersion.ts

@@ -119,9 +119,17 @@ export class SQLJobManager {
     // 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 s = performance.now()
+    // console.log(`Running statement: ${query.padEnd(40).substring(0, 40)}`);
+
     const statement = await this.getPagingStatement<T>(query, opts);
     const results = await statement.execute(rowsToFetch);
     statement.close();
+
+    // const e = performance.now()
+    // console.log(`Statement executed in ${e - s} ms. ${results.data.length} rows returned.`);
+    // console.log(`\t${query.padEnd(40).substring(0, 40)}`)
+
     return results.data;
   }
 

src/connection/manager.ts

@@ -2,8 +2,8 @@ import { getInstance } from "../base";
 import { ServerComponent } from "./serverComponent";
 import { SelfValue } from "../views/jobManager/selfCodes/nodes";
 import { SQLJob } from "@ibm/mapepire-js";
-import { ConnectionResult, JobStatus, QueryResult, ServerRequest, ServerResponse } from "@ibm/mapepire-js/dist/src/types";
-import { JobLogEntry } from "./types";
+import { ConnectionResult, QueryResult, ServerRequest, ServerResponse } from "@ibm/mapepire-js/dist/src/types";
+import { JobLogEntry, JobStatus } from "./types";
 import Statement from "../database/statement";
 
 const DB2I_VERSION = (process.env[`DB2I_VERSION`] || `<version unknown>`) + ((process.env.DEV) ? ``:`-dev`);
@@ -106,7 +106,7 @@ export class OldSQLJob extends SQLJob {
   getStatus(): JobStatus {
     const currentListenerCount = this.responseEmitter.eventNames().length;
 
-    return this.channel && currentListenerCount > 0 ? "busy" : this.status;
+    return this.channel && currentListenerCount > 0 ? JobStatus.BUSY : this.status;
   }
 
   async connect(): Promise<ConnectionResult> {
@@ -116,12 +116,12 @@ export class OldSQLJob extends SQLJob {
 
     this.channel.on(`error`, (err) => {
       ServerComponent.writeOutput(err);
-      this.dispose();
+      this.end();
     })
 
     this.channel.on(`close`, (code: number) => {
       ServerComponent.writeOutput(`Exited with code ${code}.`)
-      this.dispose();
+      this.end();
     })
 
     const props = Object
@@ -147,10 +147,10 @@ export class OldSQLJob extends SQLJob {
     const connectResult = await this.send<ConnectionResult>(connectionObject);
 
     if (connectResult.success === true) {
-      this.status = "ready";
+      this.status = JobStatus.READY;
     } else {
-      this.dispose();
-      this.status = "notStarted";
+      this.end();
+      this.status = JobStatus.NOT_STARTED;
       throw new Error(connectResult.error || `Failed to connect to server.`);
     }
 
@@ -217,13 +217,13 @@ export class OldSQLJob extends SQLJob {
       }));
     });
 
-    this.dispose();
+    this.end();
   }
 
-  dispose() {
+ private end() {
     this.channel.close();
     this.channel = undefined;
-    this.status = "ended";
+    this.status = JobStatus.ENDED;
     this.responseEmitter.removeAllListeners();
   }
 }

src/connection/sqlJob.ts

@@ -1,4 +1,23 @@
-import { QueryMetaData, QueryResult } from "@ibm/mapepire-js/dist/src/types";
+
+// Redefined from mapepire-js
+export enum JobStatus {
+  NOT_STARTED = "notStarted",
+  CONNECTING = "connecting",
+  READY = "ready",
+  BUSY = "busy",
+  ENDED = "ended"
+}
+
+export enum TransactionEndType {
+  COMMIT = "COMMIT",
+  ROLLBACK = "ROLLBACK"
+}
+
+export enum ExplainType {
+  RUN = "run",
+  DO_NOT_RUN = "doNotRun"
+}
+// End
 
 export interface JobLogEntry {
   MESSAGE_ID: string;

src/connection/types.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`],
@@ -207,10 +207,11 @@ export default class Schemas {
         case `schemas`:
           selects.push(
             [
-              `select '${type}' as OBJ_TYPE, '' as TABLE_TYPE, SCHEMA_NAME as NAME, SCHEMA_TEXT as TEXT, SYSTEM_SCHEMA_NAME as SYS_NAME, '' as SYS_SCHEMA, '' as SPECNAME, '' as BASE_SCHEMA, '' as BASE_OBJ`,
-              `from QSYS2.SYSSCHEMAS`,
+              ``,
+              `SELECT '${type}' as OBJ_TYPE, '' as TABLE_TYPE, OBJLONGNAME AS NAME, '' as TEXT, OBJNAME AS SYS_NAME, '' as SYS_SCHEMA, '' as SPECNAME, '' as BASE_SCHEMA, '' as BASE_OBJ`,
+              `FROM TABLE(QSYS2.OBJECT_STATISTICS('*ALLSIMPLE', 'LIB')) Z`,
               details.filter
-                ? `where UPPER(SCHEMA_NAME) = ? or UPPER(SYSTEM_SCHEMA_NAME) = ?`
+                ? `where UPPER(OBJLONGNAME) = ? or UPPER(OBJNAME) = ?`
                 : ``,
             ].join(` `)
           );
@@ -353,9 +354,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(
       [
@@ -373,7 +386,7 @@ export default class Schemas {
       type: object.OBJ_TYPE,
       tableType: object.TABLE_TYPE,
       schema,
-      name: object.NAME || undefined,
+      name: object.NAME || object.SYS_NAME || undefined,
       specificName: object.SPECNAME || undefined,
       text: object.TEXT || undefined,
       system: {

src/database/schemas.ts

@@ -144,27 +144,19 @@ async function getObjectCompletions(
   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(
@@ -339,14 +331,11 @@ async function getCompletionItemsForRefs(currentStatement: LanguageStatement.def
 
   const curClause = currentStatement.getClauseForOffset(offset);
   const tokenAtOffset = currentStatement.getTokenByOffset(offset);
-  let emptyObjectRefs: Boolean = false;
-
-  // Get all the schemas
-  if (objectRefs.length === 0 && cteList.length === 0) {
-    emptyObjectRefs = true;
-    completionItems.push(...(await getCachedSchemas()));
-  }
-
+  
+    // Get all the schemas
+    if (objectRefs.length === 0 && cteList.length === 0) {
+      completionItems.push(...(await getCachedSchemas()));
+    }
   // Set the default schema for all references without one
   for (let ref of objectRefs) {
     if (!ref.object.schema) {
@@ -392,7 +381,7 @@ async function getCompletionItemsForRefs(currentStatement: LanguageStatement.def
   completionItems.push(...aliasItems);
 
   // get completions for objects
-  if (tokenAtOffset === undefined && (emptyObjectRefs || curClause !== ClauseType.Unknown)) {
+  if (tokenAtOffset === undefined && (curClause !== ClauseType.Unknown)) {
     // get all the completion items for objects in each referenced schema
     completionItems.push(
       ...(await getObjectCompletions(getDefaultSchema(), completionTypes))

src/language/providers/completionProvider.ts

@@ -14,6 +14,7 @@ import { setCancelButtonVisibility } from "../results";
 import { JDBCOptions } from "@ibm/mapepire-js/dist/src/types";
 import { registerDb2iTablesProvider } from "../../aiProviders/continue/listTablesContextProvider";
 import { sqlLanguageStatus } from "../../language/providers";
+import { TransactionEndType } from "../../connection/types";
 
 const selectJobCommand = `vscode-db2i.jobManager.selectJob`;
 const activeColor = new vscode.ThemeColor(`minimapGutter.addedBackground`);
@@ -71,10 +72,10 @@ export class JobManagerView implements TreeDataProvider<any> {
 
                 switch (decision) {
                   case `Commit and end`:
-                    await selected.job.endTransaction("commit");
+                    await selected.job.endTransaction(TransactionEndType.COMMIT);
                     break;
                   case `Rollback and end`:
-                    await selected.job.endTransaction("rollback");
+                    await selected.job.endTransaction(TransactionEndType.ROLLBACK);
                     break;
                   default:
                     // Actually... don't end the job
@@ -245,7 +246,7 @@ export class JobManagerView implements TreeDataProvider<any> {
         let selected = id ? JobManager.getJob(id) : JobManager.getSelection();
         if (selected) {
           if (selected.job.underCommitControl()) {
-            const result = await selected.job.endTransaction("commit");
+            const result = await selected.job.endTransaction(TransactionEndType.ROLLBACK);
             if (!result.success) {
               vscode.window.showErrorMessage(`Failed to commit.` + result.error);
             }
@@ -261,7 +262,7 @@ export class JobManagerView implements TreeDataProvider<any> {
         if (selected) {
           if (selected.job.underCommitControl()) {
             try {
-              const result = await selected.job.endTransaction("rollback");
+              const result = await selected.job.endTransaction(TransactionEndType.ROLLBACK);
               if (!result.success) {
                 vscode.window.showErrorMessage(`Failed to rollback. ` + result.error);
               }

src/views/jobManager/jobManagerView.ts

@@ -15,8 +15,8 @@ import { DoveTreeDecorationProvider } from "./explain/doveTreeDecorationProvider
 import { ResultSetPanelProvider } from "./resultSetPanelProvider";
 import { generateSqlForAdvisedIndexes } from "./explain/advice";
 import { updateStatusBar } from "../jobManager/statusBar";
-import { ExplainType } from "@ibm/mapepire-js/dist/src/types";
 import { DbCache } from "../../language/providers/logic/cache";
+import { ExplainType } from "../../connection/types";
 
 export type StatementQualifier = "statement" | "update" | "explain" | "onlyexplain" | "json" | "csv" | "cl" | "sql";
 
@@ -355,7 +355,7 @@ async function runHandler(options?: StatementInfo) {
             const onlyExplain = statementDetail.qualifier === `onlyexplain`;
 
             chosenView.setLoadingText(onlyExplain ? `Explaining without running...` : `Explaining...`);
-            const explainType: ExplainType = onlyExplain ? "doNotRun" : "run";
+            const explainType: ExplainType = onlyExplain ? ExplainType.DO_NOT_RUN : ExplainType.RUN;
 
               setCancelButtonVisibility(true);
               const explained = await selectedJob.job.explain(statementDetail.content, explainType); // Can throw