Merge branch 'main' into feature/peek

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

Author: worksofliam

package-lock.json

@@ -2,7 +2,7 @@
   "name": "vscode-db2i",
   "displayName": "Db2 for IBM i",
   "description": "Db2 for IBM i tools in VS Code",
-  "version": "1.9.4",
+  "version": "1.11.0",
   "engines": {
     "vscode": "^1.95.0"
   },
@@ -32,7 +32,7 @@
   ],
   "main": "./dist/extension.js",
   "scripts": {
-    "language:test": "vitest",
+    "test": "vitest",
     "dsc": "npx tsx src/dsc",
     "package": "vsce package",
     "vscode:prepublish": "rm -rf dist && npm run webpack && npm run dsc",
@@ -227,7 +227,7 @@
       },
       {
         "id": "vscode-db2i.syntax",
-        "title": "SQL Syntax Checking",
+        "title": "SQL Syntax Options",
         "properties": {
           "vscode-db2i.syntax.checkOnOpen": {
             "type": "boolean",
@@ -248,6 +248,11 @@
             "type": "boolean",
             "description": "Whether SQL syntax warnings should show in the editor",
             "default": false
+          },
+          "vscode-db2i.syntax.useSystemNames": {
+            "type": "boolean",
+            "description": "Whether to use system names for columns in the content assist",
+            "default": false
           }
         }
       }
@@ -393,6 +398,11 @@
         "title": "Get Object Locks",
         "category": "Db2 for i"
       },
+      {
+        "command": "vscode-db2i.getRecordLocks",
+        "title": "Get Record Locks",
+        "category": "Db2 for i"
+      },
       {
         "command": "vscode-db2i.clearData",
         "title": "Clear...",
@@ -435,6 +445,11 @@
         "category": "Db2 for i",
         "icon": "$(search)"
       },
+      {
+        "command": "vscode-db2i.viewPermissions",
+        "title": "View permissions",
+        "category": "Db2 for i"
+      },
       {
         "command": "vscode-db2i.runEditorStatement",
         "title": "Run statement",
@@ -745,6 +760,58 @@
           "command": "vscode-db2i.setSchemaFilter",
           "when": "never"
         },
+        {
+          "command": "vscode-db2i.generateSQL",
+          "when": "never"
+        },
+        {
+          "command": "vscode-db2i.getRelatedObjects",
+          "when": "never"
+        },
+        {
+          "command": "vscode-db2i.getMTIs",
+          "when": "never"
+        },
+        {
+          "command": "vscode-db2i.getIndexes",
+          "when": "never"
+        },
+        {
+          "command": "vscode-db2i.getAuthorities",
+          "when": "never"
+        },
+        {
+          "command": "vscode-db2i.getObjectLocks",
+          "when": "never"
+        },
+        {
+          "command": "vscode-db2i.getRecordLocks",
+          "when": "never"
+        },
+        {
+          "command": "vscode-db2i.clearData",
+          "when": "never"
+        },
+        {
+          "command": "vscode-db2i.copyData",
+          "when": "never"
+        },
+        {
+          "command": "vscode-db2i.deleteObject",
+          "when": "never"
+        },
+        {
+          "command": "vscode-db2i.renameObject",
+          "when": "never"
+        },
+        {
+          "command": "vscode-db2i.advisedIndexes",
+          "when": "never"
+        },
+        {
+          "command": "vscode-db2i.clearAdvisedIndexes",
+          "when": "never"
+        },
         {
           "command": "vscode-db2i.resultset.settings",
           "when": "never"
@@ -1003,6 +1070,11 @@
           "when": "viewItem == table || viewItem == view || viewItem == alias || viewItem == function || viewItem == variable || viewItem == index || viewItem == procedure || viewItem == sequence || viewItem == package || viewItem == trigger || viewItem == type",
           "group": "db2workWith@5"
         },
+        {
+          "command": "vscode-db2i.getRecordLocks",
+          "when": "viewItem == table",
+          "group": "db2workWith@6"
+        },
         {
           "command": "vscode-db2i.clearData",
           "when": "viewItem == table",
@@ -1023,6 +1095,11 @@
           "when": "viewItem == table || viewItem == view || viewItem == index",
           "group": "db2data@4"
         },
+        {
+          "command": "vscode-db2i.viewPermissions",
+          "when": "viewItem == table || viewItem == view || viewItem == alias || viewItem == function || viewItem == variable || viewItem == index || viewItem == procedure || viewItem == sequence || viewItem == package || viewItem == trigger || viewItem == type",
+          "group": "db2data@5"
+        },
         {
           "command": "vscode-db2i.advisedIndexes",
           "when": "viewItem == table || viewItem == schema",
@@ -1400,7 +1477,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

@@ -38,7 +38,9 @@ export class SQLJobManager {
         "full open": false,
         "transaction isolation": "none",
         "query optimize goal": "1",
-        "block size": "512"
+        "block size": "512",
+        "date format": "iso",
+        "extended metadata": true,
       }));
 
       try {
@@ -132,6 +134,9 @@ 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();

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";
 import { NamingFormats } from "./manager";
 
@@ -131,7 +131,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 as JobStatus;
   }
 
   async connect(): Promise<ConnectionResult> {
@@ -141,12 +141,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
@@ -172,10 +172,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.`);
     }
 
@@ -229,13 +229,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`],
@@ -252,10 +252,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(` `)
           );
@@ -398,9 +399,15 @@ 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 (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 `);
+    }
 
     const objects: any[] = await JobManager.runSQL(
       [
@@ -417,7 +424,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

@@ -15,6 +15,7 @@ export default class Table {
       `SELECT `,
       `  column.TABLE_SCHEMA,`,
       `  column.TABLE_NAME,`,
+      `  column.SYSTEM_COLUMN_NAME,`,
       `  column.COLUMN_NAME,`,
       `  key.CONSTRAINT_NAME,`,
       `  column.DATA_TYPE, `,
@@ -70,8 +71,8 @@ export default class Table {
   }
 
   static async isPartitioned(schema: string, name: string): Promise<boolean> {
-    const sql = `select table_name, partitioned_table from qsys2.sysfiles where table_schema = ? and table_name = ? and partitioned_table is not null and partitioned_table = 'YES'`;
-    const parameters = [schema, name];
+    const sql = `select table_name, partitioned_table from qsys2.sysfiles where ((table_schema = ? and table_name = ?) or (system_table_schema = ? and system_table_name = ?)) and partitioned_table is not null and partitioned_table = 'YES'`;
+    const parameters = [schema, name, schema, name];
 
     const result = await JobManager.runSQL(sql, {parameters});
     return result.length > 0;