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

package/src/table/relation/newManyCache.js

@@ -9,7 +9,7 @@ var setSessionSingleton = require('../setSessionSingleton');
 
 function newManyCache(joinRelation) {
 	var c = {};
-	var key = newId();
+	var key;
 
 	c.tryAdd = function(context, parent, child) {
 		c.getInnerCache(context).tryAdd(parent, child);
@@ -25,10 +25,11 @@ function newManyCache(joinRelation) {
 	};
 
 	c.getInnerCache = function(context) {
-		var cache = getSessionSingleton(context, key);
+		const theKey = negotiateKey();
+		var cache = getSessionSingleton(context, theKey);
 		if (!cache) {
 			cache = newCacheCore(joinRelation);
-			setSessionSingleton(context, key, cache);
+			setSessionSingleton(context, theKey, cache);
 			fillCache(context);
 			synchronizeAdded(context, c.tryAdd.bind(null, context), joinRelation);
 			synchronizeRemoved(context, c.tryRemove.bind(null, context), joinRelation);
@@ -49,6 +50,13 @@ function newManyCache(joinRelation) {
 		}
 	}
 
+	function negotiateKey() {
+		if (key)
+			return key;
+		key = newId();
+		return key;
+
+	}
 
 
 	return c;

package/src/table/resultToRows/dbRowToRow.js

@@ -1,7 +1,5 @@
 var negotiateQueryContext = require('./negotiateQueryContext');
 var decodeDbRow = require('./decodeDbRow');
-var nextDbRowToRow = _nextDbRowToRow;
-
 
 function dbRowToRow(context, span, dbRow) {
 	var table = span.table;
@@ -22,12 +20,12 @@ function dbRowToRow(context, span, dbRow) {
 	var c = {};
 
 	c.visitOne = function(leg) {
-		nextDbRowToRow(context, leg.span, dbRow);
+		dbRowToRow(context, leg.span, dbRow);
 		leg.expand(row);
 	};
 
 	c.visitJoin = function(leg) {
-		nextDbRowToRow(context, leg.span, dbRow);
+		dbRowToRow(context, leg.span, dbRow);
 		leg.expand(row);
 	};
 
@@ -43,9 +41,4 @@ function dbRowToRow(context, span, dbRow) {
 	return row;
 }
 
-function _nextDbRowToRow(context, span, dbRow) {
-	nextDbRowToRow = require('./dbRowToRow');
-	nextDbRowToRow(context, span, dbRow);
-}
-
 module.exports = dbRowToRow;

package/src/table/resultToRows/delete/removeFromCache.js

@@ -1,5 +1,3 @@
-var nextRemoveFromCache = _nextRemoveFromCache;
-
 function removeFromCache(context, row, strategy, table) {
 	if (Array.isArray(row)) {
 		removeManyRows();
@@ -10,7 +8,7 @@ function removeFromCache(context, row, strategy, table) {
 
 	function removeManyRows() {
 		row.forEach( function(rowToRemove) {
-			nextRemoveFromCache(context, rowToRemove, strategy, table);
+			removeFromCache(context, rowToRemove, strategy, table);
 		});
 	}
 
@@ -19,15 +17,10 @@ function removeFromCache(context, row, strategy, table) {
 		for (var relationName in strategy) {
 			var relation = relations[relationName];
 			var rows = relation.getRowsSync(row);
-			nextRemoveFromCache(context, rows, strategy[relationName], relation.childTable);
+			removeFromCache(context, rows, strategy[relationName], relation.childTable);
 		}
 		table._cache.tryRemove(context, row);
 	}
 }
 
-function _nextRemoveFromCache(context, row, strategy, table) {
-	nextRemoveFromCache = require('./removeFromCache');
-	nextRemoveFromCache(context, row, strategy, table);
-}
-
 module.exports = removeFromCache;

package/src/table/resultToRows/newDecodeDbRow.js

@@ -1,4 +1,3 @@
-let util = require('util');
 let updateField = require('../updateField');
 let newEmitEvent = require('../../emitEvent');
 let extractStrategy = require('./toDto/extractStrategy');
@@ -204,12 +203,6 @@ function newDecodeDbRow(table, dbRow, filteredAliases, shouldValidate, isInsert)
 		return this;
 	};
 
-
-	Row.prototype[util.inspect.custom] = function() {
-		let dtos = toDto(undefined, table, this, new Set());
-		return util.inspect(dtos, { compact: false, colors: true });
-	};
-
 	function decodeDbRow(context, row) {
 		for (let i = 0; i < numberOfColumns; i++) {
 			let index = offset + i;

package/src/table/resultToRows/toDto/extractStrategy.js

@@ -1,5 +1,3 @@
-let extractSubStrategy = _extractSubStrategy;
-
 //either..
 //strategy, table
 //or..
@@ -21,7 +19,7 @@ function extractStrategy(_strategyOrTable, _optinonalTable) {
 	visitor.visitJoin = function() { };
 
 	visitor.visitMany = function(relation) {
-		strategy[relationName] = extractSubStrategy(relation.childTable);
+		strategy[relationName] = extractStrategy(relation.childTable);
 	};
 
 	visitor.visitOne = visitor.visitMany;
@@ -33,9 +31,5 @@ function extractStrategy(_strategyOrTable, _optinonalTable) {
 	return strategy;
 }
 
-function _extractSubStrategy(table) {
-	extractSubStrategy = require('./extractStrategy');
-	return extractSubStrategy(table);
-}
 
 module.exports = extractStrategy;

package/src/table/tryGetSessionContext.js

@@ -1,11 +1,6 @@
-const process = require('node:process');
-
 function tryGetSessionContext(context) {
 	if (context)
 		return context.rdb;
-	else
-		// @ts-ignore
-		return process.domain && process.domain.rdb;
 }
 
 module.exports = tryGetSessionContext;

package/src/table.js

@@ -14,8 +14,6 @@ const newContext = require('./newObject');
 const insert = require('./table/insert');
 const _delete = require('./table/delete');
 const cascadeDelete = require('./table/cascadeDelete');
-const createReadStream = require('./table/createReadStream');
-const createJSONReadStream = require('./table/createJSONReadStream');
 const patchTable = require('./patchTable');
 const newEmitEvent = require('./emitEvent');
 const hostLocal = require('./hostLocal');
@@ -150,8 +148,6 @@ function _new(tableName) {
 	};
 
 	table.deleteCascade = table.cascadeDelete;
-	table.createReadStream = createReadStream.bind(null, table); //legacy
-	table.createJSONReadStream = createJSONReadStream.bind(null, table); //legacy
 	table.exclusive = function() {
 		table._exclusive = true;
 		return table;

package/src/tedious/deleteFromSql.js

@@ -1,10 +1,10 @@
-var format = 'delete %s from %s as %s%s';
-var util = require('util');
+const format = 'delete %s from %s as %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, alias, name, alias, whereSql);
+	return formatString(format, alias, name, alias, whereSql);
 }
 module.exports = deleteFromSql;

package/src/tedious/getManyDto/newQueryCore.js

@@ -11,7 +11,7 @@ function newQuery(context, table, filter, span, alias) {
 	var limit = extractLimit(context, span);
 	var offset = limitAndOffset(span);
 
-	var subQueries = newSubQueries(context, table, span, alias);
+	var subQueries = newSubQueries(newQuery, context, table, span, alias);
 	return newSingleQuery(context, table, filter, span, alias, subQueries, orderBy, limit, offset);
 }
 

package/src/tedious/getManyDto/query/newSubQueries/joinLegToQuery.js

@@ -1,7 +1,6 @@
-var newShallowJoinSql = require('../../../../table/query/singleQuery/joinSql/newShallowJoinSqlCore');
-var newQuery = require('../../newQueryCore');
+const newShallowJoinSql = require('../../../../table/query/singleQuery/joinSql/newShallowJoinSqlCore');
 
-function joinLegToQuery(context, parentAlias, leg, _legNo) {
+function joinLegToQuery(newQuery, context, parentAlias, leg, _legNo) {
 	var childAlias = parentAlias + leg.name;
 	var span = leg.span;
 	var parentTable = leg.table;

package/src/tedious/getManyDto/query/newSubQueries/manyLegToQuery.js

@@ -1,7 +1,6 @@
-var newShallowJoinSql = require('../../../../table/query/singleQuery/joinSql/newShallowJoinSqlCore');
-var newQuery = require('../../newQueryCore');
+const newShallowJoinSql = require('../../../../table/query/singleQuery/joinSql/newShallowJoinSqlCore');
 
-function manyLegToQuery(context, rightAlias, leg, _legNo) {
+function manyLegToQuery(newQuery, context, rightAlias, leg, _legNo) {
 	var leftAlias = rightAlias + leg.name;
 	var span = leg.span;
 	var rightTable = leg.table;

package/src/tedious/getManyDto/query/newSubQueries/oneLegToQuery.js

@@ -1,19 +1,18 @@
-var newShallowJoinSql = require('../../../../table/query/singleQuery/joinSql/newShallowJoinSqlCore');
-var newQuery = require('../../newQueryCore');
-var newParameterized = require('../../../../table/query/newParameterized');
-var util = require('util');
+const newShallowJoinSql = require('../../../../table/query/singleQuery/joinSql/newShallowJoinSqlCore');
+const newParameterized = require('../../../../table/query/newParameterized');
+const formatString = require('../../../../format');
 
-function oneLegToQuery(context, rightAlias, leg, _legNo) {
-	var leftAlias = rightAlias + leg.name;
-	var span = leg.span;
-	var rightTable = leg.table;
-	var rightColumns = rightTable._primaryColumns;
-	var leftColumns = leg.columns;
+function oneLegToQuery(newQuery, context, rightAlias, leg, _legNo) {
+	let leftAlias = rightAlias + leg.name;
+	let span = leg.span;
+	let rightTable = leg.table;
+	let rightColumns = rightTable._primaryColumns;
+	let leftColumns = leg.columns;
 
-	var filter = newShallowJoinSql(context, rightTable, leftColumns, rightColumns, leftAlias, rightAlias, leg.span.where);
-	var query = newQuery(context, span.table, filter, span, leftAlias);
-	var sql = 'SELECT TOP 1' + query.sql().substring(6);
-	return newParameterized(util.format('JSON_QUERY((%s FOR JSON PATH, INCLUDE_NULL_VALUES, WITHOUT_ARRAY_WRAPPER)) "%s"', sql, leg.name), query.parameters);
+	let filter = newShallowJoinSql(context, rightTable, leftColumns, rightColumns, leftAlias, rightAlias, leg.span.where);
+	let query = newQuery(context, span.table, filter, span, leftAlias);
+	let sql = 'SELECT TOP 1' + query.sql().substring(6);
+	return newParameterized(formatString('JSON_QUERY((%s FOR JSON PATH, INCLUDE_NULL_VALUES, WITHOUT_ARRAY_WRAPPER)) "%s"', sql, leg.name), query.parameters);
 }
 
 module.exports = oneLegToQuery;

package/src/tedious/getManyDto/query/newSubQueries.js

@@ -1,21 +1,21 @@
-var joinLegToQuery = _joinLegToQuery;
-var oneLegToQuery = _oneLegToQuery;
-var manyLegToQuery = _manyLegToQuery;
-var newParameterized = require('../../../table/query/newParameterized');
+const newParameterized = require('../../../table/query/newParameterized');
+const joinLegToQuery = require('./newSubQueries/joinLegToQuery');
+const oneLegToQuery = require('./newSubQueries/oneLegToQuery');
+const manyLegToQuery = require('./newSubQueries/manyLegToQuery');
 
-function newSubQueries(context, _table, span, alias) {
+function newSubQueries(newQuery, context, _table, span, alias) {
 	var result = newParameterized('', []);
 	var c = {};
 	var _legNo;
 
 	c.visitJoin = function(leg) {
-		result = result.append(',').append(joinLegToQuery(context, alias, leg, _legNo));
+		result = result.append(',').append(joinLegToQuery(newQuery, context, alias, leg, _legNo));
 	};
 	c.visitOne = function(leg) {
-		result = result.append(',').append(oneLegToQuery(context, alias, leg, _legNo));
+		result = result.append(',').append(oneLegToQuery(newQuery, context, alias, leg, _legNo));
 	};
 	c.visitMany = function(leg) {
-		result = result.append(',').append(manyLegToQuery(context, alias, leg, _legNo));
+		result = result.append(',').append(manyLegToQuery(newQuery, context, alias, leg, _legNo));
 	};
 
 	span.legs.forEach(onEachLeg);
@@ -28,21 +28,4 @@ function newSubQueries(context, _table, span, alias) {
 	return result;
 }
 
-function _joinLegToQuery() {
-	joinLegToQuery = require('./newSubQueries/joinLegToQuery');
-	return joinLegToQuery.apply(null, arguments);
-}
-
-function _oneLegToQuery() {
-	oneLegToQuery = require('./newSubQueries/oneLegToQuery');
-	return oneLegToQuery.apply(null, arguments);
-}
-
-function _manyLegToQuery() {
-	manyLegToQuery = require('./newSubQueries/manyLegToQuery');
-	return manyLegToQuery.apply(null, arguments);
-}
-
-
-
 module.exports = newSubQueries;

package/src/tedious/newPool.js

@@ -1,4 +1,4 @@
-const promisify = require('node:util').promisify;
+const promisify = require('../promisify');
 const pools = require('../pools');
 const end = require('./pool/end');
 const newGenericPool = require('./pool/newGenericPool');

package/src/tedious/pool/newGenericPool.js

@@ -1,6 +1,5 @@
 // @ts-nocheck
 /* eslint-disable no-prototype-builtins */
-var EventEmitter = require('events').EventEmitter;
 
 var defaults = require('../../poolDefaults');
 var genericPool = require('../../generic-pool');
@@ -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/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/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;

package/src/table/createReadStreamDefault.js

@@ -1,102 +0,0 @@
-var extractFilter = require('./query/extractFilter');
-var cloneStrategy = require('./cloneStrategy');
-var defaultBatchSize = 200;
-var Readable = require('stream').Readable;
-var createBatchFilter = require('./readStreamDefault/createBatchFilter');
-
-function createReadStream(table, db, filter, strategy, streamOptions) {
-	filter = extractFilter(filter);
-	var batchFilter;
-	strategy = cloneStrategy(strategy);
-	calculateOrderBy();
-	streamOptions = streamOptions || {};
-	var batchSize = streamOptions.batchSize || defaultBatchSize;
-	batchSize = (batchSize + 1) / 2 >> 0;
-	var maxRows = strategy.limit;
-	var currentRowCount = 0;
-	var busy;
-	var waitingforMore;
-	var dtos = [];
-	var lastDto;
-	var done;
-
-	var stream = Readable({ objectMode: true });
-	stream._read = function() {
-		waitingforMore = true;
-		if (!busy) {
-			if (dtos.length > 0)
-				negotiatePushStream();
-			else
-				getDtos();
-		}
-	};
-	if (process.domain)
-		process.domain.add(stream);
-
-	function getDtos() {
-		busy = true;
-		return db.transaction(async () => {
-			await getBatch()
-				.then(onDtos);
-		})
-			.then(negotiatePushStream, onError);
-	}
-
-	function onDtos(result) {
-		busy = false;
-		currentRowCount += result.length;
-		lastDto = result[result.length - 1];
-		dtos = dtos.concat(result);
-		if (currentRowCount >= maxRows || result.length < batchSize) {
-			dtos.push(null);
-			done = true;
-		}
-	}
-
-	function negotiatePushStream() {
-		if (dtos.length <= batchSize && !done)
-			getDtos();
-		if (!waitingforMore)
-			return;
-		waitingforMore = false;
-		stream.push(dtos.shift());
-	}
-
-	function getBatch() {
-		calculateLimit();
-		calculateBatchFilter();
-		return table.getMany(batchFilter, strategy);
-	}
-
-	function calculateLimit() {
-		if (maxRows === undefined || maxRows === null)
-			strategy.limit = batchSize;
-		else {
-			var rowsLeft = maxRows - currentRowCount;
-			strategy.limit = Math.min(rowsLeft, batchSize);
-		}
-	}
-
-	function calculateOrderBy() {
-		strategy.orderBy = strategy.orderBy || [];
-		if (typeof strategy.orderBy === 'string') {
-			strategy.orderBy = [strategy.orderBy];
-		}
-		var primaryColumns = table._primaryColumns;
-		for (var i = 0; i < primaryColumns.length; i++) {
-			strategy.orderBy.push(primaryColumns[i].alias);
-		}
-	}
-
-	function calculateBatchFilter() {
-		batchFilter = createBatchFilter(table, filter, strategy, lastDto);
-	}
-
-	function onError(e) {
-		stream.emit('error', e);
-	}
-
-	return stream;
-}
-
-module.exports = createReadStream;

package/src/table/createReadStreamNative.js

@@ -1,17 +0,0 @@
-var createReadStreamCore = require('./createReadStreamCoreNative');
-var Stream = require('stream');
-
-function createReadStreamNative(table, db, filter, strategy, streamOptions) {
-	var transformer = Stream.Transform({ objectMode: true });
-	transformer._transform = function(chunk, _enc, cb) {
-		let result = chunk.result;
-		if (typeof result === 'string')
-			result = JSON.parse(result);
-		transformer.push(result);
-		cb();
-	};
-
-	return createReadStreamCore(table, db, filter, strategy, transformer, streamOptions);
-}
-
-module.exports = createReadStreamNative;

package/src/table/readStream/extractLimit.js

@@ -1,7 +0,0 @@
-function extractLimit(span) {
-	if (span.limit)
-		return ' limit ' + span.limit;
-	return '';
-}
-
-module.exports = extractLimit;