orange-orm 4.5.0-beta.0 → 4.5.0-beta.1

package/src/sap/insert.js

@@ -5,16 +5,16 @@ let executeQueries = require('../table/executeQueries');
 let pushCommand = require('../table/commands/pushCommand');
 
 
-function insertDefault(table, row, options) {
+function insertDefault(context, table, row, options) {
 	let commands = [];
-	let insertCmd = newInsertCommand(newInsertCommandCore, table, row, options);
+	let insertCmd = newInsertCommand(newInsertCommandCore.bind(null, context), table, row, options);
 	insertCmd.disallowCompress = true;
-	pushCommand(insertCmd);
+	pushCommand(context, insertCmd);
 
-	let selectCmd = newGetLastInsertedCommand(table, row, insertCmd);
+	let selectCmd = newGetLastInsertedCommand(context, table, row, insertCmd);
 	commands.push(selectCmd);
 
-	return executeQueries(commands).then((result) => result[result.length - 1]);
+	return executeQueries(context, commands).then((result) => result[result.length - 1]);
 
 }
 

package/src/sap/insertSql.js

@@ -1,12 +1,12 @@
-const getSessionSingleton = require('../table/getSessionSingleton');
 const mergeSql = require('./mergeSql');
+const quote = require('./quote');
 
-function getSqlTemplate(_table, _row, options) {
+function getSqlTemplate(_context, _table, _row, options) {
 
 	if (hasConcurrency(_table, options) && hasColumns())
-		return mergeSql.apply(null, arguments);
+		return mergeSql.apply(null, [...arguments].slice(1));
 	else
-		return insertSql.apply(null, arguments);
+		return insertSql.apply(null, [...arguments].slice(1));
 
 	function hasColumns() {
 		for(let p in _row) {
@@ -27,7 +27,6 @@ function hasConcurrency(table,options) {
 }
 
 function insertSql(table, row) {
-	const quote = getSessionSingleton('quote');
 	let columnNames = [];
 	let regularColumnNames = [];
 	let values = [];

package/src/sap/lastInsertedSql.js

@@ -1,10 +1,10 @@
-function lastInsertedSql(table, keyValues) {
-	return keyValues.map((value,i) => {
+function lastInsertedSql(context, table, keyValues) {
+	return keyValues.map((value, i) => {
 		let column = table._primaryColumns[i];
 		if (value === undefined && column.tsType === 'NumberColumn')
 			return `${column._dbName}=@@identity`;
 		else
-			return column.eq(value);
+			return column.eq(context, value);
 	});
 
 }

package/src/sap/mergeSql.js

@@ -1,7 +1,6 @@
-const getSessionSingleton = require('../table/getSessionSingleton');
+const quote = require('./quote');
 
 function insertSql(table, row, options) {
-	const quote = getSessionSingleton('quote');
 	let columnNames = [];
 	let conflictColumnUpdateSql = '';
 	let values = [];

package/src/sap/newDatabase.js

@@ -4,10 +4,6 @@ let _begin = require('../table/begin');
 let commit = require('../table/commit');
 let rollback = require('../table/rollback');
 let newPool = require('./newPool');
-let useHook = require('../useHook');
-let promise = require('promise/domains');
-let versionArray = process.version.replace('v', '').split('.');
-let major = parseInt(versionArray[0]);
 let express = require('../hostExpress');
 let hostLocal = require('../hostLocal');
 let doQuery = require('../query');
@@ -34,15 +30,12 @@ function newDatabase(connectionString, poolOptions) {
 
 		if (fn)
 			return domain.run(runInTransaction);
-		else if ((major >= 12) && useHook()) {
-			domain.exitContext = true;
-			return domain.start().then(run);
-		}
 		else
 			return domain.run(run);
 
+
 		function begin() {
-			return _begin(options?.readonly);
+			return _begin(domain, options);
 		}
 
 		async function runInTransaction() {
@@ -50,69 +43,65 @@ function newDatabase(connectionString, poolOptions) {
 			let transaction = newTransaction(domain, pool, options);
 			await new Promise(transaction)
 				.then(begin)
-				.then(fn)
+				.then(() => fn(domain))
 				.then((res) => result = res)
-				.then(c.commit)
-				.then(null, c.rollback);
+				.then(() => commit(domain))
+				.then(null, (e) => rollback(domain, e));
 			return result;
+
 		}
 
 		function run() {
 			let p;
 			let transaction = newTransaction(domain, pool, options);
-			if (useHook())
-				p = new Promise(transaction);
-			else
-				p = new promise(transaction);
+			p = new Promise(transaction);
 
 			return p.then(begin);
 		}
 
 	};
 
-	c.createTransaction = function() {
+	c.createTransaction = function(options) {
 		let domain = createDomain();
 		let transaction = newTransaction(domain, pool);
-		let p = domain.run(() => new Promise(transaction).then(_begin));
+		let p = domain.run(() => new Promise(transaction).then(begin));
 
 		function run(fn) {
-			return p.then(domain.run.bind(domain, fn));
+			return p.then(() => fn(domain));
 		}
-		return run;
-	};
-
-	c.bindTransaction = function() {
-		// @ts-ignore
-		var domain = process.domain;
-		let p = domain.run(() => true);
 
-		function run(fn) {
-			return p.then(domain.run.bind(domain, fn));
+		function begin() {
+			return _begin(domain, options);
 		}
+
+		run.rollback = rollback.bind(null, domain);
+		run.commit = commit.bind(null, domain);
+
 		return run;
+
 	};
 
+
+
 	c.query = function(query) {
 		let domain = createDomain();
 		let transaction = newTransaction(domain, pool);
 		let p = domain.run(() => new Promise(transaction)
-			.then(() => setSessionSingleton('changes', []))
-			.then(() => doQuery(query).then(onResult, onError)));
+			.then(() => setSessionSingleton(domain, 'changes', []))
+			.then(() => doQuery(domain, query).then(onResult, onError)));
 		return p;
 
 		function onResult(result) {
-			releaseDbClient();
+			releaseDbClient(domain);
 			return result;
 		}
 
 		function onError(e) {
-			releaseDbClient();
+			releaseDbClient(domain);
 			throw e;
 		}
 	};
 
-
-
 	c.rollback = rollback;
 	c.commit = commit;
 

package/src/sap/newPool.js

@@ -1,5 +1,5 @@
+const promisify = require('node:util').promisify;
 var pools = require('../pools');
-var promise = require('../table/promise');
 var end = require('./pool/end');
 var newGenericPool = require('../mssql/pool/newGenericPool');
 var newId = require('../newId');
@@ -11,7 +11,7 @@ function newPool(connectionString, poolOptions) {
 	var c = {};
 
 	c.connect = pool.connect;
-	c.end = promise.denodeify(boundEnd);
+	c.end = promisify(boundEnd);
 	pools[id] = c;
 	return c;
 }

package/src/sap/newTransaction.js

@@ -7,6 +7,7 @@ const formatDateOut = require('./formatDateOut');
 const insertSql = require('./insertSql');
 const insert = require('./insert');
 const limitAndOffset = require('./limitAndOffset');
+const quote = require('./quote');
 
 function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 	var rdb = {poolFactory: pool};
@@ -40,7 +41,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 		caller.visitSap();
 	};
 	rdb.aggregateCount = 0;
-	rdb.quote = (name) => `[${name}]`;
+	rdb.quote = quote;
 
 	if (readonly) {
 		rdb.dbClient = {

package/src/sap/quote.js

@@ -0,0 +1 @@
+module.exports = (name) => `[${name}]`;

package/src/sqlite/deleteFromSql.js

@@ -1,6 +1,6 @@
 var format = 'delete from %s where %s.rowId in (SELECT %s.rowId FROM %s %s%s)';
 var util = require('util');
-const quote = require('../table/quote');
+const quote = require('./quote');
 
 function deleteFromSql(table, alias, whereSql) {
 	var name = quote(table._dbName);

package/src/sqlite/insert.js

@@ -5,16 +5,16 @@ let executeQueries = require('../table/executeQueries');
 let pushCommand = require('../table/commands/pushCommand');
 
 
-function insertDefault(table, row, options) {
+function insertDefault(context, table, row, options) {
 	let commands = [];
-	let insertCmd = newInsertCommand(newInsertCommandCore, table, row, options);
+	let insertCmd = newInsertCommand(newInsertCommandCore.bind(null, context), table, row, options);
 	insertCmd.disallowCompress = true;
-	pushCommand(insertCmd);
+	pushCommand(context, insertCmd);
 
-	let selectCmd = newGetLastInsertedCommand(table, row, insertCmd);
+	let selectCmd = newGetLastInsertedCommand(context, table, row, insertCmd);
 	commands.push(selectCmd);
 
-	return executeQueries(commands).then((result) => result[result.length - 1]);
+	return executeQueries(context, commands).then((result) => result[result.length - 1]);
 
 }
 

package/src/sqlite/insertSql.js

@@ -1,6 +1,6 @@
-const quote = require('../table/quote');
+const quote = require('./quote');
 
-function insertSql(table, row, options) {
+function insertSql(_context, table, row, options) {
 	let columnNames = [];
 	let conflictColumnUpdateSql = '';
 	let values = [];

package/src/sqlite/lastInsertedSql.js

@@ -1,10 +1,10 @@
-function lastInsertedSql(table, keyValues) {
+function lastInsertedSql(context, table, keyValues) {
 	return keyValues.map((value,i) => {
 		let column = table._primaryColumns[i];
 		if (value === undefined && column.tsType === 'NumberColumn')
 			return 'rowid IN (select last_insert_rowid())';
 		else
-			return column.eq(value);
+			return column.eq(context, value);
 	});
 
 }

package/src/sqlite/newDatabase.js

@@ -4,10 +4,6 @@ let _begin = require('../table/begin');
 let commit = require('../table/commit');
 let rollback = require('../table/rollback');
 let newPool = require('./newPool');
-let useHook = require('../useHook');
-let promise = require('promise/domains');
-let versionArray = process.version.replace('v', '').split('.');
-let major = parseInt(versionArray[0]);
 let express = require('../hostExpress');
 let hostLocal = require('../hostLocal');
 let doQuery = require('../query');
@@ -34,15 +30,11 @@ function newDatabase(connectionString, poolOptions) {
 
 		if (fn)
 			return domain.run(runInTransaction);
-		else if ((major >= 12) && useHook()) {
-			domain.exitContext = true;
-			return domain.start().then(run);
-		}
 		else
 			return domain.run(run);
 
 		function begin() {
-			return _begin(options?.readonly);
+			return _begin(domain, options);
 		}
 
 		async function runInTransaction() {
@@ -50,63 +42,55 @@ function newDatabase(connectionString, poolOptions) {
 			let transaction = newTransaction(domain, pool, options);
 			await new Promise(transaction)
 				.then(begin)
-				.then(fn)
+				.then(() => fn(domain))
 				.then((res) => result = res)
-				.then(c.commit)
-				.then(null, c.rollback);
+				.then(() => commit(domain))
+				.then(null, (e) => rollback(domain, e));
 			return result;
 		}
 
 		function run() {
 			let p;
 			let transaction = newTransaction(domain, pool, options);
-			if (useHook())
-				p = new Promise(transaction);
-			else
-				p = new promise(transaction);
+			p = new Promise(transaction);
 
 			return p.then(begin);
 		}
 
 	};
 
-	c.createTransaction = function() {
+	c.createTransaction = function(options) {
 		let domain = createDomain();
 		let transaction = newTransaction(domain, pool);
-		let p = domain.run(() => new Promise(transaction).then(_begin));
+		let p = domain.run(() => new Promise(transaction).then(begin));
 
 		function run(fn) {
-			return p.then(domain.run.bind(domain, fn));
+			return p.then(() => fn(domain));
 		}
+		run.rollback = rollback.bind(null, domain);
+		run.commit = commit.bind(null, domain);
 		return run;
-	};
-
-	c.bindTransaction = function() {
-		// @ts-ignore
-		var domain = process.domain;
-		let p = domain.run(() => true);
 
-		function run(fn) {
-			return p.then(domain.run.bind(domain, fn));
+		function begin() {
+			return _begin(domain, options);
 		}
-		return run;
 	};
 
 	c.query = function(query) {
 		let domain = createDomain();
 		let transaction = newTransaction(domain, pool);
 		let p = domain.run(() => new Promise(transaction)
-			.then(() => setSessionSingleton('changes', []))
-			.then(() => doQuery(query).then(onResult, onError)));
+			.then(() => setSessionSingleton(domain, 'changes', []))
+			.then(() => doQuery(domain, query).then(onResult, onError)));
 		return p;
 
 		function onResult(result) {
-			releaseDbClient();
+			releaseDbClient(domain);
 			return result;
 		}
 
 		function onError(e) {
-			releaseDbClient();
+			releaseDbClient(domain);
 			throw e;
 		}
 	};

package/src/sqlite/newPool.js

@@ -1,17 +1,17 @@
-var pools = require('../pools');
-var promise = require('../table/promise');
-var end = require('./pool/end');
-var newGenericPool = require('./pool/newGenericPool');
-var newId = require('../newId');
+const promisify = require('node:util').promisify;
+const pools = require('../pools');
+const end = require('./pool/end');
+const newGenericPool = require('./pool/newGenericPool');
+const newId = require('../newId');
 
 function newPool(connectionString, poolOptions) {
-	var pool = newGenericPool(connectionString, poolOptions);
-	var id = newId();
-	var boundEnd = end.bind(null, pool, id);
-	var c = {};
+	let pool = newGenericPool(connectionString, poolOptions);
+	let id = newId();
+	let boundEnd = end.bind(null, pool, id);
+	let c = {};
 
 	c.connect = pool.connect;
-	c.end = promise.denodeify(boundEnd);
+	c.end = promisify(boundEnd);
 	pools[id] = c;
 	return c;
 }

package/src/sqlite/newTransaction.js

@@ -6,6 +6,7 @@ const lastInsertedSql = require('./lastInsertedSql');
 const limitAndOffset = require('./limitAndOffset');
 const insertSql = require('./insertSql');
 const insert = require('./insert');
+const quote = require('./quote');
 
 function newResolveTransaction(domain, pool, { readonly = false } = {})  {
 	var rdb = {poolFactory: pool};
@@ -29,7 +30,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {})  {
 		caller.visitSqlite();
 	};
 	rdb.aggregateCount = 0;
-	rdb.quote = (name) => `"${name}"`;
+	rdb.quote = quote;
 
 	if (readonly) {
 		rdb.dbClient = {

package/src/sqlite/pool/newGenericPool.js

@@ -1,7 +1,8 @@
 /* eslint-disable no-prototype-builtins */
 var EventEmitter = require('events').EventEmitter;
 
-var defaults = require('./defaults');
+var defaults = require('../../poolDefaults');
+
 var genericPool = require('../../generic-pool');
 var sqlite = require('sqlite3');
 

package/src/sqlite/quote.js

@@ -0,0 +1 @@
+module.exports = (name) => `"${name}"`;

package/src/table/aggregate.js

@@ -1,6 +1,6 @@
 function newAggregate(table) {
 
-	function aggregate(fn) {
+	function aggregate(_context, fn) {
 		return fn(table);
 	}
 	return aggregate;

package/src/table/begin.js

@@ -2,13 +2,13 @@ let beginCommand = require('./commands/beginCommand');
 let executeQuery = require('./executeQueries/executeQuery');
 let setSessionSingleton = require('./setSessionSingleton');
 
-function begin(readonly) {
-	setSessionSingleton('changes', []);
-	if (readonly) {
-		setSessionSingleton('transactionLess', true);
+function begin(context, transactionLess) {
+	setSessionSingleton(context, 'changes', []);
+	if (transactionLess) {
+		setSessionSingleton(context, 'transactionLess', true);
 		return Promise.resolve();
 	}
-	return executeQuery(beginCommand());
+	return executeQuery(context, beginCommand(context));
 }
 
 module.exports = begin;

package/src/table/cascadeDelete.js

@@ -2,10 +2,10 @@ var _delete = require('./delete');
 var newObject = require('../newObject');
 var newCascadeDeleteStrategy = require('./newCascadeDeleteStrategy');
 
-function cascadeDelete(table, filter) {
+function cascadeDelete(context, table, filter) {
 	var empty = newObject();
 	var strategy = newCascadeDeleteStrategy(empty, table);
-	return _delete(table, filter, strategy);
+	return _delete(context, table, filter, strategy);
 }
 
 module.exports = cascadeDelete;

package/src/table/column/binary/newDecode.js

@@ -3,8 +3,8 @@ var newDecodeCore = require('../newDecodeCore');
 function _new(column) {
 	var decodeCore = newDecodeCore(column);
 
-	return function(value) {
-		value = decodeCore(value);
+	return function(context, value) {
+		value = decodeCore(context, value);
 		if (value === null)
 			return value;
 		else

package/src/table/column/binary/newEncode.js

@@ -3,21 +3,20 @@ var newParam = require('../../query/newParameterized');
 
 function _new(_column) {
 
-
-	function encode(value) {
+	function encode(_context, value) {
 		value = purify(value);
 		if (value === null)
 			return newParam('null');
 		return newParam('?', [Buffer.from(value, 'base64')]);
 	}
-	encode.unsafe = function(value) {
+	encode.unsafe = function(_context, value) {
 		value = purify(value);
 		if (value === null)
 			return 'null';
 		return Buffer.from(value, 'base64');
 	};
 
-	encode.direct = function(value) {
+	encode.direct = function(_context, value) {
 		return Buffer.from(value, 'base64');
 	};
 

package/src/table/column/boolean/newDecode.js

@@ -2,7 +2,7 @@ var purify = require('./purify');
 
 function _new(column) {
 
-	return function(value) {
+	return function(context, value) {
 		if (value == column.dbNull)
 			return null;
 		return purify(value);

package/src/table/column/boolean/newEncode.js

@@ -4,34 +4,34 @@ var getSessionSingleton = require('../../getSessionSingleton');
 
 function _new(column) {
 
-	function encode(value) {
+	function encode(context, value) {
 		value = purify(value);
 		if (value === null) {
 			if (column.dbNull === null)
 				return newParam('null');
 			return newParam('\'' + column.dbNull + '\'');
 		}
-		var encodeCore = getSessionSingleton('encodeBoolean');
+		var encodeCore = getSessionSingleton(context, 'encodeBoolean');
 
 
 		return newParam('?', [encodeCore(value)]);
 	}
 
-	encode.unsafe = function(value) {
+	encode.unsafe = function(context, value) {
 		value = purify(value);
 		if (value === null) {
 			if (column.dbNull === null)
 				return 'null';
 			return '\'' + column.dbNull + '\'';
 		}
-		var encodeCore = getSessionSingleton('encodeBoolean');
+		var encodeCore = getSessionSingleton(context, 'encodeBoolean');
 
 
 		return encodeCore(value);
 	};
 
-	encode.direct = function(value) {
-		var encodeCore = getSessionSingleton('encodeBoolean');
+	encode.direct = function(context, value) {
+		var encodeCore = getSessionSingleton(context, 'encodeBoolean');
 
 		return encodeCore(value);
 	};

package/src/table/column/date/formatOut.js

@@ -1,14 +1,12 @@
 var getSessionSingleton = require('../../getSessionSingleton');
 const quote = require('../../quote');
 
-//todo fix
-
-function formatOut(column, alias) {
-	var formatColumn = getSessionSingleton('formatDateOut');
+function formatOut(context, column, alias) {
+	var formatColumn = getSessionSingleton(context, 'formatDateOut');
 	if (formatColumn)
 		return formatColumn(column, alias);
 	else
-		return `${alias}.${quote(column._dbName)}`;
+		return `${alias}.${quote(context, column._dbName)}`;
 }
 
 module.exports = formatOut;

package/src/table/column/date/newDecode.js

@@ -4,8 +4,8 @@ var dateToISOString = require('../../../dateToISOString');
 function _new(column) {
 	var decodeCore = newDecodeCore(column);
 
-	return function(value) {
-		value = decodeCore(value);
+	return function(context, value) {
+		value = decodeCore(context, value);
 		if (value === null)
 			return value;
 		else if (typeof value === 'string')

package/src/table/column/date/newEncode.js

@@ -4,32 +4,32 @@ var getSessionContext = require('../../getSessionContext');
 var getSessionSingleton = require('../../getSessionSingleton');
 
 function _new(column) {
-	var encode = function(value) {
+	var encode = function(context, value) {
 		value = purify(value);
 		if (value == null) {
 			if (column.dbNull === null)
 				return newPara('null');
 			return newPara('\'' + column.dbNull + '\'');
 		}
-		var context = getSessionContext();
-		var encodeCore = context.encodeDate || encodeDate;
-		var formatIn = context.formatDateIn;
+		var ctx = getSessionContext(context);
+		var encodeCore = ctx.encodeDate || encodeDate;
+		var formatIn = ctx.formatDateIn;
 		return newPara(formatIn ? formatIn('?') : '?', [encodeCore(value)]);
 	};
 
-	encode.unsafe = function(value) {
+	encode.unsafe = function(context, value) {
 		value = purify(value);
 		if (value == null) {
 			if (column.dbNull === null)
 				'null';
 			return '\'' + column.dbNull + '\'';
 		}
-		var encodeCore = getSessionSingleton('encodeDate') || encodeDate;
+		var encodeCore = getSessionSingleton(context, 'encodeDate') || encodeDate;
 		return encodeCore(value);
 	};
 
-	encode.direct = function(value) {
-		var encodeCore = getSessionSingleton('encodeDate') || encodeDate;
+	encode.direct = function(context, value) {
+		var encodeCore = getSessionSingleton(context, 'encodeDate') || encodeDate;
 		return encodeCore(value);
 	};