orange-orm 4.9.0 → 4.10.0-beta.0

package/src/nodeSqlite/newDatabase.js

@@ -7,8 +7,8 @@ let newPool = require('./newPool');
 let express = require('../hostExpress');
 let hostLocal = require('../hostLocal');
 let doQuery = require('../query');
+let doSqliteFunction = require('../sqliteFunction');
 let releaseDbClient = require('../table/releaseDbClient');
-let setSessionSingleton = require('../table/setSessionSingleton');
 
 function newDatabase(connectionString, poolOptions) {
 	if (!connectionString)
@@ -24,11 +24,9 @@ function newDatabase(connectionString, poolOptions) {
 			options = undefined;
 		}
 		let domain = createDomain();
-
-		if (fn)
-			return domain.run(runInTransaction);
-		else
-			return domain.run(run);
+		if (!fn)
+			throw new Error('transaction requires a function');
+		return domain.run(runInTransaction);
 
 		function begin() {
 			return _begin(domain, options);
@@ -42,30 +40,27 @@ function newDatabase(connectionString, poolOptions) {
 				.then(() => fn(domain))
 				.then((res) => result = res)
 				.then(() => commit(domain))
-				.then(null, (e) => rollback(domain, e));
+				.then(null, (e) => Promise.resolve(rollback(domain, e)));
 			return result;
 		}
 
-		function run() {
-			let p;
-			let transaction = newTransaction(domain, pool, options);
-			p = new Promise(transaction);
-
-			return p.then(begin);
-		}
 
 	};
 
 	c.createTransaction = function(options) {
+		console.dir('create transaction');
 		let domain = createDomain();
 		let transaction = newTransaction(domain, pool);
 		let p = domain.run(() => new Promise(transaction).then(begin));
-
 		function run(fn) {
 			return p.then(() => fn(domain));
 		}
-		run.rollback = rollback.bind(null, domain);
-		run.commit = commit.bind(null, domain);
+		run.rollback = function(error) {
+			return Promise.resolve(rollback(domain, error));
+		};
+		run.commit = function() {
+			return Promise.resolve(commit(domain));
+		};
 		return run;
 
 		function begin() {
@@ -77,7 +72,6 @@ function newDatabase(connectionString, poolOptions) {
 		let domain = createDomain();
 		let transaction = newTransaction(domain, pool);
 		let p = domain.run(() => new Promise(transaction)
-			.then(() => setSessionSingleton(domain, 'changes', []))
 			.then(() => doQuery(domain, query).then(onResult, onError)));
 		return p;
 
@@ -92,6 +86,23 @@ function newDatabase(connectionString, poolOptions) {
 		}
 	};
 
+	c.sqliteFunction = function(...args) {
+		let domain = createDomain();
+		let transaction = newTransaction(domain, pool);
+		let p = domain.run(() => new Promise(transaction)
+			.then(() => doSqliteFunction(domain, ...args).then(onResult, onError)));
+		return p;
+
+		function onResult(result) {
+			releaseDbClient(domain);
+			return result;
+		}
+
+		function onError(e) {
+			releaseDbClient(domain);
+			throw e;
+		}
+	};
 
 	c.rollback = rollback;
 	c.commit = commit;

package/src/nodeSqlite/newTransaction.js

@@ -39,6 +39,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {})  {
 	rdb.aggregateCount = 0;
 	rdb.quote = quote;
 	rdb.cache = {};
+	rdb.changes = [];
 
 	if (readonly) {
 		rdb.dbClient = {

package/src/oracle/newDatabase.js

@@ -8,7 +8,6 @@ let express = require('../hostExpress');
 let hostLocal = require('../hostLocal');
 let doQuery = require('../query');
 let releaseDbClient = require('../table/releaseDbClient');
-let setSessionSingleton = require('../table/setSessionSingleton');
 
 function newDatabase(connectionString, poolOptions) {
 	if (!connectionString)
@@ -25,10 +24,9 @@ function newDatabase(connectionString, poolOptions) {
 		}
 		let domain = createDomain();
 
-		if (fn)
-			return domain.run(runInTransaction);
-		else
-			return domain.run(run);
+		if (!fn)
+			throw new Error('transaction requires a function');
+		return domain.run(runInTransaction);
 
 
 		function begin() {
@@ -48,13 +46,6 @@ function newDatabase(connectionString, poolOptions) {
 
 		}
 
-		function run() {
-			let p;
-			let transaction = newTransaction(domain, pool, options);
-			p = new Promise(transaction);
-
-			return p.then(begin);
-		}
 
 	};
 
@@ -79,7 +70,6 @@ function newDatabase(connectionString, poolOptions) {
 		let domain = createDomain();
 		let transaction = newTransaction(domain, pool);
 		let p = domain.run(() => new Promise(transaction)
-			.then(() => setSessionSingleton(domain, 'changes', []))
 			.then(() => doQuery(domain, query).then(onResult, onError)));
 		return p;
 

package/src/oracle/newTransaction.js

@@ -41,6 +41,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 	rdb.aggregateCount = 0;
 	rdb.quote = quote;
 	rdb.cache = {};
+	rdb.changes = [];
 
 	if (readonly) {
 		rdb.dbClient = {

package/src/pg/newDatabase.js

@@ -10,7 +10,6 @@ let express = require('../hostExpress');
 let hostLocal = require('../hostLocal');
 let doQuery = require('../query');
 let releaseDbClient = require('../table/releaseDbClient');
-let setSessionSingleton = require('../table/setSessionSingleton');
 
 function newDatabase(connectionString, poolOptions) {
 	if (!connectionString)
@@ -27,10 +26,9 @@ function newDatabase(connectionString, poolOptions) {
 		}
 		let domain = createDomain();
 
-		if (fn)
-			return domain.run(runInTransaction);
-		else
-			return domain.run(run);
+		if (!fn)
+			throw new Error('transaction requires a function');
+		return domain.run(runInTransaction);
 
 		async function runInTransaction() {
 			let result;
@@ -49,15 +47,6 @@ function newDatabase(connectionString, poolOptions) {
 			return _begin(domain, options);
 		}
 
-		function run() {
-			let p;
-			let transaction = newTransaction(domain, pool, options);
-			p = new Promise(transaction);
-
-			return p.then(begin)
-				.then(negotiateSchema);
-		}
-
 		function negotiateSchema(previous) {
 			let schema = options && options.schema;
 			if (!schema)
@@ -97,7 +86,6 @@ function newDatabase(connectionString, poolOptions) {
 		let domain = createDomain();
 		let transaction = newTransaction(domain, pool);
 		let p = domain.run(() => new Promise(transaction)
-			.then(() => setSessionSingleton(domain, 'changes', []))
 			.then(() => doQuery(domain, query).then(onResult, onError)));
 		return p;
 
@@ -131,4 +119,4 @@ function newDatabase(connectionString, poolOptions) {
 	return c;
 }
 
-module.exports = newDatabase;
+module.exports = newDatabase;

package/src/pg/newTransaction.js

@@ -36,6 +36,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 	rdb.aggregateCount = 0;
 	rdb.quote = quote;
 	rdb.cache = {};
+	rdb.changes = [];
 
 	if (readonly) {
 		rdb.dbClient = {

package/src/pglite/newDatabase.js

@@ -10,7 +10,6 @@ let express = require('../hostExpress');
 let hostLocal = require('../hostLocal');
 let doQuery = require('../query');
 let releaseDbClient = require('../table/releaseDbClient');
-let setSessionSingleton = require('../table/setSessionSingleton');
 
 function newDatabase(connectionString, poolOptions) {
 	poolOptions = poolOptions || { min: 1 };
@@ -25,10 +24,9 @@ function newDatabase(connectionString, poolOptions) {
 		}
 		let domain = createDomain();
 
-		if (fn)
-			return domain.run(runInTransaction);
-		else
-			return domain.run(run);
+		if (!fn)
+			throw new Error('transaction requires a function');
+		return domain.run(runInTransaction);
 
 		async function runInTransaction() {
 			let result;
@@ -47,14 +45,6 @@ function newDatabase(connectionString, poolOptions) {
 			return _begin(domain, options);
 		}
 
-		function run() {
-			let p;
-			let transaction = newTransaction(domain, pool, options);
-			p = new Promise(transaction);
-
-			return p.then(begin)
-				.then(negotiateSchema);
-		}
 
 		function negotiateSchema(previous) {
 			let schema = options && options.schema;
@@ -95,7 +85,6 @@ function newDatabase(connectionString, poolOptions) {
 		let domain = createDomain();
 		let transaction = newTransaction(domain, pool);
 		let p = domain.run(() => new Promise(transaction)
-			.then(() => setSessionSingleton(domain, 'changes', []))
 			.then(() => doQuery(domain, query).then(onResult, onError)));
 		return p;
 

package/src/pglite/newTransaction.js

@@ -34,6 +34,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 	rdb.aggregateCount = 0;
 	rdb.quote = quote;
 	rdb.cache = {};
+	rdb.changes = [];
 
 	if (readonly) {
 		rdb.dbClient = {

package/src/sap/newDatabase.js

@@ -8,7 +8,6 @@ let express = require('../hostExpress');
 let hostLocal = require('../hostLocal');
 let doQuery = require('../query');
 let releaseDbClient = require('../table/releaseDbClient');
-let setSessionSingleton = require('../table/setSessionSingleton');
 
 function newDatabase(connectionString, poolOptions) {
 	if (!connectionString)
@@ -25,10 +24,9 @@ function newDatabase(connectionString, poolOptions) {
 		}
 		let domain = createDomain();
 
-		if (fn)
-			return domain.run(runInTransaction);
-		else
-			return domain.run(run);
+		if (!fn)
+			throw new Error('transaction requires a function');
+		return domain.run(runInTransaction);
 
 
 		function begin() {
@@ -48,13 +46,6 @@ function newDatabase(connectionString, poolOptions) {
 
 		}
 
-		function run() {
-			let p;
-			let transaction = newTransaction(domain, pool, options);
-			p = new Promise(transaction);
-
-			return p.then(begin);
-		}
 
 	};
 
@@ -84,7 +75,6 @@ function newDatabase(connectionString, poolOptions) {
 		let domain = createDomain();
 		let transaction = newTransaction(domain, pool);
 		let p = domain.run(() => new Promise(transaction)
-			.then(() => setSessionSingleton(domain, 'changes', []))
 			.then(() => doQuery(domain, query).then(onResult, onError)));
 		return p;
 

package/src/sap/newTransaction.js

@@ -48,6 +48,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 	rdb.aggregateCount = 0;
 	rdb.quote = quote;
 	rdb.cache = {};
+	rdb.changes = [];
 
 	if (readonly) {
 		rdb.dbClient = {

package/src/sqlite3/newDatabase.js

@@ -7,8 +7,8 @@ let newPool = require('./newPool');
 let express = require('../hostExpress');
 let hostLocal = require('../hostLocal');
 let doQuery = require('../query');
+let doSqliteFunction = require('../sqliteFunction');
 let releaseDbClient = require('../table/releaseDbClient');
-let setSessionSingleton = require('../table/setSessionSingleton');
 
 function newDatabase(connectionString, poolOptions) {
 	if (!connectionString)
@@ -25,10 +25,9 @@ function newDatabase(connectionString, poolOptions) {
 		}
 		let domain = createDomain();
 
-		if (fn)
-			return domain.run(runInTransaction);
-		else
-			return domain.run(run);
+		if (!fn)
+			throw new Error('transaction requires a function');
+		return domain.run(runInTransaction);
 
 		function begin() {
 			return _begin(domain, options);
@@ -46,13 +45,6 @@ function newDatabase(connectionString, poolOptions) {
 			return result;
 		}
 
-		function run() {
-			let p;
-			let transaction = newTransaction(domain, pool, options);
-			p = new Promise(transaction);
-
-			return p.then(begin);
-		}
 
 	};
 
@@ -77,7 +69,6 @@ function newDatabase(connectionString, poolOptions) {
 		let domain = createDomain();
 		let transaction = newTransaction(domain, pool);
 		let p = domain.run(() => new Promise(transaction)
-			.then(() => setSessionSingleton(domain, 'changes', []))
 			.then(() => doQuery(domain, query).then(onResult, onError)));
 		return p;
 
@@ -92,6 +83,24 @@ function newDatabase(connectionString, poolOptions) {
 		}
 	};
 
+	c.sqliteFunction = function(...args) {
+		let domain = createDomain();
+		let transaction = newTransaction(domain, pool);
+		let p = domain.run(() => new Promise(transaction)
+			.then(() => doSqliteFunction(domain, ...args).then(onResult, onError)));
+		return p;
+
+		function onResult(result) {
+			releaseDbClient(domain);
+			return result;
+		}
+
+		function onError(e) {
+			releaseDbClient(domain);
+			throw e;
+		}
+	};
+
 
 	c.rollback = rollback;
 	c.commit = commit;

package/src/sqlite3/newTransaction.js

@@ -35,6 +35,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {})  {
 	rdb.aggregateCount = 0;
 	rdb.quote = quote;
 	rdb.cache = {};
+	rdb.changes = [];
 
 	if (readonly) {
 		rdb.dbClient = {

package/src/sqliteFunction.js

@@ -0,0 +1,20 @@
+const executeChanges = require('./table/executeQueries/executeChanges');
+const popChanges = require('./table/popChanges');
+const getSessionSingleton = require('./table/getSessionSingleton');
+
+function executeQueries(context, ...rest) {
+	var changes = popChanges(context);
+
+	return executeChanges(context, changes).then(onDoneChanges);
+
+	function onDoneChanges() {
+		var client = getSessionSingleton(context, 'dbClient');
+		if (client && typeof client.function === 'function')
+			return client.function.apply(client, rest);
+		if (client && typeof client.createFunction === 'function')
+			return client.createFunction.apply(client, rest);
+		throw new Error('SQLite client does not support user-defined functions');
+	}
+}
+
+module.exports = executeQueries;

package/src/table/begin.js

@@ -3,7 +3,6 @@ let executeQuery = require('./executeQueries/executeQuery');
 let setSessionSingleton = require('./setSessionSingleton');
 
 function begin(context, transactionLess) {
-	setSessionSingleton(context, 'changes', []);
 	if (transactionLess) {
 		setSessionSingleton(context, 'transactionLess', true);
 		return Promise.resolve();

package/src/table/commit.js

@@ -6,14 +6,34 @@ let popChanges = require('./popChanges');
 const getSessionSingleton = require('./getSessionSingleton');
 
 function _commit(context, result) {
+	let hookError;
 	return popAndPushChanges()
+		.then(callAfterCommit)
 		.then(releaseDbClient.bind(null, context))
-		.then(onReleased);
+		.then(onReleased)
+		.then(throwHookErrorIfAny);
 
 	function onReleased() {
 		return result;
 	}
 
+	function throwHookErrorIfAny(res) {
+		if (hookError)
+			throw hookError;
+		return res;
+	}
+
+	function callAfterCommit() {
+		const hook = getSessionSingleton(context, 'afterCommitHook');
+		if (!hook)
+			return Promise.resolve();
+		return Promise.resolve()
+			.then(() => hook())
+			.catch((e) => {
+				hookError = e;
+			});
+	}
+
 	async function popAndPushChanges() {
 		let changes = popChanges(context);
 		while (changes.length > 0) {

package/src/table/query/singleQuery/joinSql/newShallowJoinSqlCore.js

@@ -4,8 +4,10 @@ const getSessionSingleton = require('../../../getSessionSingleton');
 
 function _new(context, rightTable, leftColumns, rightColumns, leftAlias, rightAlias, filter) {
 	const quote = getSessionSingleton(context, 'quote');
-	leftAlias = quote(leftAlias);
-	rightAlias = quote(rightAlias);
+	const leftAliasRaw = leftAlias;
+	const rightAliasRaw = rightAlias;
+	leftAlias = quote(leftAliasRaw);
+	rightAlias = quote(rightAliasRaw);
 	var sql = '';
 	var delimiter = '';
 	for (var i = 0; i < leftColumns.length; i++) {
@@ -19,11 +21,11 @@ function _new(context, rightTable, leftColumns, rightColumns, leftAlias, rightAl
 		sql += delimiter + leftAlias + '.' + quote(leftColumn._dbName) + '=' + rightAlias + '.' + quote(rightColumn._dbName);
 	}
 
-	sql += newDiscriminatorSql(context, rightTable, rightAlias);
+	sql += newDiscriminatorSql(context, rightTable, rightAliasRaw);
 	var result = newParameterized(sql);
 	if (filter)
 		result = result.append(delimiter).append(filter);
 	return result;
 }
 
-module.exports = _new;
+module.exports = _new;

package/src/table/rollback.js

@@ -8,10 +8,13 @@ const conflictId = '12345678-1234-1234-1234-123456789012';
 const getSessionSingleton = require('./getSessionSingleton');
 
 function _rollback(context, e) {
+	let hookError;
 	var chain = resultToPromise()
 		.then(() => popChanges(context))
 		.then(executeRollback)
-		.then(() => releaseDbClient(context));
+		.then(callAfterRollback)
+		.then(() => releaseDbClient(context))
+		.then(throwHookErrorIfAny);
 
 
 	function executeRollback() {
@@ -21,6 +24,23 @@ function _rollback(context, e) {
 		return executeQuery(context, rollbackCommand);
 	}
 
+	function callAfterRollback() {
+		const hook = getSessionSingleton(context, 'afterRollbackHook');
+		if (!hook)
+			return Promise.resolve();
+		return Promise.resolve()
+			.then(() => hook(e))
+			.catch((err) => {
+				hookError = err;
+			});
+	}
+
+	function throwHookErrorIfAny(res) {
+		if (hookError)
+			throw hookError;
+		return res;
+	}
+
 	if (e) {
 		if (e.message?.indexOf('ORA-01476: divisor is equal to zero') > -1)
 			return newThrow(context, new Error('Conflict when updating a column'), chain);
@@ -38,4 +58,4 @@ function rollback(context, e) {
 	return Promise.resolve().then(() => _rollback(context, e));
 }
 
-module.exports = rollback;
+module.exports = rollback;

package/src/tedious/newDatabase.js

@@ -8,7 +8,6 @@ let express = require('../hostExpress');
 let hostLocal = require('../hostLocal');
 let doQuery = require('../query');
 let releaseDbClient = require('../table/releaseDbClient');
-let setSessionSingleton = require('../table/setSessionSingleton');
 
 function newDatabase(connectionString, poolOptions) {
 	if (!connectionString)
@@ -25,10 +24,9 @@ function newDatabase(connectionString, poolOptions) {
 		}
 		let domain = createDomain();
 
-		if (fn)
-			return domain.run(runInTransaction);
-		else
-			return domain.run(run);
+		if (!fn)
+			throw new Error('transaction requires a function');
+		return domain.run(runInTransaction);
 
 		function begin() {
 			return _begin(domain, options);
@@ -47,13 +45,6 @@ function newDatabase(connectionString, poolOptions) {
 		}
 
 
-		function run() {
-			let p;
-			let transaction = newTransaction(domain, pool, options);
-			p = new Promise(transaction);
-
-			return p.then(begin);
-		}
 
 	};
 
@@ -81,7 +72,6 @@ function newDatabase(connectionString, poolOptions) {
 		let domain = createDomain();
 		let transaction = newTransaction(domain, pool);
 		let p = domain.run(() => new Promise(transaction)
-			.then(() => setSessionSingleton(domain, 'changes', []))
 			.then(() => doQuery(domain, query).then(onResult, onError)));
 		return p;
 

package/src/tedious/newTransaction.js

@@ -48,6 +48,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 	rdb.aggregateCount = 0;
 	rdb.quote = quote;
 	rdb.cache = {};
+	rdb.changes = [];
 
 	if (readonly) {
 		rdb.dbClient = {