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

package/src/tedious/insert.js

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

package/src/tedious/insertSql.js

@@ -1,11 +1,11 @@
 let outputInsertedSql = require('./outputInsertedSql');
 let mergeSql = require('./mergeSql');
 
-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) {

package/src/tedious/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,10 +42,10 @@ 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(() => c.commit(domain))
+				.then(null, (e) => c.rollback(domain,e));
 			return result;
 		}
 
@@ -61,53 +53,48 @@ function newDatabase(connectionString, poolOptions) {
 		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));
 		}
+
+		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/tedious/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;
 }

package/src/tedious/newTransaction.js

@@ -2,13 +2,13 @@ var wrapQuery = require('./wrapQuery');
 var encodeBoolean = require('./encodeBoolean');
 var deleteFromSql = require('./deleteFromSql');
 var selectForUpdateSql = require('./selectForUpdateSql');
-var outputInsertedSql = require('./outputInsertedSql');
 const limitAndOffset = require('./limitAndOffset');
+const insertSql = require('./insertSql');
 const getManyDto = require('./getManyDto');
 const formatDateOut = require('./formatDateOut');
 const formatJSONOut = require('./formatJSONOut');
-const insertSql = require('./insertSql');
 const insert = require('./insert');
+const quote = require('./quote');
 
 function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 	var rdb = {poolFactory: pool};
@@ -23,7 +23,6 @@ function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 	rdb.encodeJSON = JSON.stringify;
 	rdb.deleteFromSql = deleteFromSql;
 	rdb.selectForUpdateSql = selectForUpdateSql;
-	rdb.outputInsertedSql = outputInsertedSql;
 	rdb.lastInsertedIsSeparate = false;
 	rdb.insertSql = insertSql;
 	rdb.insert = insert;
@@ -44,7 +43,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/tedious/pool/newGenericPool.js

@@ -1,8 +1,7 @@
 // @ts-nocheck
 /* eslint-disable no-prototype-builtins */
-var EventEmitter = require('events').EventEmitter;
 
-var defaults = require('./defaults');
+var defaults = require('../../poolDefaults');
 var genericPool = require('../../generic-pool');
 var tedious = require('tedious');
 var parseConnectionString = require('./parseConnectionString');
@@ -40,20 +39,9 @@ function newGenericPool(connectionString, poolOptions) {
 			client.close();
 		}
 	});
-	//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*/ });
 			client.poolCount++;
 			cb(null, client, function(err) {

package/src/tedious/quote.js

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

package/src/validateDeleteConflict.js

@@ -1,6 +1,5 @@
 // @ts-nocheck
 /* eslint-disable */
-let { inspect } = require('util');
 let assert = require('assert');
 const toCompareObject = require('./toCompareObject');
 
@@ -19,7 +18,7 @@ async function validateDeleteConflict({ row, oldValue, options, table }) {
 						assert.deepEqual(oldValue[p], toCompareObject(row[p]));						
 				}
 				catch (e) {
-					throw new Error(`The field ${p} was changed by another user. Expected ${inspect(oldValue[p], false, 10)}, but was ${inspect(row[p], false, 10)}.`);
+					throw new Error(`The field ${p} was changed by another user. Expected ${inspect(oldValue[p])}, but was ${inspect(row[p])}.`);
 				}
 			}
 		}
@@ -88,5 +87,8 @@ function assertDatesEqual(date1, date2) {
 	assert.deepEqual(date1, date2);
 }
 
+function inspect(obj) {
+	return JSON.stringify(obj, null, 2);
+}
 
 module.exports = validateDeleteConflict;

package/src/createDomain/negotiateForwardProperty.js

@@ -1,23 +0,0 @@
-function negotiateForwardProperty(oldDomain, newDomain, propertyName) {
-	if(newDomain[propertyName]) return;
-	if (propertyName === 'rdb') return;
-	Object.defineProperty(newDomain, propertyName, {
-		enumerable: true,
-		get: createGetter(oldDomain, propertyName),
-		set: createSetter(oldDomain, propertyName)
-	});
-}
-
-function createGetter(oldDomain, propName) {
-	return function() {
-		return oldDomain[propName];
-	};
-}
-
-function createSetter(oldDomain, propName) {
-	return function(value) {
-		oldDomain[propName] = value;
-	};
-}
-
-module.exports = negotiateForwardProperty;

package/src/d1/pool/defaults.js

@@ -1,45 +0,0 @@
-module.exports = {
-	// database host defaults to localhost
-	host: 'localhost',
-
-	//database user's name
-	user: process.platform === 'win32' ? process.env.USERNAME : process.env.USER,
-
-	//name of database to connect
-	database: process.platform === 'win32' ? process.env.USERNAME : process.env.USER,
-
-	//database user's password
-	password: null,
-
-	//database port
-	port: 5432,
-
-	//number of rows to return at a time from a prepared statement's
-	//portal. 0 will return all rows at once
-	rows: 0,
-
-	// binary result mode
-	binary: false,
-
-	//Connection pool options - see https://github.com/coopernurse/node-pool
-	//number of connections to use in connection pool
-	//0 will disable connection pooling
-	poolSize: 0,
-
-	//max milliseconds a client can go unused before it is removed
-	//from the pool and destroyed
-	poolIdleTimeout: 30000,
-
-	//frequeny to check for idle clients within the client pool
-	reapIntervalMillis: 1000,
-
-	//pool log function / boolean
-	poolLog: false,
-
-	client_encoding: '',
-
-	ssl: false,
-
-	application_name : undefined,
-	fallback_application_name: undefined
-};

package/src/mssql/pool/defaults.js

@@ -1,45 +0,0 @@
-module.exports = {
-	// database host defaults to localhost
-	host: 'localhost',
-
-	//database user's name
-	user: process.platform === 'win32' ? process.env.USERNAME : process.env.USER,
-
-	//name of database to connect
-	database: process.platform === 'win32' ? process.env.USERNAME : process.env.USER,
-
-	//database user's password
-	password: null,
-
-	//database port
-	port: 5432,
-
-	//number of rows to return at a time from a prepared statement's
-	//portal. 0 will return all rows at once
-	rows: 0,
-
-	// binary result mode
-	binary: false,
-
-	//Connection pool options - see https://github.com/coopernurse/node-pool
-	//number of connections to use in connection pool
-	//0 will disable connection pooling
-	poolSize: 0,
-
-	//max milliseconds a client can go unused before it is removed
-	//from the pool and destroyed
-	poolIdleTimeout: 30000,
-
-	//frequeny to check for idle clients within the client pool
-	reapIntervalMillis: 1000,
-
-	//pool log function / boolean
-	poolLog: false,
-
-	client_encoding: '',
-
-	ssl: false,
-
-	application_name : undefined,
-	fallback_application_name: undefined
-};

package/src/oracle/pool/defaults.js

@@ -1,45 +0,0 @@
-module.exports = {
-	// database host defaults to localhost
-	host: 'localhost',
-
-	//database user's name
-	user: process.platform === 'win32' ? process.env.USERNAME : process.env.USER,
-
-	//name of database to connect
-	database: process.platform === 'win32' ? process.env.USERNAME : process.env.USER,
-
-	//database user's password
-	password: null,
-
-	//database port
-	port: 5432,
-
-	//number of rows to return at a time from a prepared statement's
-	//portal. 0 will return all rows at once
-	rows: 0,
-
-	// binary result mode
-	binary: false,
-
-	//Connection pool options - see https://github.com/coopernurse/node-pool
-	//number of connections to use in connection pool
-	//0 will disable connection pooling
-	poolSize: 0,
-
-	//max milliseconds a client can go unused before it is removed
-	//from the pool and destroyed
-	poolIdleTimeout: 30000,
-
-	//frequeny to check for idle clients within the client pool
-	reapIntervalMillis: 1000,
-
-	//pool log function / boolean
-	poolLog: false,
-
-	client_encoding: '',
-
-	ssl: false,
-
-	application_name : undefined,
-	fallback_application_name: undefined
-};

package/src/pg/pool/defaults.js

@@ -1,45 +0,0 @@
-module.exports = {
-	// database host defaults to localhost
-	host: 'localhost',
-
-	//database user's name
-	user: process.platform === 'win32' ? process.env.USERNAME : process.env.USER,
-
-	//name of database to connect
-	database: process.platform === 'win32' ? process.env.USERNAME : process.env.USER,
-
-	//database user's password
-	password: null,
-
-	//database port
-	port: 5432,
-
-	//number of rows to return at a time from a prepared statement's
-	//portal. 0 will return all rows at once
-	rows: 0,
-
-	// binary result mode
-	binary: false,
-
-	//Connection pool options - see https://github.com/coopernurse/node-pool
-	//number of connections to use in connection pool
-	//0 will disable connection pooling
-	poolSize: 0,
-
-	//max milliseconds a client can go unused before it is removed
-	//from the pool and destroyed
-	poolIdleTimeout: 30000,
-
-	//frequeny to check for idle clients within the client pool
-	reapIntervalMillis: 1000,
-
-	//pool log function / boolean
-	poolLog: false,
-
-	client_encoding: '',
-
-	ssl: false,
-
-	application_name : undefined,
-	fallback_application_name: undefined
-};

package/src/sqlite/pool/defaults.js

@@ -1,45 +0,0 @@
-module.exports = {
-	// database host defaults to localhost
-	host: 'localhost',
-
-	//database user's name
-	user: process.platform === 'win32' ? process.env.USERNAME : process.env.USER,
-
-	//name of database to connect
-	database: process.platform === 'win32' ? process.env.USERNAME : process.env.USER,
-
-	//database user's password
-	password: null,
-
-	//database port
-	port: 5432,
-
-	//number of rows to return at a time from a prepared statement's
-	//portal. 0 will return all rows at once
-	rows: 0,
-
-	// binary result mode
-	binary: false,
-
-	//Connection pool options - see https://github.com/coopernurse/node-pool
-	//number of connections to use in connection pool
-	//0 will disable connection pooling
-	poolSize: 0,
-
-	//max milliseconds a client can go unused before it is removed
-	//from the pool and destroyed
-	poolIdleTimeout: 30000,
-
-	//frequeny to check for idle clients within the client pool
-	reapIntervalMillis: 1000,
-
-	//pool log function / boolean
-	poolLog: false,
-
-	client_encoding: '',
-
-	ssl: false,
-
-	application_name : undefined,
-	fallback_application_name: undefined
-};

package/src/table/createJSONReadStream.js

@@ -1,7 +0,0 @@
-var createJSONReadStreamDefault = require('./createJSONReadStreamDefault');
-
-function createJSONReadStream(table, db, filter, strategy, streamOptions) {
-	return createJSONReadStreamDefault(table, db, filter, strategy, streamOptions);
-}
-
-module.exports = createJSONReadStream;

package/src/table/createJSONReadStreamDefault.js

@@ -1,33 +0,0 @@
-var createReadStreamCore = require('./createReadStreamDefault');
-var Stream = require('stream');
-
-function createJSONReadStream(table, db, filter, strategy, streamOptions) {
-	var transformer = Stream.Transform({ objectMode: true });
-	var started;
-	transformer._transform = function(obj, enc, cb) {
-		var data = JSON.stringify(obj);
-		if (started)
-			transformer.push(',' + data);
-		else {
-			transformer.push('[');
-			transformer.push(data);
-			started = true;
-		}
-		cb();
-	};
-
-	transformer._flush = function(cb) {
-		transformer.push(']');
-		cb();
-	};
-
-	var objectStream = createReadStreamCore(table, db, filter, strategy, streamOptions);
-	objectStream.on('error', onError);
-	return objectStream.pipe(transformer);
-
-	function onError(e) {
-		transformer.emit('error', e);
-	}
-}
-
-module.exports = createJSONReadStream;

package/src/table/createJSONReadStreamNative.js

@@ -1,31 +0,0 @@
-var createReadStreamCore = require('./createReadStreamCoreNative');
-var Stream = require('stream');
-
-function createJSONReadStream(table, db, filter, strategy, streamOptions) {
-	var transformer = Stream.Transform({
-		objectMode: true
-	});
-	var started;
-	transformer._transform = function(chunk, enc, cb) {
-		if (started)
-			transformer.push(',' + chunk.result);
-		else {
-			transformer.push('[');
-			let result = chunk.result;
-			if (typeof result === 'object')
-				result = JSON.stringify(result);
-			transformer.push(result);
-			started = true;
-		}
-		cb();
-	};
-
-	transformer._flush = function(cb) {
-		transformer.push(']');
-		cb();
-	};
-
-	return createReadStreamCore(table, db, filter, strategy, transformer, streamOptions);
-}
-
-module.exports = createJSONReadStream;

package/src/table/createReadStream.js

@@ -1,24 +0,0 @@
-var createReadStreamNative = require('./createReadStreamNative');
-var createReadStreamDefault = require('./createReadStreamDefault');
-
-function createReadStream(table, db, filter, strategy, streamOptions) {
-	var create;
-	var c = {};
-
-	c.visitPg = function() {
-		create =  createReadStreamNative;
-	};
-
-	c.visitMySql = c.visitPg;
-
-	c.visitSqlite = function() {
-		create =  createReadStreamDefault;
-	};
-	c.visitSap = c.visitSqlite;
-
-	db.accept(c);
-
-	return create(table, db, filter, strategy, streamOptions);
-}
-
-module.exports = createReadStream;

package/src/table/createReadStreamCoreNative.js

@@ -1,40 +0,0 @@
-var newQuery = require('./readStream/newQuery');
-var strategyToSpan = require('./strategyToSpan');
-var negotiateRawSqlFilter = require('./column/negotiateRawSqlFilter');
-var newQueryStream = require('./readStream/newQueryStream');
-
-function createReadStreamCoreNative(table, db, filter, strategy, transformer, streamOptions) {
-	var alias = table._dbName;
-	filter = negotiateRawSqlFilter(filter, table);
-	var span = strategyToSpan(table, strategy);
-
-	if (process.domain)
-		process.domain.add(transformer);
-
-	db.transaction(async () => {
-		await start();
-	}).then(null, onError);
-
-	function start() {
-		return new Promise((resolve, reject) => {
-			var query = newQuery(db, table, filter, span, alias);
-			var queryStream = newQueryStream(query, streamOptions);
-			queryStream.on('end', resolve);
-			queryStream.on('error', onStreamError);
-			queryStream.pipe(transformer);
-
-			function onStreamError(e) {
-				reject(e);
-			}
-		});
-
-	}
-
-	function onError(e) {
-		transformer.emit('error', e);
-	}
-
-	return transformer;
-}
-
-module.exports = createReadStreamCoreNative;