🔨 Update knex abstraction to enforce DB transactions

LiskArchive · Jul 26, 2023 · 8350c36 · 8350c36
1 parent 89d3a7d
commit 8350c36
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 48 deletions.
diff --git a/framework/dist/lisk-service-framework-1.4.22.tgz b/framework/dist/lisk-service-framework-1.4.22.tgz
diff --git a/framework/package-lock.json b/framework/package-lock.json
diff --git a/framework/package.json b/framework/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lisk-service-framework",
-  "version": "1.4.21",
+  "version": "1.4.22",
   "description": "Lisk Service Framework",
   "keywords": [
     "lisk",

diff --git a/framework/src/database/sqlite3.js b/framework/src/database/sqlite3.js
@@ -102,7 +102,9 @@ const getTableInstance = async (tableConfig, dbDataDir = DB_DATA_DIR) => {
 			isDefaultTrx = true;
 		}
 
-		const query = trx.raw(queryStatement);
+		const query = trx
+			.raw(queryStatement)
+			.transacting(trx);
 
 		if (isDefaultTrx) return query
 			.then(async result => {

diff --git a/framework/src/database/util.js b/framework/src/database/util.js
@@ -114,10 +114,10 @@ const getTableInstance = (tableConfig, knex) => {
 
 		// Create all queries for `INSERT or UPDATE on Duplicate keys`
 		const queries = rows.map(row => knex(tableName)
-			.transacting(trx)
 			.insert(row)
 			.onConflict(primaryKey)
-			.merge(),
+			.merge()
+			.transacting(trx),
 		);
 
 		// Perform all queries within a batch together
@@ -133,8 +133,8 @@ const getTableInstance = (tableConfig, knex) => {
 		return Promise.all(queries);
 	};
 
-	const queryBuilder = (params, columns, isCountQuery, trx) => {
-		const query = knex(tableName).transacting(trx);
+	const queryBuilder = (params, columns, isCountQuery) => {
+		const query = knex(tableName);
 		const queryParams = resolveQueryParams(params);
 
 		if (isCountQuery) {
@@ -326,7 +326,10 @@ const getTableInstance = (tableConfig, knex) => {
 			isDefaultTrx = true;
 		}
 
-		const query = queryBuilder(params, tableConfig.primaryKey, false, trx).del();
+		const query = queryBuilder(params, tableConfig.primaryKey, false)
+			.del()
+			.transacting(trx);
+
 		if (isDefaultTrx) return query
 			.then(async result => {
 				await trx.commit();
@@ -347,7 +350,10 @@ const getTableInstance = (tableConfig, knex) => {
 		}
 
 		ids = Array.isArray(ids) ? ids : [ids];
-		const query = knex(tableName).transacting(trx).whereIn(primaryKey, ids).del();
+		const query = knex(tableName).whereIn(primaryKey, ids)
+			.del()
+			.transacting(trx);
+
 		if (isDefaultTrx) return query
 			.then(async result => {
 				await trx.commit();
@@ -368,8 +374,9 @@ const getTableInstance = (tableConfig, knex) => {
 		}
 
 		const { where, updates } = params;
-		const query = queryBuilder({ ...where }, tableConfig.primaryKey, false, trx)
-			.update({ ...updates });
+		const query = queryBuilder({ ...where }, tableConfig.primaryKey, false)
+			.update({ ...updates })
+			.transacting(trx);
 
 		if (isDefaultTrx) return query
 			.then(async result => {
@@ -395,7 +402,8 @@ const getTableInstance = (tableConfig, knex) => {
 			columns = Array.isArray(tableConfig.primaryKey)
 				? tableConfig.primaryKey : [tableConfig.primaryKey];
 		}
-		const query = queryBuilder(params, columns, false, trx);
+		const query = queryBuilder(params, columns, false)
+			.transacting(trx);
 		const debugSql = query.toSQL().toNative();
 		logger.debug(`${debugSql.sql}; bindings: ${debugSql.bindings}.`);
 
@@ -427,7 +435,8 @@ const getTableInstance = (tableConfig, knex) => {
 			column = Array.isArray(column) ? [column[0]] : [column];
 		}
 
-		const query = queryBuilder(params, column, true, trx);
+		const query = queryBuilder(params, column, true)
+			.transacting(trx);
 		const debugSql = query.toSQL().toNative();
 		logger.debug(`${debugSql.sql}; bindings: ${debugSql.bindings}.`);
 
@@ -452,7 +461,9 @@ const getTableInstance = (tableConfig, knex) => {
 			isDefaultTrx = true;
 		}
 
-		const query = trx.raw(queryStatement);
+		const query = trx
+			.raw(queryStatement)
+			.transacting(trx);
 
 		if (isDefaultTrx) return query
 			.then(async result => {
@@ -475,7 +486,9 @@ const getTableInstance = (tableConfig, knex) => {
 			isDefaultTrx = true;
 		}
 
-		const query = queryBuilder(params, false, false, trx).increment(params.increment);
+		const query = queryBuilder(params, false, false)
+			.increment(params.increment)
+			.transacting(trx);
 
 		if (isDefaultTrx) return query
 			.then(async result => {
@@ -496,7 +509,9 @@ const getTableInstance = (tableConfig, knex) => {
 			isDefaultTrx = true;
 		}
 
-		const query = queryBuilder(params, false, false, trx).decrement(params.decrement);
+		const query = queryBuilder(params, false, false)
+			.decrement(params.decrement)
+			.transacting(trx);
 
 		if (isDefaultTrx) return query
 			.then(async result => {