all tests green except classic.filters

alfateam · Jan 14, 2025 · d50a05f · d50a05f
1 parent 7873f77
commit d50a05f
Show file tree

Hide file tree

Showing 4 changed files with 170 additions and 146 deletions.
diff --git a/src/sap/mergeSql.js b/src/sap/mergeSql.js
@@ -1,7 +1,7 @@
 const getSessionSingleton = require('../table/getSessionSingleton');
+const quote = require('./quote');
 
 function insertSql(table, row, options) {
-	const quote = getSessionSingleton('quote');
 	let columnNames = [];
 	let conflictColumnUpdateSql = '';
 	let values = [];

diff --git a/src/table/column/json/formatOut.js b/src/table/column/json/formatOut.js
@@ -6,7 +6,7 @@ function formatOut(context, column, alias) {
 	if (formatColumn)
 		return formatColumn(column, alias);
 	else
-		return `${alias}.${quote(column._dbName)}`;
+		return `${alias}.${quote(context, column._dbName)}`;
 }
 
 module.exports = formatOut;
diff --git a/src/table/rollback.js b/src/table/rollback.js
@@ -15,7 +15,7 @@ function _rollback(context, e) {
 
 	if (e) {
 		if (e.message?.indexOf('ORA-01476: divisor is equal to zero') > -1)
-			return newThrow(new Error('Conflict when updating a column'), chain);
+			return newThrow(context, new Error('Conflict when updating a column'), chain);
 		let errors = e.message && e.message.split(conflictId) || [];
 		if (errors.length > 1) {
 			return newThrow(context, new Error(errors[1]), chain);