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

package/src/table/query/singleQuery/columnSql/newJoinedColumnSql.js

@@ -1,27 +1,4 @@
-var joinLegToColumnSql = require('./joinLegToColumnSql');
+const { newJoinedColumnSql } = require('./sharedJoinUtils');
 
-module.exports = function(span, alias, ignoreNull) {
-	var c = {};
-	var sql = '';
 
-	c.visitJoin = function(leg) {
-		var joinSql = joinLegToColumnSql(leg, alias + leg.name, ignoreNull);
-		sql = sql + joinSql;
-	};
-
-	c.visitOne = function(leg) {
-		c.visitJoin(leg);
-	};
-
-	c.visitMany = function() {
-	};
-
-
-	span.legs.forEach(onEach);
-
-	function onEach(leg) {
-		leg.accept(c);
-	}
-
-	return sql;
-};
+module.exports = newJoinedColumnSql;

package/src/table/query/singleQuery/columnSql/newShallowColumnSql.js

@@ -1,7 +1,7 @@
 const getSessionSingleton = require('../../../getSessionSingleton');
 
-function _new(table, alias, span, ignoreNulls) {
-	const quote = getSessionSingleton('quote');
+function _new(context, table, alias, span, ignoreNulls) {
+	const quote = getSessionSingleton(context, 'quote');
 	const quotedAlias = quote(alias);
 	let columnsMap = span.columns;
 	var columns = table._columns;
@@ -28,11 +28,11 @@ function _new(table, alias, span, ignoreNulls) {
 	return sql;
 
 	function formatColumn(column) {
-		const formatted = column.formatOut ? column.formatOut(quotedAlias) : quotedAlias + '.' + quote(column._dbName);
+		const formatted = column.formatOut ? column.formatOut(context, quotedAlias) : quotedAlias + '.' + quote(column._dbName);
 		if (column.dbNull === null)
 			return formatted;
 		else {
-			const encoded = column.encode.unsafe(column.dbNull);
+			const encoded = column.encode.unsafe(context, column.dbNull);
 			return `CASE WHEN ${formatted}=${encoded} THEN null ELSE ${formatted} END`;
 		}
 	}

package/src/table/query/singleQuery/columnSql/sharedJoinUtils.js

@@ -0,0 +1,37 @@
+var newShallowColumnSql = require('./newShallowColumnSql');
+
+function joinLegToColumnSql(context, leg, alias, ignoreNull) {
+	var span = leg.span;
+	var shallowColumnSql = newShallowColumnSql(context, span.table, alias, span, ignoreNull);
+	var joinedColumnSql = newJoinedColumnSql(context, span, alias, ignoreNull);
+	return ',' + shallowColumnSql + joinedColumnSql;
+}
+
+function newJoinedColumnSql(context, span, alias, ignoreNull) {
+	var c = {};
+	var sql = '';
+
+	c.visitJoin = function(leg) {
+		var joinSql = joinLegToColumnSql(context, leg, alias + leg.name, ignoreNull);
+		sql = sql + joinSql;
+	};
+
+	c.visitOne = function(leg) {
+		c.visitJoin(leg);
+	};
+
+	c.visitMany = function() {
+	};
+
+
+	span.legs.forEach(onEach);
+
+	function onEach(leg) {
+		leg.accept(c);
+	}
+
+	return sql;
+}
+
+
+module.exports = { joinLegToColumnSql, newJoinedColumnSql };

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

@@ -1,13 +1,8 @@
 var joinLegToShallowJoinSql = require('./joinLegToShallowJoinSql');
-var newJoinSql = _newJoinSql;
 
-function toJoinSql(leg,alias,childAlias) {
-	return joinLegToShallowJoinSql(leg,alias,childAlias).append(newJoinSql(leg.span,childAlias));
+function toJoinSql(newJoinSql, context,leg,alias,childAlias) {
+	return joinLegToShallowJoinSql(context,leg,alias,childAlias).append(newJoinSql(context,leg.span,childAlias));
 }
 
-function _newJoinSql() {
-	newJoinSql = require('../newJoinSql');
-	return newJoinSql.apply(null,arguments);
-}
 
 module.exports = toJoinSql;

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

@@ -1,9 +1,9 @@
 var newShallowJoinSql = require('./newShallowJoinSql');
 
-function toJoinSql(leg,alias,childAlias) {
+function toJoinSql(context,leg,alias,childAlias) {
 	var columns = leg.columns;
 	var childTable = leg.span.table;
-	return newShallowJoinSql(childTable,columns,childTable._primaryColumns,alias,childAlias,leg.span.where).prepend(' LEFT');
+	return newShallowJoinSql(context,childTable,columns,childTable._primaryColumns,alias,childAlias,leg.span.where).prepend(' LEFT');
 }
 
 module.exports = toJoinSql;

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

@@ -1,7 +1,7 @@
 var newDiscriminatorSqlCore = require('../newDiscriminatorSql');
 
-function newDiscriminatorSql(table, alias) {
-	var result = newDiscriminatorSqlCore(table,alias);
+function newDiscriminatorSql(context, table, alias) {
+	var result = newDiscriminatorSqlCore(context,table,alias);
 	if (result)
 		return ' AND' + result;
 	return result;

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

@@ -1,10 +1,10 @@
-var newJoinCore = require('./newShallowJoinSqlCore');
+const newJoinCore = require('./newShallowJoinSqlCore');
 const getSessionSingleton = require('../../../getSessionSingleton');
 
-function _new(rightTable,leftColumns,rightColumns,leftAlias,rightAlias, filter) {
-	const quote = getSessionSingleton('quote');
-	var sql = ' JOIN ' + quote(rightTable._dbName) + ' ' +  quote(rightAlias) + ' ON (';
-	var joinCore = newJoinCore(rightTable,leftColumns,rightColumns,leftAlias,rightAlias,filter);
+function _new(context, rightTable, leftColumns, rightColumns, leftAlias, rightAlias, filter) {
+	const quote = getSessionSingleton(context, 'quote');
+	const sql = ' JOIN ' + quote(rightTable._dbName) + ' ' + quote(rightAlias) + ' ON (';
+	const joinCore = newJoinCore(context, rightTable, leftColumns, rightColumns, leftAlias, rightAlias, filter);
 	return joinCore.prepend(sql).append(')');
 }
 

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

@@ -1,8 +1,9 @@
-var newDiscriminatorSql = require('./newDiscriminatorSql');
-var newParameterized = require('../../newParameterized');
-var quote = require('../../../quote');
+const newDiscriminatorSql = require('./newDiscriminatorSql');
+const newParameterized = require('../../newParameterized');
+const getSessionSingleton = require('../../../getSessionSingleton');
 
-function _new(rightTable,leftColumns,rightColumns,leftAlias,rightAlias,filter) {
+function _new(context, rightTable, leftColumns, rightColumns, leftAlias, rightAlias, filter) {
+	const quote = getSessionSingleton(context, 'quote');
 	leftAlias = quote(leftAlias);
 	rightAlias = quote(rightAlias);
 	var sql = '';
@@ -18,7 +19,7 @@ function _new(rightTable,leftColumns,rightColumns,leftAlias,rightAlias,filter) {
 		sql += delimiter + leftAlias + '.' + quote(leftColumn._dbName) + '=' + rightAlias + '.' + quote(rightColumn._dbName);
 	}
 
-	sql += newDiscriminatorSql(rightTable,rightAlias);
+	sql += newDiscriminatorSql(context, rightTable, rightAlias);
 	var result = newParameterized(sql);
 	if (filter)
 		result = result.append(delimiter).append(filter);

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

@@ -1,13 +1,7 @@
 var oneLegToShallowJoinSql = require('./oneLegToShallowJoinSql');
-var newJoinSql = _newJoinSql;
 
-function toJoinSql(leg,alias,childAlias) {
-	return oneLegToShallowJoinSql(leg,alias,childAlias).append(newJoinSql(leg.span,childAlias));
-}
-
-function _newJoinSql() {
-	newJoinSql = require('../newJoinSql');
-	return newJoinSql.apply(null,arguments);
+function toJoinSql(newJoinSql, context,leg,alias,childAlias) {
+	return oneLegToShallowJoinSql(context,leg,alias,childAlias).append(newJoinSql(context,leg.span,childAlias));
 }
 
 module.exports = toJoinSql;

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

@@ -1,10 +1,10 @@
 var newShallowJoinSql = require('./newShallowJoinSql');
 
-function toJoinSql(leg,alias,childAlias) {
+function toJoinSql(context,leg,alias,childAlias) {
 	var parentTable = leg.table;
 	var columns = leg.columns;
 	var childTable = leg.span.table;
-	return newShallowJoinSql(childTable,parentTable._primaryColumns,columns,alias,childAlias, leg.span.where).prepend(' LEFT');
+	return newShallowJoinSql(context,childTable,parentTable._primaryColumns,columns,alias,childAlias, leg.span.where).prepend(' LEFT');
 }
 
 module.exports = toJoinSql;

package/src/table/query/singleQuery/negotiateExclusive.js

@@ -1,8 +1,8 @@
 var getSessionSingleton = require('../../getSessionSingleton');
 
-function negotiateExclusive(table, alias, _exclusive) {
+function negotiateExclusive(context, table, alias, _exclusive) {
 	if (table._exclusive || _exclusive) {
-		var encode =  getSessionSingleton('selectForUpdateSql');
+		var encode =  getSessionSingleton(context, 'selectForUpdateSql');
 		return encode(alias);
 	}
 	return '';

package/src/table/query/singleQuery/newColumnSql.js

@@ -1,8 +1,8 @@
 var newShallowColumnSql = require('./columnSql/newShallowColumnSql');
 var newJoinedColumnSql = require('./columnSql/newJoinedColumnSql');
 
-module.exports = function(table,span,alias,ignoreNull) {
-	var shallowColumnSql = newShallowColumnSql(table,alias, span, ignoreNull);
-	var joinedColumnSql = newJoinedColumnSql(span,alias, ignoreNull);
+module.exports = function(context,table,span,alias,ignoreNull) {
+	var shallowColumnSql = newShallowColumnSql(context,table,alias, span, ignoreNull);
+	var joinedColumnSql = newJoinedColumnSql(context, span,alias, ignoreNull);
 	return shallowColumnSql + joinedColumnSql;
 };

package/src/table/query/singleQuery/newDiscriminatorSql.js

@@ -1,7 +1,7 @@
 const getSessionSingleton = require('../../getSessionSingleton');
 
-function newDiscriminatorSql(table, alias) {
-	const quote = getSessionSingleton('quote');
+function newDiscriminatorSql(context, table, alias) {
+	const quote = getSessionSingleton(context, 'quote');
 	alias = quote(alias);
 	var result = '';
 	var formulaDiscriminators = table._formulaDiscriminators;

package/src/table/query/singleQuery/newJoinSql.js

@@ -1,18 +1,18 @@
-var joinLegToJoinSql = require('./joinSql/joinLegToJoinSql');
-var oneLegToJoinSql = require('./joinSql/oneLegToJoinSql');
-var newParameterized = require('../newParameterized');
+const joinLegToJoinSql = require('./joinSql/joinLegToJoinSql');
+const oneLegToJoinSql = require('./joinSql/oneLegToJoinSql');
+const newParameterized = require('../newParameterized');
 
-function _new(span,alias = '') {
+function newJoinSql(context,span,alias = '') {
 	var sql = newParameterized('');
 	var childAlias;
 
 	var c = {};
 	c.visitJoin = function(leg) {
-		sql = joinLegToJoinSql(leg,alias,childAlias).prepend(sql);
+		sql = joinLegToJoinSql(newJoinSql, context,leg,alias,childAlias).prepend(sql);
 	};
 
 	c.visitOne = function(leg) {
-		sql = oneLegToJoinSql(leg,alias,childAlias).prepend(sql);
+		sql = oneLegToJoinSql(newJoinSql, context,leg,alias,childAlias).prepend(sql);
 	};
 
 	c.visitMany = function() {};
@@ -38,4 +38,4 @@ function _new(span,alias = '') {
 	return sql;
 }
 
-module.exports = _new;
+module.exports = newJoinSql;

package/src/table/query/singleQuery/newWhereSql.js

@@ -1,16 +1,16 @@
 var newDiscriminatorSql = require('./newDiscriminatorSql');
 var newParameterized = require('../../../table/query/newParameterized');
 
-function newWhereSql(table,filter,alias) {
+function newWhereSql(context, table, filter, alias) {
 	var separator = ' where';
 	var result = newParameterized('');
 	var sql = filter.sql();
-	var discriminator = newDiscriminatorSql(table, alias);
+	var discriminator = newDiscriminatorSql(context, table, alias);
 	if (sql) {
 		result = filter.prepend(separator + ' ');
 		separator = ' AND';
 	}
-	if(discriminator)
+	if (discriminator)
 		result = result.append(separator + discriminator);
 
 	return result;

package/src/table/quote.js

@@ -1,10 +1,10 @@
 let tryGetSessionContext = require('./tryGetSessionContext');
 
-function quote(name) {
-	let context = tryGetSessionContext();
-	if (!context)
+function quote(context, name) {
+	let rdb = tryGetSessionContext(context);
+	if (!rdb)
 		throw new Error('Rdb transaction is no longer available. Is promise chain broken ?');
-	let fn = context.quote || (() => `"${name}"`);
+	let fn = rdb.quote || (() => `"${name}"`);
 	return fn(name);
 }
 

package/src/table/relatedTable/aggregate.js

@@ -1,10 +1,9 @@
-let newRelatedTable = _newRelatedTable;
 let tryGetSessionContext = require('../tryGetSessionContext');
 
 function newAggregate(_relations) {
 
-	function aggregate(fn) {
-		const includeMany = tryGetSessionContext()?.engine === 'mssql';
+	function aggregate(context, fn) {
+		const includeMany = tryGetSessionContext(context)?.engine === 'mssql';
 		let { relations, alias } = extract(includeMany, _relations);
 		const table = relations[relations.length - 1].childTable;
 		if (!relations[0].isMany || includeMany)
@@ -40,9 +39,4 @@ function newAggregate(_relations) {
 
 }
 
-function _newRelatedTable() {
-	newRelatedTable = require('../newRelatedTable');
-	return newRelatedTable.apply(null, arguments);
-}
-
 module.exports = newAggregate;

package/src/table/relatedTable/all.js

@@ -1,24 +1,18 @@
-let newRelatedTable = _newRelatedTable;
 const negotiateRawSqlFilter = require('../column/negotiateRawSqlFilter');
 let subFilter = require('./subFilter');
 let isShallow = true;
 
-function newAll(relations, depth) {
+function newAll(newRelatedTable, relations, depth) {
 
-	function all(fn) {
+	function all(context, fn) {
 		let relatedTable = newRelatedTable(relations, isShallow, depth + 1);
 		let arg = typeof fn === 'function' ? fn(relatedTable) : fn;
-		let anyFilter = negotiateRawSqlFilter(arg);
-		let anySubFilter = subFilter(relations, anyFilter, depth);
-		let notFilter = subFilter(relations, anyFilter.not(), depth).not();
-		return anySubFilter.and(notFilter);
+		let anyFilter = negotiateRawSqlFilter(context, arg);
+		let anySubFilter = subFilter(context, relations, anyFilter, depth);
+		let notFilter = subFilter(context, relations, anyFilter.not(), depth).not();
+		return anySubFilter.and(context, notFilter);
 	}
 	return all;
 }
 
-function _newRelatedTable() {
-	newRelatedTable = require('../newRelatedTable');
-	return newRelatedTable.apply(null, arguments);
-}
-
 module.exports = newAll;

package/src/table/relatedTable/any.js

@@ -1,26 +1,19 @@
-let newRelatedTable = _newRelatedTable;
 const negotiateRawSqlFilter = require('../column/negotiateRawSqlFilter');
-// let subFilter = require('./subFilterAny');
 let subFilter = require('./subFilter');
 let isShallow = true;
 
-function newAny(relations, depth) {
+function newAny(newRelatedTable, relations, depth) {
 
-	function any(fn) {
+	function any(context, fn) {
 		let relatedTable = newRelatedTable(relations, isShallow, depth + 1);
 		let arg = typeof fn === 'function' ? fn(relatedTable) : fn;
-		let filter = negotiateRawSqlFilter(arg);
-		let sub =  subFilter(relations, filter, depth);
+		let filter = negotiateRawSqlFilter(context, arg);
+		let sub =  subFilter(context, relations, filter, depth);
 		return sub;
 	}
 	return any;
 }
 
-function _newRelatedTable() {
-	newRelatedTable = require('../newRelatedTable');
-	return newRelatedTable.apply(null, arguments);
-}
-
 module.exports = newAny;
 
 //

package/src/table/relatedTable/childColumn.js

@@ -5,16 +5,16 @@ const getSessionSingleton = require('../getSessionSingleton');
 const _quote = require('../quote');
 
 
-function childColumn(column, relations) {
-	const quote = getSessionSingleton('quote');
-	const context = getSessionContext();
-	const outerAlias = 'y' + context.aggregateCount++;
+function childColumn(context, column, relations) {
+	const quote = getSessionSingleton(context, 'quote');
+	const rdb = getSessionContext(context);
+	const outerAlias = 'y' + rdb.aggregateCount++;
 	const outerAliasQuoted = quote(outerAlias);
 	const alias = 'x' + relations.length;
-	const foreignKeys = getForeignKeys(relations[0]);
+	const foreignKeys = getForeignKeys(context, relations[0]);
 	const select = ` LEFT JOIN (SELECT ${foreignKeys},${alias}.${quote(column._dbName)} as prop`;
-	const innerJoin = relations.length > 1 ? newJoin(relations).sql() : '';
-	const onClause = createOnClause(relations[0], outerAlias);
+	const innerJoin = relations.length > 1 ? newJoin(context, relations).sql() : '';
+	const onClause = createOnClause(context, relations[0], outerAlias);
 	const from = ` FROM ${quote(relations.at(-1).childTable._dbName)} ${alias} ${innerJoin}) ${outerAliasQuoted} ON (${onClause})`;
 	const join = select  + from ;
 
@@ -26,13 +26,13 @@ function childColumn(column, relations) {
 	};
 }
 
-function createOnClause(relation, rightAlias) {
+function createOnClause(context, relation, rightAlias) {
 	var c = {};
 	var sql = '';
 	let leftAlias = relation.parentTable._rootAlias || relation.parentTable._dbName;
 
 	c.visitJoin = function(relation) {
-		sql = newJoinCore(relation.childTable,relation.columns,relation.childTable._primaryColumns,leftAlias,rightAlias).sql();
+		sql = newJoinCore(context, relation.childTable,relation.columns,relation.childTable._primaryColumns,leftAlias,rightAlias).sql();
 	};
 
 	c.visitOne = function(relation) {
@@ -47,20 +47,20 @@ function createOnClause(relation, rightAlias) {
 		var parentTable = relation.parentTable;
 		var columns = joinRelation.columns;
 
-		sql = newJoinCore(childTable,parentTable._primaryColumns,columns,leftAlias, rightAlias).sql();
+		sql = newJoinCore(context, childTable,parentTable._primaryColumns,columns,leftAlias, rightAlias).sql();
 	}
 	relation.accept(c);
 	return sql;
 }
 
-function getForeignKeys(relation) {
+function getForeignKeys(context, relation) {
 	let columns;
 	let alias = 'x1';
 	if (relation.joinRelation)
 		columns = relation.joinRelation.columns;
 	else
 		columns = relation.childTable._primaryColumns;
-	return columns.map(x => `${alias}.${_quote(x._dbName)}`).join(',');
+	return columns.map(x => `${alias}.${_quote(context, x._dbName)}`).join(',');
 }
 
 module.exports = childColumn;

package/src/table/relatedTable/columnAggregate.js

@@ -1,8 +1,8 @@
 const getSessionSingleton = require('../getSessionSingleton');
 var newJoinArray = require('./joinSqlArray');
 
-function columnAggregate(operator, column, relations, coalesce = true) {
-	const quote = getSessionSingleton('quote');
+function columnAggregate(context, operator, column, relations, coalesce = true) {
+	const quote = getSessionSingleton(context, 'quote');
 
 	let tableAlias = relations.reduce((prev,relation) => {
 		return prev + relation.toLeg().name;
@@ -13,7 +13,7 @@ function columnAggregate(operator, column, relations, coalesce = true) {
 	return {
 		expression: (alias) => coalesce ? `COALESCE(${operator}(${tableAlias}.${columnName}), 0) as ${quote(alias)}` : `${operator}(${tableAlias}.${columnName}) as ${alias}`,
 
-		joins: newJoinArray(relations)
+		joins: newJoinArray(context, relations)
 	};
 }
 

package/src/table/relatedTable/columnAggregateGroup.js

@@ -3,21 +3,21 @@ var getSessionContext = require('../getSessionContext');
 var newJoinCore = require('../query/singleQuery/joinSql/newShallowJoinSqlCore');
 const getSessionSingleton = require('../getSessionSingleton');
 
-function columnAggregate(operator, column, relations, coalesce = true) {
-	const quote = getSessionSingleton('quote');
-	const context = getSessionContext();
-	const outerAlias = 'y' + context.aggregateCount++;
+function columnAggregate(context, operator, column, relations, coalesce = true) {
+	const quote = getSessionSingleton(context, 'quote');
+	const rdb = getSessionContext(context);
+	const outerAlias = 'y' + rdb.aggregateCount++;
 	const outerAliasQuoted = quote(outerAlias);
 	const alias = quote('x' + relations.length);
 	const foreignKeys = getForeignKeys(relations[0]);
 	const select = ` LEFT JOIN (SELECT ${foreignKeys},${operator}(${alias}.${quote(column._dbName)}) as amount`;
-	const innerJoin = relations.length > 1 ? newJoin(relations).sql() : '';
-	const onClause = createOnClause(relations[0], outerAlias);
+	const innerJoin = relations.length > 1 ? newJoin(context, relations).sql() : '';
+	const onClause = createOnClause(context, relations[0], outerAlias);
 	const from = ` FROM ${quote(relations.at(-1).childTable._dbName)} ${alias} ${innerJoin} GROUP BY ${foreignKeys}) ${outerAliasQuoted} ON (${onClause})`;
-	const join = select  + from ;
+	const join = select + from;
 
 	return {
-		expression: (alias) => coalesce? `COALESCE(${outerAliasQuoted}.amount, 0) as ${quote(alias)}` : `${outerAliasQuoted}.amount as ${alias}`,
+		expression: (alias) => coalesce ? `COALESCE(${outerAliasQuoted}.amount, 0) as ${quote(alias)}` : `${outerAliasQuoted}.amount as ${alias}`,
 		joins: [join]
 	};
 
@@ -32,13 +32,13 @@ function columnAggregate(operator, column, relations, coalesce = true) {
 	}
 }
 
-function createOnClause(relation, rightAlias) {
+function createOnClause(context, relation, rightAlias) {
 	var c = {};
 	var sql = '';
 	let leftAlias = relation.parentTable._rootAlias || relation.parentTable._dbName;
 
 	c.visitJoin = function(relation) {
-		sql = newJoinCore(relation.childTable,relation.columns,relation.childTable._primaryColumns,leftAlias,rightAlias).sql();
+		sql = newJoinCore(context, relation.childTable, relation.columns, relation.childTable._primaryColumns, leftAlias, rightAlias).sql();
 	};
 
 	c.visitOne = function(relation) {
@@ -53,7 +53,7 @@ function createOnClause(relation, rightAlias) {
 		var parentTable = relation.parentTable;
 		var columns = joinRelation.columns;
 
-		sql = newJoinCore(childTable,parentTable._primaryColumns,columns,leftAlias, rightAlias).sql();
+		sql = newJoinCore(context, childTable, parentTable._primaryColumns, columns, leftAlias, rightAlias).sql();
 	}
 
 	relation.accept(c);

package/src/table/relatedTable/joinSql.js

@@ -1,7 +1,7 @@
 var newShallowJoinSql = require('../query/singleQuery/joinSql/newShallowJoinSql');
 var newParameterized = require('../query/newParameterized');
 
-function newJoinSql(relations, depth = 0) {
+function newJoinSql(context, relations, depth = 0) {
 	var leftAlias,
 		rightAlias;
 	var relation;
@@ -10,7 +10,7 @@ function newJoinSql(relations, depth = 0) {
 
 	c.visitJoin = function(relation) {
 		//todo fix discriminators on childTable
-		sql = newShallowJoinSql(relation.parentTable,relation.childTable._primaryColumns,relation.columns,leftAlias,rightAlias).prepend(' INNER').prepend(sql);
+		sql = newShallowJoinSql(context, relation.parentTable, relation.childTable._primaryColumns, relation.columns, leftAlias, rightAlias).prepend(' INNER').prepend(sql);
 	};
 
 	c.visitOne = function(relation) {
@@ -25,11 +25,11 @@ function newJoinSql(relations, depth = 0) {
 		var rightColumns = table._primaryColumns;
 		var leftColumns = joinRelation.columns;
 
-		sql = newShallowJoinSql(table,leftColumns,rightColumns,leftAlias,rightAlias).prepend(' INNER').prepend(sql);
+		sql = newShallowJoinSql(context, table, leftColumns, rightColumns, leftAlias, rightAlias).prepend(' INNER').prepend(sql);
 	}
 
-	for (let i = relations.length-1; i > depth; i--) {
-		leftAlias = 'x' + (i+1);
+	for (let i = relations.length - 1; i > depth; i--) {
+		leftAlias = 'x' + (i + 1);
 		rightAlias = 'x' + i;
 		relation = relations[i];
 		relation.accept(c);

package/src/table/relatedTable/joinSqlArray.js

@@ -1,6 +1,6 @@
 const newShallowJoinSql = require('../query/singleQuery/joinSql/newShallowJoinSql');
 
-function _new(relations) {
+function _new(context, relations) {
 
 	let result = [];
 	let leftAlias =  relations[0].parentTable._dbName;
@@ -10,11 +10,11 @@ function _new(relations) {
 
 	let c = {};
 	c.visitJoin = function(relation) {
-		sql = newShallowJoinSql(relation.childTable,relation.columns,relation.childTable._primaryColumns,leftAlias,rightAlias).prepend(' LEFT').sql();
+		sql = newShallowJoinSql(context, relation.childTable,relation.columns,relation.childTable._primaryColumns,leftAlias,rightAlias).prepend(' LEFT').sql();
 	};
 
 	c.visitOne = function(relation) {
-		sql = newShallowJoinSql(relation.childTable,relation.parentTable._primaryColumns,relation.joinRelation.columns,leftAlias,rightAlias).prepend(' LEFT').sql();
+		sql = newShallowJoinSql(context, relation.childTable,relation.parentTable._primaryColumns,relation.joinRelation.columns,leftAlias,rightAlias).prepend(' LEFT').sql();
 	};
 
 	c.visitMany = c.visitOne;

package/src/table/relatedTable/none.js

@@ -1,22 +1,16 @@
-let newRelatedTable = _newRelatedTable;
 const negotiateRawSqlFilter = require('../column/negotiateRawSqlFilter');
 let subFilter = require('./subFilter');
 let isShallow = true;
 
-function newNone(relations, depth) {
+function newNone(newRelatedTable, relations, depth) {
 
-	function none(fn) {
+	function none(context, fn) {
 		let relatedTable = newRelatedTable(relations, isShallow, depth + 1);
 		let arg = typeof fn === 'function' ? fn(relatedTable) : fn;
-		let filter = negotiateRawSqlFilter(arg);
-		return subFilter(relations, filter, depth).not();
+		let filter = negotiateRawSqlFilter(context, arg);
+		return subFilter(context, relations, filter, depth).not();
 	}
 	return none;
 }
 
-function _newRelatedTable() {
-	newRelatedTable = require('../newRelatedTable');
-	return newRelatedTable.apply(null, arguments);
-}
-
 module.exports = newNone;