Use cancelled status for statements following error (sqlpad#919)

rickbergfalk · web-flow · commit 8254ccf34467 · 2020-12-03T19:45:01.000-06:00
diff --git a/server/lib/execute-batch.js b/server/lib/execute-batch.js
@@ -73,24 +73,29 @@ async function executeBatch(config, models, webhooks, batchId) {
         durationMs: stopTime - batchStartTime,
       });
       webhooks.statementFinished(user, connection, updatedBatch, statement.id);
-      webhooks.batchFinished(user, connection, updatedBatch);
       break;
     }
   }
   stopTime = new Date();
 
+  if (statementError) {
+    await models.statements.updateErrorQueuedToCancelled(batchId);
+  }
+
   if (!statementError) {
-    const updatedBatch = await models.batches.update(batch.id, {
+    await models.batches.update(batch.id, {
       status: 'finished',
       stopTime,
       durationMs: stopTime - batchStartTime,
     });
-    webhooks.batchFinished(user, connection, updatedBatch);
   }
 
   if (disconnectOnFinish) {
     await connectionClient.disconnect();
   }
+
+  const finalBatch = await models.batches.findOneById(batchId);
+  webhooks.batchFinished(user, connection, finalBatch);
 }
 
 module.exports = executeBatch;
diff --git a/server/models/statements.js b/server/models/statements.js
@@ -138,9 +138,17 @@ class Statements {
       error,
     };
     await this.sequelizeDb.Statements.update(update, { where: { id } });
+
     return this.findOneById(id);
   }
 
+  async updateErrorQueuedToCancelled(batchId) {
+    await this.sequelizeDb.Statements.update(
+      { status: 'cancelled' },
+      { where: { batchId, status: 'queued' } }
+    );
+  }
+
   async updateFinished(id, queryResult, stopTime, durationMs) {
     const { config } = this;
     const dbPath = config.get('dbPath');
diff --git a/server/sequelize-db/batches.js b/server/sequelize-db/batches.js
@@ -28,6 +28,7 @@ module.exports = function (sequelize) {
         validate: {
           // Potentially add 'cancelled'?
           // We have no way of canceling current statement but future could be
+          // If a batch errors, any statements following error will be "cancelled" status
           isIn: [['started', 'finished', 'error']],
         },
         defaultValue: 'started',
diff --git a/server/sequelize-db/statements.js b/server/sequelize-db/statements.js
@@ -21,11 +21,13 @@ module.exports = function (sequelize) {
         type: Sequelize.TEXT,
         allowNull: false,
       },
+      // If a batch errors, any statements following error will be "cancelled" status
+      // At this time statements/batches cannot be cancelled otherwise
       status: {
         type: Sequelize.STRING,
         allowNull: false,
         validate: {
-          isIn: [['queued', 'started', 'finished', 'error']],
+          isIn: [['queued', 'started', 'finished', 'error', 'cancelled']],
         },
         defaultValue: 'queued',
       },
diff --git a/server/test/api/batches.js b/server/test/api/batches.js
@@ -199,7 +199,7 @@ describe('api/batches', function () {
     assert.deepEqual(b.statements[0].error, {
       title: 'SQLITE_ERROR: incomplete input',
     });
-    assert.equal(b.statements[1].status, 'queued');
+    assert.equal(b.statements[1].status, 'cancelled');
     assert.equal(b.statements[1].rowCount, null, 'no rowCount');
     assert.equal(b.statements[1].resultsPath, null, 'no resultpath');
     assert.equal(b.statements[1].startTime, null, 'no startTime');
