Merge pull request #85 from ThePrez:fix/autocloseandtracetests

fixup failing testcases on main

Author: worksofliam

src/connection/query.ts

@@ -34,9 +34,10 @@ export class Query<T> {
     return (undefined === id || '' === id) ? undefined : Query.globalQueryList.find(query => query.correlationId === id);
   }
 
-  public static getOpenIds(forJob?: string) {
+  public static getOpenIds(forJob?: SQLJob) {
     return this.globalQueryList
-      .filter(q => q.job.id === forJob || forJob === undefined)
+      .filter(q => q.job == forJob || forJob === undefined)
+      .filter(q => q.getState() === QueryState.NOT_YET_RUN || q.getState() === QueryState.RUN_MORE_DATA_AVAILABLE )
       .map(q => q.correlationId);
   }
 
@@ -67,13 +68,13 @@ export class Query<T> {
     let queryObject;
     if (this.isCLCommand) {
       queryObject = {
-        id: SQLJob.getNewUniqueRequestId(`clcommand`),
+        id: SQLJob.getNewUniqueId(`clcommand`),
         type: `cl`,
         cmd: this.sql
       };
     } else {
       queryObject = {
-        id: SQLJob.getNewUniqueRequestId(`query`),
+        id: SQLJob.getNewUniqueId(`query`),
         type: this.isPrepared ? `prepare_sql_execute` : `sql`,
         sql: this.sql,
         rows: rowsToFetch,
@@ -103,7 +104,7 @@ export class Query<T> {
         throw new Error('Statement has already been fully run');
     }
     let queryObject = {
-      id: SQLJob.getNewUniqueRequestId(`fetchMore`),
+      id: SQLJob.getNewUniqueId(`fetchMore`),
       cont_id: this.correlationId,
       type: `sqlmore`,
       sql: this.sql,
@@ -127,12 +128,14 @@ export class Query<T> {
     if (this.correlationId && this.state !== QueryState.RUN_DONE) {
       this.state = QueryState.RUN_DONE;
       let queryObject = {
-        id: SQLJob.getNewUniqueRequestId(`sqlclose`),
+        id: SQLJob.getNewUniqueId(`sqlclose`),
         cont_id: this.correlationId,
         type: `sqlclose`,
       };
 
       return this.job.send(JSON.stringify(queryObject));
+    } else if(undefined === this.correlationId) {
+      this.state = QueryState.RUN_DONE;
     }
   }
 

src/connection/sqlJob.ts

@@ -38,10 +38,14 @@ export class SQLJob {
   private traceFile: string|undefined;
   private isTracingChannelData: boolean = false;
 
+  //currently unused but we will inevitably need a unique ID assigned to each instance
+  // since server job names can be reused in some circumstances
+  private uniqueId = SQLJob.getNewUniqueId(`sqljob`);
+
   id: string | undefined;
 
 
-  public static getNewUniqueRequestId(prefix: string = `sqljob`): string {
+  public static getNewUniqueId(prefix: string = `id`): string {
     return prefix + (++SQLJob.uniqueIdCounter);
   }
 
@@ -108,7 +112,7 @@ export class SQLJob {
       .join(`;`)
 
     const connectionObject = {
-      id: SQLJob.getNewUniqueRequestId(),
+      id: SQLJob.getNewUniqueId(),
       type: `connect`,
       props: props.length > 0 ? props : undefined
     }
@@ -141,7 +145,7 @@ export class SQLJob {
 
   async getVersion(): Promise<VersionCheckResult> {
     const verObj = {
-      id: SQLJob.getNewUniqueRequestId(),
+      id: SQLJob.getNewUniqueId(),
       type: `getversion`
     };
 
@@ -162,7 +166,7 @@ export class SQLJob {
 
   async getTraceData(): Promise<GetTraceDataResult> {
     const tracedataReqObj = {
-      id: SQLJob.getNewUniqueRequestId(),
+      id: SQLJob.getNewUniqueId(),
       type: `gettracedata`
     };
 
@@ -179,7 +183,7 @@ export class SQLJob {
 
   async setTraceConfig(dest: ServerTraceDest, level: ServerTraceLevel): Promise<SetConfigResult> {
     const reqObj = {
-      id: SQLJob.getNewUniqueRequestId(),
+      id: SQLJob.getNewUniqueId(),
       type: `setconfig`,
       tracedest: dest,
       tracelevel: level
@@ -230,9 +234,13 @@ export class SQLJob {
     return this.query<JobLogEntry>(query).run();
   }
 
+  getUniqueId() {
+    return this.uniqueId;
+  }
+
   async close() {
     const exitObject = {
-      id: SQLJob.getNewUniqueRequestId(),
+      id: SQLJob.getNewUniqueId(),
       type: `exit`
     };
 

src/testing/jobs.ts

@@ -55,7 +55,7 @@ export const JobsSuite: TestSuite = {
       let newJob = new SQLJob();
       await newJob.connect();
       let trace = await newJob.getTraceData();
-      assert.equal(``, trace.tracedata);
+      assert.notEqual(undefined, trace.tracedata);
       newJob.close();
     }},
 
@@ -92,20 +92,19 @@ export const JobsSuite: TestSuite = {
       const noAutoClose = newJob.query(`select * from QIWS.QCUSTCDT`, {autoClose: false});
       const neverRuns = newJob.query(`select * from QIWS.QCUSTCDT`, {autoClose: true});
 
-      assert.strictEqual(Query.getOpenIds(newJob.id).length, 3);
+      assert.strictEqual(Query.getOpenIds(newJob).length, 3);
 
       // If we ran this, two both autoClose statements would be cleaned up
       // await Query.cleanup();
 
       await Promise.all([autoCloseAnyway.run(1), noAutoClose.run(1)]);
-
-      assert.strictEqual(Query.getOpenIds(newJob.id).length, 3);
+      assert.strictEqual(Query.getOpenIds(newJob).length, 3);
 
       // Now cleanup should auto close autoCloseAnyway and neverRuns,
       // but not noAutoClose because it hasn't finished running
       await Query.cleanup();
 
-      const leftOverIds = Query.getOpenIds(newJob.id);
+      const leftOverIds = Query.getOpenIds(newJob);
       assert.strictEqual(leftOverIds.length, 1);
 
       assert.strictEqual(noAutoClose.getId(), leftOverIds[0]);

src/testing/manager.ts

@@ -66,36 +66,6 @@ export const ManagerSuite: TestSuite = {
       assert.strictEqual(JobManager.selectedJob, -1);
     }},
 
-    {name: `runSQL method`, test: async () => {
-      assert.strictEqual(ServerComponent.isInstalled(), true);
-
-      // Ensure we have a blank manager first
-      await JobManager.endAll();
-      assert.strictEqual(JobManager.getRunningJobs().length, 0);
-      assert.strictEqual(JobManager.selectedJob, -1);
-
-      const query = `select * from qiws.qcustcdt`;
-
-      // Run query with no jobs should still work, using the standard API
-      const rowsA = await JobManager.runSQL(query);
-      assert.notStrictEqual(rowsA.length, 0);
-
-      await JobManager.newJob();
-
-      // Check the job exists
-      assert.strictEqual(JobManager.getRunningJobs().length, 1);
-      assert.strictEqual(JobManager.selectedJob, 0);
-
-      // Run query will run the statement using the selected job
-      const rowsB = await JobManager.runSQL(query);
-      assert.notStrictEqual(rowsB.length, 0);
-      
-      // End the jobs
-      await JobManager.endAll();
-      assert.strictEqual(JobManager.getRunningJobs().length, 0);
-      assert.strictEqual(JobManager.selectedJob, -1);
-    }},
-
     {name: `Set selected by name`, test: async () => {
       assert.strictEqual(ServerComponent.isInstalled(), true);