velocious 1.0.56 → 1.0.58

package/package.json

@@ -3,7 +3,7 @@
     "velocious": "bin/velocious.js"
   },
   "name": "velocious",
-  "version": "1.0.56",
+  "version": "1.0.58",
   "main": "index.js",
   "scripts": {
     "test": "VELOCIOUS_TEST_DIR=../ cd spec/dummy && npx velocious test",
@@ -29,6 +29,7 @@
     "diggerize": "^1.0.5",
     "ejs": "^3.1.6",
     "env-sense": "^1.0.0",
+    "epic-locks": "^1.0.3",
     "escape-string-regexp": "^1.0.5",
     "incorporator": "^1.0.2",
     "inflection": "^3.0.0",

package/src/database/drivers/base.js

@@ -1,6 +1,7 @@
 import {Logger} from "../../logger.js"
 import Query from "../query/index.js"
 import Handler from "../handler.js"
+import Mutex from "epic-locks/src/mutex.js"
 import strftime from "strftime"
 import UUID from "pure-uuid"
 import TableData from "../table-data/index.js"
@@ -11,8 +12,10 @@ export default class VelociousDatabaseDriversBase {
   constructor(config, configuration) {
     this._args = config
     this.configuration = configuration
+    this.mutex = new Mutex() // Can be used to lock this instance for exclusive use
     this.logger = new Logger(this)
     this._transactionsCount = 0
+    this._transactionsActionsMutex = new Mutex()
   }
 
   async addForeignKey(tableName, columnName, referencedTableName, referencedColumnName, args) {
@@ -206,18 +209,36 @@ export default class VelociousDatabaseDriversBase {
   }
 
   async startTransaction() {
+    await this._transactionsActionsMutex.sync(async () => {
+      await this._startTransactionAction()
+      this._transactionsCount++
+    })
+  }
+
+  async _startTransactionAction() {
     await this.query("BEGIN TRANSACTION")
-    this._transactionsCount++
   }
 
   async commitTransaction() {
+    await this._transactionsActionsMutex.sync(async () => {
+      await this._commitTransactionAction()
+      this._transactionsCount--
+    })
+  }
+
+  async _commitTransactionAction() {
     await this.query("COMMIT")
-    this._transactionsCount--
   }
 
   async rollbackTransaction() {
+    await this._transactionsActionsMutex.sync(async () => {
+      await this._rollbackTransactionAction()
+      this._transactionsCount--
+    })
+  }
+
+  async _rollbackTransactionAction() {
     await this.query("ROLLBACK")
-    this._transactionsCount--
   }
 
   generateSavePointName() {
@@ -225,6 +246,12 @@ export default class VelociousDatabaseDriversBase {
   }
 
   async startSavePoint(savePointName) {
+    await this._transactionsActionsMutex.sync(async () => {
+      await this._startSavePointAction(savePointName)
+    })
+  }
+
+  async _startSavePointAction(savePointName) {
     await this.query(`SAVEPOINT ${savePointName}`)
   }
 
@@ -245,10 +272,22 @@ export default class VelociousDatabaseDriversBase {
   }
 
   async releaseSavePoint(savePointName) {
+    await this._transactionsActionsMutex.sync(async () => {
+      await this._releaseSavePointAction(savePointName)
+    })
+  }
+
+  async _releaseSavePointAction(savePointName) {
     await this.query(`RELEASE SAVEPOINT ${savePointName}`)
   }
 
   async rollbackSavePoint(savePointName) {
+    await this._transactionsActionsMutex.sync(async () => {
+      await this._rollbackSavePointAction(savePointName)
+    })
+  }
+
+  async _rollbackSavePointAction(savePointName) {
     await this.query(`ROLLBACK TO SAVEPOINT ${savePointName}`)
   }
 

package/src/database/drivers/mssql/index.js

@@ -203,42 +203,39 @@ export default class VelociousDatabaseDriversMssql extends Base{
     return this._options
   }
 
-  async startTransaction() {
+  async _startTransactionAction() {
     if (!this.connection) throw new Error("No connection")
     if (this._currentTransaction) throw new Error("A transaction is already running")
 
     this._currentTransaction = new mssql.Transaction(this.connection)
 
     await this._currentTransaction.begin()
-    this._transactionsCount++
   }
 
-  async commitTransaction() {
+  async _commitTransactionAction() {
     if (!this._currentTransaction) throw new Error("A transaction isn't running")
 
     await this._currentTransaction.commit()
     this._currentTransaction = null
-    this._transactionsCount--
   }
 
-  async rollbackTransaction() {
+  async _rollbackTransactionAction() {
     if (!this._currentTransaction) throw new Error("A transaction isn't running")
 
     await this._currentTransaction.rollback()
 
     this._currentTransaction = null
-    this._transactionsCount--
   }
 
-  async startSavePoint(savePointName) {
+  async _startSavePointAction(savePointName) {
     await this.query(`SAVE TRANSACTION [${savePointName}]`)
   }
 
-  async releaseSavePoint(savePointName) {
+  async _releaseSavePointAction(savePointName) {
     // Do nothing in MS-SQL.
   }
 
-  async rollbackSavePoint(savePointName) {
+  async _rollbackSavePointAction(savePointName) {
     await this.query(`ROLLBACK TRANSACTION [${savePointName}]`)
   }
 

package/src/database/drivers/mysql/index.js

@@ -161,9 +161,8 @@ export default class VelociousDatabaseDriversMysql extends Base{
     return this._options
   }
 
-  async startTransaction() {
+  async _startTransactionAction() {
     await this.query("START TRANSACTION")
-    this._transactionsCount++
   }
 
   updateSql({conditions, data, tableName}) {

package/src/database/drivers/pgsql/index.js

@@ -174,9 +174,8 @@ export default class VelociousDatabaseDriversPgsql extends Base{
     return this._options
   }
 
-  async startTransaction() {
+  async _startTransactionAction() {
     await this.query("START TRANSACTION")
-    this._transactionsCount++
   }
 
   updateSql({conditions, data, tableName}) {