Merge branch 'codefori:main' into fix/token_tests

Author: janfh

.github/workflows/webpack_ci.yaml

@@ -35,7 +35,7 @@ jobs:
         cat $GITHUB_ENV
 
     - name: Upload dist artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: test_vsix
         path: ${{env.vsix_name}}
@@ -70,4 +70,4 @@ jobs:
           👋 A new build is available for this PR based on ${{ github.event.pull_request.head.sha }}.
 
           * [Download here.](https://github.com/codefori/vscode-db2i/actions/runs/${{ github.run_id }})
-          * [Read more about how to test](https://github.com/codefori/vscode-db2i/blob/master/.github/pr_testing_template.md)
+          * [Read more about how to test](https://github.com/codefori/vscode-db2i/blob/master/.github/pr_testing_template.md)

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.8.0",
+  "version": "1.8.3",
   "engines": {
     "vscode": "^1.95.0"
   },
@@ -970,7 +970,7 @@
         },
         {
           "command": "vscode-db2i.getObjectLocks",
-          "when": "viewItem == table || viewItem == view || viewItem == alias || viewItem == constraint || viewItem == function || viewItem == variable || viewItem == index || viewItem == procedure || viewItem == sequence || viewItem == package || viewItem == trigger || viewItem == type",
+          "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"
         },
         {
@@ -1322,7 +1322,7 @@
   },
   "devDependencies": {
     "@continuedev/core": "^1.0.13",
-    "@halcyontech/vscode-ibmi-types": "^2.14.0",
+    "@halcyontech/vscode-ibmi-types": "^2.14.5",
     "@types/glob": "^7.1.3",
     "@types/node": "18.x",
     "@types/vscode": "^1.95.0",

package.json

@@ -87,7 +87,7 @@ export class db2ContextProvider implements IContextProvider {
       const result = await selected.job
         .query<SelfCodeNode>(content)
         .execute(10000);
-      if (result.success) {
+      if (result.success && result.data) {
         const data: SelfCodeNode[] = result.data.map((row) => ({
           ...row,
           INITIAL_STACK: this.tryParseJson(row),

src/aiProviders/continue/continueContextProvider.ts

@@ -42,20 +42,18 @@ export class SQLStatementChecker implements IBMiComponent {
   private readonly functionName = VALIDATOR_NAME;
   private readonly currentVersion = 5;
 
-  private installedVersion = 1;
   private library = "";
 
   static get(): SQLStatementChecker|undefined {
     return getInstance()?.getConnection()?.getComponent<SQLStatementChecker>(SQLStatementChecker.ID);
   }
 
   reset() {
-    this.installedVersion = 0;
     this.library = "";
   }
 
   getIdentification(): ComponentIdentification {
-    return { name: SQLStatementChecker.ID, version: this.installedVersion };
+    return { name: SQLStatementChecker.ID, version: this.currentVersion };
   }
 
   static async getVersionOf(connection: IBMi, schema: string, name: string) {
@@ -79,8 +77,8 @@ export class SQLStatementChecker implements IBMiComponent {
       return `NeedsUpdate`;
     }
 
-    this.installedVersion = await SQLStatementChecker.getVersionOf(connection, this.library, this.functionName);
-    if (this.installedVersion < this.currentVersion) {
+    const installedVersion = await SQLStatementChecker.getVersionOf(connection, this.library, this.functionName);
+    if (installedVersion < this.currentVersion) {
       return `NeedsUpdate`;
     }
 

src/connection/syntaxChecker/index.ts

@@ -1,6 +1,6 @@
 
+import path from "path";
 import { getInstance } from "../base";
-
 import { JobManager } from "../config";
 
 export type SQLType = "schemas" | "tables" | "views" | "aliases" | "constraints" | "functions" | "variables" | "indexes" | "procedures" | "sequences" | "packages" | "triggers" | "types" | "logicals";
@@ -220,13 +220,27 @@ export default class Schemas {
    * @param object Not user input
    */
   static async generateSQL(schema: string, object: string, internalType: string): Promise<string> {
-    const lines = await JobManager.runSQL<{ SRCDTA: string }>([
-      `CALL QSYS2.GENERATE_SQL(?, ?, ?, CREATE_OR_REPLACE_OPTION => '1', PRIVILEGES_OPTION => '0')`
-    ].join(` `), { parameters: [object, schema, internalType] });
-
-    const generatedStatement = lines.map(line => line.SRCDTA).join(`\n`);
-
-    return generatedStatement;
+    const instance = getInstance();
+    const connection = instance.getConnection();
+
+    const result = await connection.withTempDirectory<string>(async (tempDir) => {
+      const tempFilePath = path.posix.join(tempDir, `generatedSql.sql`);
+      await JobManager.runSQL<{ SRCDTA: string }>([
+        `CALL QSYS2.GENERATE_SQL( DATABASE_OBJECT_NAME => ?, DATABASE_OBJECT_LIBRARY_NAME => ?, DATABASE_OBJECT_TYPE => ?
+                                , CREATE_OR_REPLACE_OPTION => '1', PRIVILEGES_OPTION => '0'
+                                , DATABASE_SOURCE_FILE_NAME => '*STMF'
+                                , STATEMENT_FORMATTING_OPTION => '0'
+                                , SOURCE_STREAM_FILE => '${tempFilePath}'
+                                , SOURCE_STREAM_FILE_END_OF_LINE => 'LF'
+                                , SOURCE_STREAM_FILE_CCSID => 1208 )`
+      ].join(` `), { parameters: [object, schema, internalType] });
+
+      // TODO: eventually .content -> .getContent(), it's not available yet
+      const contents = (await connection.content.downloadStreamfileRaw(tempFilePath)).toString();
+      return contents;
+    })
+
+    return result;
   }
 
   static async deleteObject(schema: string, name: string, type: string): Promise<void> {

src/database/schemas.ts

@@ -181,7 +181,7 @@ function addSymbol(base: MarkdownString, symbol: LookupResult) {
   else if ('COLUMN_NAME' in symbol) {
     base.appendCodeblock(prepareParamType(symbol) + `\n`, `sql`);
   }
-  else if ('name' in symbol) {
+  else if ('name' in symbol && symbol.text) {
     addList(base, [
       `**Description:** ${symbol.text}`,
     ]);

src/language/providers/hoverProvider.ts

@@ -302,6 +302,8 @@ export default class Statement {
 
 			for (const parameter of parameters) {
 				// If the first token is the parm type, then the name follows
+				if (tokenIs(parameter[0], `keyword`)) continue;
+				
 				let nameIndex = tokenIs(parameter[0], `parmType`) ? 1 : 0;
 				const name = parameter[nameIndex].value!;
 				// Include parmType if it is provided

src/language/sql/statement.ts

@@ -945,6 +945,96 @@ parserScenarios(`Object references`, ({newDoc}) => {
     expect(refs[1].object.schema).toBe(`LIB`);
   });
 
+  test('CREATE TABLE: routine parametes with primary key', () => {
+    const content = [
+      `--  Employee Master`,
+      `--  Generated on:               11/03/21 14:32:20`,
+      `CREATE OR REPLACE TABLE super_long_dept_name FOR SYSTEM NAME DEPT (`,
+      `--  SQL150B   10   REUSEDLT(*NO) in table EMPMST in PAYROLL1 ignored.`,
+      `  COL_B CHAR(1) CCSID 37 NOT NULL DEFAULT '' ,`,
+      `  PRIMARY KEY( COL_B ) );`,
+    ].join(`\n`);
+
+    const document = newDoc(content);
+    const groups = document.getStatementGroups();
+
+    expect(groups.length).toBe(1);
+    const createStatement = groups[0].statements[0];
+
+    expect(createStatement.type).toBe(StatementType.Create);
+
+    const parms = createStatement.getRoutineParameters();
+    expect(parms.length).toBe(1);
+    expect(parms[0].alias).toBe(`COL_B`);
+  });
+
+  test('CREATE TABLE: simple routine parametes test', () => {
+    const content = [
+      `CREATE TABLE ROSSITER.INVENTORY`,
+      `(PARTNO         SMALLINT     NOT NULL,`,
+      ` DESCR          VARCHAR(24),`,
+      ` QONHAND        INT)`,
+    ].join(`\n`);
+
+    const document = newDoc(content);
+    const groups = document.getStatementGroups();
+
+    expect(groups.length).toBe(1);
+    const createStatement = groups[0].statements[0];
+
+    expect(createStatement.type).toBe(StatementType.Create);
+
+    const parms = createStatement.getRoutineParameters();
+    expect(parms.length).toBe(3);
+
+    expect(parms[0].alias).toBe(`PARTNO`);
+    expect(parms[0].createType).toBe(`SMALLINT NOT NULL`);
+    
+    expect(parms[1].alias).toBe(`DESCR`);
+    expect(parms[1].createType).toBe(`VARCHAR(24)`);
+
+    expect(parms[2].alias).toBe(`QONHAND`);
+    expect(parms[2].createType).toBe(`INT`);
+  });
+
+  test('CREATE TABLE: generated types', () => {
+    const content = [
+      `CREATE TABLE policy_info`,
+      `  (policy_id CHAR(10) NOT NULL,`,
+      `  coverage INT NOT NULL,`,
+      `  sys_start TIMESTAMP(12) NOT NULL GENERATED ALWAYS AS ROW BEGIN,`,
+      `  sys_end TIMESTAMP(12) NOT NULL GENERATED ALWAYS AS ROW END,`,
+      `  create_id TIMESTAMP(12) GENERATED ALWAYS AS TRANSACTION START ID,`,
+      `  PERIOD SYSTEM_TIME(sys_start,sys_end));`,
+    ].join(`\n`);
+
+    const document = newDoc(content);
+    const groups = document.getStatementGroups();
+    
+    expect(groups.length).toBe(1);
+    const createStatement = groups[0].statements[0];
+
+    expect(createStatement.type).toBe(StatementType.Create);
+
+    const parms = createStatement.getRoutineParameters();
+    expect(parms.length).toBe(5);
+
+    expect(parms[0].alias).toBe(`policy_id`);
+    expect(parms[0].createType).toBe(`CHAR(10) NOT NULL`);
+
+    expect(parms[1].alias).toBe(`coverage`);
+    expect(parms[1].createType).toBe(`INT NOT NULL`);
+
+    expect(parms[2].alias).toBe(`sys_start`);
+    expect(parms[2].createType).toBe(`TIMESTAMP(12) NOT NULL GENERATED ALWAYS AS ROW BEGIN`);
+
+    expect(parms[3].alias).toBe(`sys_end`);
+    expect(parms[3].createType).toBe(`TIMESTAMP(12) NOT NULL GENERATED ALWAYS AS ROW END`);
+
+    expect(parms[4].alias).toBe(`create_id`);
+    expect(parms[4].createType).toBe(`TIMESTAMP(12) GENERATED ALWAYS AS TRANSACTION START ID`);
+  })
+
   test(`DECLARE VARIABLE`, () => {
     const document = newDoc(`declare watsonx_response   Varchar(10000) CCSID 1208;`);
     const groups = document.getStatementGroups();

src/language/sql/tests/statements.test.ts

@@ -82,7 +82,7 @@ export default class SQLTokeniser {
     {
       name: `KEYWORD`,
       match: [{ type: `word`, match: (value: string) => {
-        return [`AS`, `FOR`, `OR`, `REPLACE`, `BEGIN`, `DO`, `THEN`, `LOOP`, `END`, `CURSOR`, `DEFAULT`, `HANDLER`, `REFERENCES`, `ON`, `UNIQUE`, `SPECIFIC`, `EXTERNAL`, `ELSE`].includes(value.toUpperCase());
+        return [`AS`, `FOR`, `OR`, `REPLACE`, `BEGIN`, `DO`, `THEN`, `LOOP`, `END`, `CURSOR`, `DEFAULT`, `HANDLER`, `REFERENCES`, `ON`, `UNIQUE`, `PRIMARY`, `CONSTRAINT`, `SPECIFIC`, `PERIOD`, `RCDFMT`, `EXTERNAL`, `ELSE`].includes(value.toUpperCase());
       } }],
       becomes: `keyword`,
     },