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

package/src/pg/newPool.js

@@ -1,17 +1,17 @@
-var pools = require('../pools');
-var promise = require('../table/promise');
-var end = require('./pool/end');
-var newPgPool = require('./pool/newPgPool');
-var newId = require('../newId');
+const promisify = require('../promisify');
+const pools = require('../pools');
+const end = require('./pool/end');
+const newPgPool = require('./pool/newPgPool');
+const newId = require('../newId');
 
 function newPool(connectionString, poolOptions) {
-	var pool = newPgPool(connectionString, poolOptions);
-	var id = newId();
-	var boundEnd = end.bind(null, pool, id);
-	var c = {};
+	let pool = newPgPool(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/pg/newTransaction.js

@@ -8,6 +8,7 @@ var formatDateOut = require('./formatDateOut');
 var encodeJSON = require('./encodeJSON');
 var insertSql = require('./insertSql');
 var insert = require('./insert');
+var quote = require('./quote');
 
 function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 	var rdb = { poolFactory: pool };
@@ -32,7 +33,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 		caller.visitPg();
 	};
 	rdb.aggregateCount = 0;
-	rdb.quote = (name) => `"${name}"`;
+	rdb.quote = quote;
 
 	if (readonly) {
 		rdb.dbClient = {

package/src/pg/pool/newPgPool.js

@@ -1,19 +1,22 @@
 /* eslint-disable no-prototype-builtins */
 //slightly modified code from github.com/brianc/node-postgres
-var EventEmitter = require('events').EventEmitter;
+var log = require('../../table/log');
 
-var defaults = require('./defaults');
+var defaults = require('../../poolDefaults');
 var genericPool = require('../../generic-pool');
 var _pg = require('pg');
+var parseSearchPathParam = require('./parseSearchPathParam');
 
 function newPgPool(connectionString, poolOptions) {
 	poolOptions = poolOptions || {};
 	let pg = poolOptions.native ? _pg.native : _pg;
+
+	// @ts-ignore
 	var pool = genericPool.Pool({
 		max: poolOptions.size || poolOptions.poolSize || defaults.poolSize,
 		idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
 		reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,
-		log: poolOptions.log || defaults.poolLog,
+		log: poolOptions.log,
 		create: function(cb) {
 			var client = new pg.Client(connectionString);
 			client.connect(function(err) {
@@ -41,7 +44,8 @@ function newPgPool(connectionString, poolOptions) {
 					}
 				});
 				client.poolCount = 0;
-				return cb(null, client);
+				negotiateSearchPath(client, connectionString, (err) => cb(err, client));
+
 			});
 		},
 		destroy: function(client) {
@@ -50,22 +54,12 @@ function newPgPool(connectionString, poolOptions) {
 			client.end();
 		}
 	});
-	//mixin EventEmitter to pool
-	EventEmitter.call(pool);
-	for (var key in EventEmitter.prototype) {
-		if (EventEmitter.prototype.hasOwnProperty(key)) {
-			pool[key] = EventEmitter.prototype[key];
-		}
-	}
 	//monkey-patch with connect method
 	pool.connect = function(cb) {
-		var domain = process.domain;
 		pool.acquire(function(err, client) {
-			if (domain) {
-				cb = domain.bind(cb);
-			}
 			if (err) return cb(err, null, function() {
-				/*NOOP*/ });
+				/*NOOP*/
+			});
 			client.poolCount++;
 			cb(null, client, function(err) {
 				if (err) {
@@ -79,4 +73,17 @@ function newPgPool(connectionString, poolOptions) {
 	return pool;
 }
 
+function negotiateSearchPath(client, connectionString, cb) {
+	const searchPath = parseSearchPathParam(connectionString);
+	if (searchPath) {
+		const sql = `set search_path to ${searchPath}`;
+		log.emitQuery({sql, parameters: []});
+		return client.query(sql, cb);
+	}
+	else
+		cb();
+
+
+}
+
 module.exports = newPgPool;

package/src/pg/pool/parseSearchPathParam.js

@@ -0,0 +1,10 @@
+function parseSearchPathParam(connectionString = '') {
+	const [, queryString] = connectionString.split('?');
+	if (!queryString)
+		return;
+	const params = new URLSearchParams(queryString);
+	const searchPath = params.get('search_path');
+	return searchPath;
+}
+
+module.exports = parseSearchPathParam;

package/src/pg/quote.js

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

package/src/pg/schema.js

@@ -1,11 +1,11 @@
 var query = require('../query');
 
-function executeSchema(schema) {
+function executeSchema(context, schema) {
 	if (!schema)
 		throw new Error('Missing schema');
 	if (!Array.isArray(schema))
 		schema = [schema];
-	return query('SET LOCAL search_path TO ' + schema.join(','));
+	return query(context, 'SET LOCAL search_path TO ' + schema.join(','));
 }
 
 module.exports = executeSchema;

package/src/{mySql/pool/defaults.js → poolDefaults.js}

@@ -11,6 +11,4 @@ module.exports = {
 	//frequeny to check for idle clients within the client pool
 	reapIntervalMillis: 1000,
 
-	//pool log function / boolean
-	poolLog: false,
 };

package/src/promisify.js

@@ -0,0 +1,24 @@
+function promisify(original) {
+	if (typeof original !== 'function') {
+		throw new TypeError('The "original" argument must be of type Function');
+	}
+
+	return function(...args) {
+		return new Promise((resolve, reject) => {
+			// Add the callback that Node-style APIs expect
+			function callback(err, ...values) {
+				if (err) {
+					return reject(err);
+				}
+				// If there's exactly one success value, return it;
+				// otherwise, return all values as an array.
+				return resolve(values.length > 1 ? values : values[0]);
+			}
+
+			// Call the original function, appending our callback
+			original.call(this, ...args, callback);
+		});
+	};
+}
+
+module.exports = promisify;

package/src/query.js

@@ -1,9 +1,9 @@
 var executeQueries = require('./table/executeQueries');
 var wrapQuery = require('./query/wrapQuery');
 
-function doQuery(query) {
+function doQuery(context, query) {
 	var wrappedQuery = wrapQuery(query);
-	return executeQueries([wrappedQuery]).then(unwrapResult);
+	return executeQueries(context, [wrappedQuery]).then(unwrapResult);
 }
 
 function unwrapResult(results) {

package/src/sap/deleteFromSql.js

@@ -1,10 +1,10 @@
 var format = 'delete from %s from %s as %s %s';
-var util = require('util');
-const quote = require('../table/quote');
+const formatString = require('../format');
+const quote = require('./quote');
 
 function deleteFromSql(table, alias, whereSql) {
 	var name = quote(table._dbName);
 	alias = quote(alias)	;
-	return util.format(format, name, name, alias, whereSql);
+	return formatString(format, name, name, alias, whereSql);
 }
 module.exports = deleteFromSql;

package/src/sap/formatDateOut.js

@@ -1,4 +1,4 @@
-const quote = require('../table/quote');
+const quote = require('./quote');
 
 function formatDateOut(column, alias) {
 	return `CONVERT(VARCHAR, ${alias}.${quote(column._dbName)}, 23)`;

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('../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,10 +1,10 @@
-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 format = 'delete from %s where %s.rowId in (SELECT %s.rowId FROM %s %s%s)';
+const formatString = require('../format');
+const quote = require('./quote');
 
 function deleteFromSql(table, alias, whereSql) {
-	var name = quote(table._dbName);
+	const name = quote(table._dbName);
 	alias = quote(alias);
-	return util.format(format, name, name, alias, name, alias, whereSql);
+	return formatString(format, name, name, alias, name, alias, whereSql);
 }
 module.exports = deleteFromSql;

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('../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;
 }