orange-orm 4.4.2 → 4.5.0-beta.1

package/src/table/column/date.js

@@ -8,7 +8,7 @@ function _new(column) {
 	column.purify = purify;
 	column.encode = newEncode(column);
 	column.decode = newDecode(column);
-	column.formatOut = formatOut.bind(null, column);
+	column.formatOut = (context, ...rest) => formatOut.apply(null, [context, column, ...rest]);
 }
 
 module.exports = _new;

package/src/table/column/dateWithTimeZone/newEncode.js

@@ -1,9 +1,8 @@
 var newPara = require('../../query/newParameterized');
 var purify = require('../date/purify');
-// var getSessionSingleton = require('../../getSessionSingleton');
 
 function _new(column) {
-	var encode = function(value) {
+	var encode = function(_context, value) {
 		value = purify(value);
 		if (value == null) {
 			if (column.dbNull === null)
@@ -13,7 +12,7 @@ function _new(column) {
 		return newPara('?', [encodeDate(value)]);
 	};
 
-	encode.unsafe = function(value) {
+	encode.unsafe = function(_context, value) {
 		value = purify(value);
 		if (value == null) {
 			if (column.dbNull === null)
@@ -23,7 +22,7 @@ function _new(column) {
 		return encodeDate(value);
 	};
 
-	encode.direct = function(value) {
+	encode.direct = function(_context, value) {
 		return encodeDate(value);
 	};
 

package/src/table/column/dateWithTimeZone.js

@@ -8,7 +8,7 @@ function _new(column) {
 	column.purify = purify;
 	column.encode = newEncode(column);
 	column.decode = newDecode(column);
-	column.formatOut = formatOut.bind(null, column);
+	column.formatOut = (context, ...rest) => formatOut.apply(null, [context, column, ...rest]);
 }
 
 module.exports = _new;

package/src/table/column/encodeFilterArg.js

@@ -1,8 +1,8 @@
-function encodeFilterArg(column, arg) {
+function encodeFilterArg(context, column, arg) {
 	if (column.encode.safe)
-		return column.encode.safe(arg);
+		return column.encode.safe(context, arg);
 	else
-		return column.encode(arg);
+		return column.encode(context, arg);
 }
 
 module.exports = encodeFilterArg;

package/src/table/column/equal.js

@@ -3,12 +3,12 @@ var nullOperator = ' is ';
 var encodeFilterArg = require('./encodeFilterArg');
 var quote = require('../quote');
 
-function equal(column,arg,alias) {
+function equal(context, column,arg,alias) {
 	var operator = '=';
-	var encoded = encodeFilterArg(column, arg);
+	var encoded = encodeFilterArg(context, column, arg);
 	if (encoded.sql() == 'null')
 		operator = nullOperator;
-	var firstPart = quote(alias) + '.' + quote(column._dbName) + operator;
+	var firstPart = quote(context, alias) + '.' + quote(context, column._dbName) + operator;
 	var filter =  encoded.prepend(firstPart);
 	return newBoolean(filter);
 }

package/src/table/column/extractAlias.js

@@ -1,8 +1,6 @@
 function extract(table, optionalAlias) {
-
 	if (optionalAlias)
 		return optionalAlias;
-	// return table._rootAlias || quote(table._dbName);
 	return table._rootAlias || table._dbName;
 }
 

package/src/table/column/greaterThan.js

@@ -2,10 +2,10 @@ var newBoolean = require('./newBoolean');
 var encodeFilterArg = require('./encodeFilterArg');
 var quote = require('../quote');
 
-function greaterThan(column,arg,alias) {
+function greaterThan(context, column,arg,alias) {
 	var operator = '>';
-	var encoded = encodeFilterArg(column, arg);
-	var firstPart = quote(alias) + '.' + quote(column._dbName) + operator;
+	var encoded = encodeFilterArg(context, column, arg);
+	var firstPart = quote(context, alias) + '.' + quote(context, column._dbName) + operator;
 	var filter =  encoded.prepend(firstPart);
 	return newBoolean(filter);
 }

package/src/table/column/greaterThanOrEqual.js

@@ -2,10 +2,10 @@ var newBoolean = require('./newBoolean');
 var encodeFilterArg = require('./encodeFilterArg');
 var quote = require('../quote');
 
-function greaterThanOrEqual(column,arg,alias) {
+function greaterThanOrEqual(context, column,arg,alias) {
 	var operator = '>=';
-	var encoded = encodeFilterArg(column, arg);
-	var firstPart = quote(alias) + '.' + quote(column._dbName) + operator;
+	var encoded = encodeFilterArg(context, column, arg);
+	var firstPart = quote(context, alias) + '.' + quote(context, column._dbName) + operator;
 	var filter =  encoded.prepend(firstPart);
 	return newBoolean(filter);
 }

package/src/table/column/guid/newDecode.js

@@ -1,6 +1,6 @@
 function _new(column) {
 
-	return function(value) {
+	return function(_context, value) {
 		if (value == column.dbNull)
 			return null;
 		return value.toLowerCase();

package/src/table/column/guid/newEncode.js

@@ -3,7 +3,7 @@ var purify = require('./purify');
 
 function _new(column) {
 
-	const encode = function(candidate) {
+	const encode = function(_context, candidate) {
 		var value = purify(candidate);
 		if (value == null) {
 			if (column.dbNull === null)
@@ -13,7 +13,7 @@ function _new(column) {
 		return newPara('\'' + value + '\'');
 	};
 
-	encode.unsafe = function(candidate) {
+	encode.unsafe = function(_context, candidate) {
 		var value = purify(candidate);
 		if (value == null) {
 			if (column.dbNull === null)
@@ -23,7 +23,7 @@ function _new(column) {
 		return '\'' + value + '\'';
 	};
 
-	encode.direct = function(value) {
+	encode.direct = function(_context, value) {
 		return value ;
 	};
 

package/src/table/column/in.js

@@ -2,18 +2,18 @@ const newParameterized = require('../query/newParameterized');
 const newBoolean = require('./newBoolean');
 const quote = require('../quote');
 
-function _in(column,values,alias) {
+function _in(context, column,values,alias) {
 	let filter;
 	if (values.length === 0) {
 		filter =  newParameterized('1=2');
 		return newBoolean(filter);
 	}
-	const firstPart = `${quote(alias)}.${quote(column._dbName)} in (`;
+	const firstPart = `${quote(context, alias)}.${quote(context, column._dbName)} in (`;
 
 	const encode = column.encode.direct;
 	const params = new Array(values.length);
 	for (let i = 0; i < values.length; i++) {
-		params[i] = encode(values[i]);
+		params[i] = encode(context, values[i]);
 	}
 	const sql = `${firstPart +  new Array(values.length).fill('?').join(',')})`;
 	return newBoolean(newParameterized(sql, params));

package/src/table/column/json/formatOut.js

@@ -1,12 +1,12 @@
 var getSessionSingleton = require('../../getSessionSingleton');
 const quote = require('../../quote');
 
-function formatOut(column, alias) {
-	var formatColumn = getSessionSingleton('formatJSONOut');
+function formatOut(context, column, alias) {
+	var formatColumn = getSessionSingleton(context, 'formatJSONOut');
 	if (formatColumn)
 		return formatColumn(column, alias);
 	else
-		return `${alias}.${quote(column._dbName)}`;
+		return `${alias}.${quote(context, column._dbName)}`;
 }
 
 module.exports = formatOut;

package/src/table/column/json/newDecode.js

@@ -4,12 +4,12 @@ let getSessionContext = require('../../getSessionContext');
 function _new(column) {
 	let decodeCore = newDecodeCore(column);
 
-	return function(value) {
-		value = decodeCore(value);
+	return function(context, value) {
+		value = decodeCore(context, value);
 		if (value === null)
 			return value;
 		if (typeof value !== 'object') {
-			let decode = getSessionContext().decodeJSON;
+			let decode = getSessionContext(context).decodeJSON;
 			if (decode)
 				return decode(value);
 			return value;

package/src/table/column/json/newEncode.js

@@ -4,14 +4,14 @@ var getSessionSingleton = require('../../getSessionSingleton');
 
 function _new(column) {
 
-	const encode = function(candidate) {
+	const encode = function(context, candidate) {
 		var value = purify(candidate);
 		if (value == null) {
 			if(column.dbNull === null)
 				return newPara('null');
 			return newPara('\'' + column.dbNull + '\'');
 		}
-		var encodeCore = getSessionSingleton('encodeJSON');
+		var encodeCore = getSessionSingleton(context, 'encodeJSON');
 
 		if (encodeCore) {
 			value = encodeCore(value);
@@ -20,14 +20,14 @@ function _new(column) {
 
 	};
 
-	encode.unsafe = function(candidate) {
+	encode.unsafe = function(context, candidate) {
 		var value = purify(candidate);
 		if (value == null) {
 			if(column.dbNull === null)
 				return 'null';
 			return '\'' + column.dbNull + '\'';
 		}
-		var encodeCore = getSessionSingleton('encodeJSON');
+		var encodeCore = getSessionSingleton(context, 'encodeJSON');
 
 		if (encodeCore) {
 			value = encodeCore(value);
@@ -35,8 +35,8 @@ function _new(column) {
 		return value;
 	};
 
-	encode.direct = function(value) {
-		var encodeCore = getSessionSingleton('encodeJSON');
+	encode.direct = function(context, value) {
+		var encodeCore = getSessionSingleton(context, 'encodeJSON');
 
 		if (encodeCore) {
 			value = encodeCore(value);

package/src/table/column/json.js

@@ -10,7 +10,8 @@ function _new(column) {
 	column.purify = purify;
 	column.encode = newEncode(column);
 	column.decode = newDecode(column);
-	column.formatOut = formatOut.bind(null, column);
+	column.formatOut = (context, ...rest) => formatOut.apply(null, [context, column, ...rest]);
+
 	column.onChange = onChange;
 	column.toDto = toDto;
 }

package/src/table/column/lessThan.js

@@ -2,10 +2,10 @@ var newBoolean = require('./newBoolean');
 var encodeFilterArg = require('./encodeFilterArg');
 var quote = require('../quote');
 
-function lessThanOrEqual(column,arg,alias) {
+function lessThanOrEqual(context, column,arg,alias) {
 	var operator = '<';
-	var encoded = encodeFilterArg(column, arg);
-	var firstPart = quote(alias) + '.' + quote(column._dbName) + operator;
+	var encoded = encodeFilterArg(context, column, arg);
+	var firstPart = quote(context, alias) + '.' + quote(context, column._dbName) + operator;
 	var filter = encoded.prepend(firstPart);
 	return newBoolean(filter);
 }

package/src/table/column/lessThanOrEqual.js

@@ -2,11 +2,11 @@ var newBoolean = require('./newBoolean');
 var encodeFilterArg = require('./encodeFilterArg');
 const getSessionSingleton = require('../getSessionSingleton');
 
-function lessThanOrEqual(column,arg,alias) {
-	const quote = getSessionSingleton('quote');
+function lessThanOrEqual(context, column,arg,alias) {
+	const quote = getSessionSingleton(context, 'quote');
 	var operator = '<=';
-	var encoded = encodeFilterArg(column, arg);
-	var firstPart = quote(alias) + '.' + quote(column._dbName) + operator;
+	var encoded = encodeFilterArg(context, column, arg);
+	var firstPart = quote(context, alias) + '.' + quote(context, column._dbName) + operator;
 	var filter = encoded.prepend(firstPart);
 	return newBoolean(filter);
 }

package/src/table/column/negotiateRawSqlFilter.js

@@ -8,7 +8,7 @@ let newBoolean = function() {
 	return newBoolean.apply(null, arguments);
 };
 
-function negotiateRawSqlFilter(filter, optionalTable, emptyArrayMeansFalse) {
+function negotiateRawSqlFilter(context, filter, optionalTable, emptyArrayMeansFalse) {
 	if (Array.isArray(filter) && filter.length === 0) {
 		const sql = emptyArrayMeansFalse ? '1 = 2' : '1 = 1';
 		return newBoolean(newParameterized(sql));
@@ -17,14 +17,14 @@ function negotiateRawSqlFilter(filter, optionalTable, emptyArrayMeansFalse) {
 		let curFilter;
 		let curObjectFilter;
 		for (let i = 0; i < filter.length; i++) {
-			let nextFilter = negotiateRawSqlFilter(filter[i], optionalTable);
+			let nextFilter = negotiateRawSqlFilter(context,filter[i], optionalTable);
 			if (nextFilter.isObjectFilter)
-				curObjectFilter = curObjectFilter ? curObjectFilter.or(nextFilter) : nextFilter;
+				curObjectFilter = curObjectFilter ? curObjectFilter.or(context, nextFilter) : nextFilter;
 			else
-				curFilter = curFilter ? curFilter.and(nextFilter) : nextFilter;
+				curFilter = curFilter ? curFilter.and(context, nextFilter) : nextFilter;
 		}
 		if (curFilter && curObjectFilter)
-			return curFilter.and(curObjectFilter);
+			return curFilter.and(context, curObjectFilter);
 		else if (curFilter)
 			return curFilter;
 		else
@@ -43,7 +43,7 @@ function negotiateRawSqlFilter(filter, optionalTable, emptyArrayMeansFalse) {
 				params.push(sql, filter.parameters);
 			}
 			else if (isObjectFilter(filter, optionalTable))
-				return newObjectFilter(filter, optionalTable);
+				return newObjectFilter(context, filter, optionalTable);
 			else
 				params = [filter];
 		} else {
@@ -59,13 +59,13 @@ function isObjectFilter(object, optionalTable) {
 	return optionalTable && object;
 }
 
-function newObjectFilter(object, table) {
+function newObjectFilter(context, object, table) {
 	let primaryColumns = table._primaryColumns;
 	let filter;
 	for (let i = 0; i < primaryColumns.length; i++) {
 		let column = primaryColumns[i];
-		let colFilter = column.equal(object[column.alias]);
-		filter = filter  ? filter.and(colFilter) : colFilter ;
+		let colFilter = column.equal(context, object[column.alias]);
+		filter = filter  ? filter.and(context, colFilter) : colFilter ;
 	}
 	filter.isObjectFilter = true;
 	return filter;

package/src/table/column/newBoolean.js

@@ -18,27 +18,27 @@ function newBoolean(filter) {
 		return nextNewBoolean(nextFilter);
 	};
 
-	c.and = function(other) {
-		other = negotiateRawSqlFilter(other);
+	c.and = function(context, other) {
+		other = negotiateRawSqlFilter(context, other);
 		var nextFilter = negotiateNextAndFilter(filter, other);
 		var next = nextNewBoolean(nextFilter);
-		for (var i = 1; i < arguments.length; i++) {
-			next = next.and(arguments[i]);
+		for (var i = 2; i < arguments.length; i++) {
+			next = next.and(context, arguments[i]);
 		}
 		return next;
 	};
 
-	c.or = function(other) {
-		other = negotiateRawSqlFilter(other);
+	c.or = function(context, other) {
+		other = negotiateRawSqlFilter(context, other);
 		var nextFilter = negotiateNextOrFilter(filter, other);
 		var next = nextNewBoolean(nextFilter);
-		for (var i = 1; i < arguments.length; i++) {
-			next = next.or(arguments[i]);
+		for (var i = 2; i < arguments.length; i++) {
+			next = next.or(context, arguments[i]);
 		}
 		return next;
 	};
 
-	c.not = function() {
+	c.not = function(_context) {
 		var nextFilter = filter.prepend('NOT (').append(')');
 		return nextNewBoolean(nextFilter);
 	};

package/src/table/column/newColumn.js

@@ -19,46 +19,46 @@ module.exports = function(table, name) {
 	table._columns.push(c);
 	table[name] = c;
 
-	c.equal = function(arg, alias) {
+	c.equal = function(context, arg, alias) {
 		alias = extractAlias(alias);
-		return equal(c, arg, alias);
+		return equal(context, c, arg, alias);
 	};
 
-	c.notEqual = function(arg, alias) {
+	c.notEqual = function(context, arg, alias) {
 		alias = extractAlias(alias);
-		return notEqual(c, arg, alias);
+		return notEqual(context, c, arg, alias);
 	};
 
-	c.lessThan = function(arg, alias) {
+	c.lessThan = function(context, arg, alias) {
 		alias = extractAlias(alias);
-		return lessThan(c, arg, alias);
+		return lessThan(context, c, arg, alias);
 	};
 
-	c.lessThanOrEqual = function(arg, alias) {
+	c.lessThanOrEqual = function(context, arg, alias) {
 		alias = extractAlias(alias);
-		return lessThanOrEqual(c, arg, alias);
+		return lessThanOrEqual(context, c, arg, alias);
 	};
 
-	c.greaterThan = function(arg, alias) {
+	c.greaterThan = function(context, arg, alias) {
 		alias = extractAlias(alias);
-		return greaterThan(c, arg, alias);
+		return greaterThan(context, c, arg, alias);
 	};
 
-	c.greaterThanOrEqual = function(arg, alias) {
+	c.greaterThanOrEqual = function(context, arg, alias) {
 		alias = extractAlias(alias);
-		return greaterThanOrEqual(c, arg, alias);
+		return greaterThanOrEqual(context, c, arg, alias);
 	};
 
-	c.between = function(from, to, alias) {
+	c.between = function(context, from, to, alias) {
 		alias = extractAlias(alias);
-		from = c.greaterThanOrEqual(from, alias);
-		to = c.lessThanOrEqual(to, alias);
+		from = c.greaterThanOrEqual(context, from, alias);
+		to = c.lessThanOrEqual(context, to, alias);
 		return from.and(to);
 	};
 
-	c.in = function(arg, alias) {
+	c.in = function(context, arg, alias) {
 		alias = extractAlias(alias);
-		return _in(c, arg, alias);
+		return _in(context, c, arg, alias);
 	};
 
 	c.eq = c.equal;
@@ -76,12 +76,12 @@ module.exports = function(table, name) {
 	c.IN = c.in;
 	c.self = self;
 
-	function self() {
-		const tableAlias = quote(table._rootAlias || table._dbName);
-		const columnName = quote(c._dbName);
+	function self(context) {
+		const tableAlias = quote(context,table._rootAlias || table._dbName);
+		const columnName = quote(context, c._dbName);
 
 		return {
-			expression: (alias) => `${tableAlias}.${columnName} ${quote(alias)}`,
+			expression: (alias) => `${tableAlias}.${columnName} ${quote(context, alias)}`,
 			joins: [''],
 			column: c,
 			groupBy: `${tableAlias}.${columnName}`

package/src/table/column/newDecodeCore.js

@@ -1,6 +1,6 @@
 function _new(column) {
 
-	return function(value) {
+	return function(_context, value) {
 		if (value == column.dbNull)
 			return null;
 		return value;

package/src/table/column/notEqual.js

@@ -3,12 +3,12 @@ var encodeFilterArg = require('./encodeFilterArg');
 var nullOperator = ' is not ';
 var quote = require('../quote');
 
-function notEqual(column,arg,alias) {
+function notEqual(context, column,arg,alias) {
 	var operator = '<>';
-	var encoded = encodeFilterArg(column, arg);
+	var encoded = encodeFilterArg(context, column, arg);
 	if (encoded.sql() == 'null')
 		operator = nullOperator;
-	var firstPart = quote(alias) + '.' + quote(column._dbName) + operator;
+	var firstPart = quote(context, alias) + '.' + quote(context, column._dbName) + operator;
 	var filter =  encoded.prepend(firstPart);
 	return newBoolean(filter);
 }

package/src/table/column/numeric/newDecode.js

@@ -3,8 +3,8 @@ var newDecodeCore = require('../newDecodeCore');
 function _new(column) {
 	var decodeCore = newDecodeCore(column);
 
-	return function(value) {
-		value = decodeCore(value);
+	return function(context, value) {
+		value = decodeCore(context, value);
 		if (value === null)
 			return value;
 		if (typeof(value) !== 'number')

package/src/table/column/numeric/newEncode.js

@@ -3,7 +3,7 @@ var newParam = require('../../query/newParameterized');
 
 module.exports = function(column) {
 
-	function encode(value) {
+	function encode(_context, value) {
 		value = purify(value);
 		if (value == null) {
 			var dbNull = column.dbNull;
@@ -12,7 +12,7 @@ module.exports = function(column) {
 		return newParam('' + value);
 	}
 
-	encode.unsafe = function(value) {
+	encode.unsafe = function(_context, value) {
 		value = purify(value);
 		if (value == null) {
 			var dbNull = column.dbNull;
@@ -21,7 +21,7 @@ module.exports = function(column) {
 		return '' + value;
 	};
 
-	encode.direct = function(value) {
+	encode.direct = function(_context, value) {
 		return value ;
 	};
 

package/src/table/column/string/contains.js

@@ -1,3 +1,4 @@
 var containsCore = require('./containsCore');
 
-module.exports = containsCore.bind(null, 'LIKE');
+module.exports = (context, ...rest) => containsCore.apply(null, [context, 'LIKE', ...rest]);
+

package/src/table/column/string/containsCore.js

@@ -2,15 +2,15 @@ const quote = require('../../quote');
 var newBoolean = require('../newBoolean');
 var nullOperator = ' is ';
 
-function endsWithCore(operator, column,arg,alias) {
-	alias = quote(alias);
+function endsWithCore(context, operator, column,arg,alias) {
+	alias = quote(context, alias);
 	operator = ' ' + operator + ' ';
-	var encoded = column.encode(arg);
+	var encoded = column.encode(context, arg);
 	if (encoded.sql() == 'null')
 		operator = nullOperator;
 	else
-		encoded = column.encode('%' + arg + '%');
-	var firstPart = alias + '.' + quote(column._dbName) + operator;
+		encoded = column.encode(context, '%' + arg + '%');
+	var firstPart = alias + '.' + quote(context, column._dbName) + operator;
 	var filter =  encoded.prepend(firstPart);
 	return newBoolean(filter);
 }

package/src/table/column/string/endsWith.js

@@ -1,3 +1,3 @@
 var endsWithCore = require('./endsWithCore');
 
-module.exports = endsWithCore.bind(null, 'LIKE');
+module.exports = (context, ...rest) => endsWithCore.apply(null, [context, 'LIKE', ...rest]);

package/src/table/column/string/endsWithCore.js

@@ -2,15 +2,15 @@ const quote = require('../../quote');
 var newBoolean = require('../newBoolean');
 var nullOperator = ' is ';
 
-function endsWithCore(operator, column,arg,alias) {
+function endsWithCore(context, operator, column,arg,alias) {
 	alias = quote(alias);
 	operator = ' ' + operator + ' ';
-	var encoded = column.encode(arg);
+	var encoded = column.encode(context, arg);
 	if (encoded.sql() == 'null')
 		operator = nullOperator;
 	else
-		encoded = column.encode('%' + arg);
-	var firstPart = alias + '.' + quote(column._dbName) + operator;
+		encoded = column.encode(context, '%' + arg);
+	var firstPart = alias + '.' + quote(context, column._dbName) + operator;
 	var filter =  encoded.prepend(firstPart);
 	return newBoolean(filter);
 }

package/src/table/column/string/iContains.js

@@ -1,3 +1,4 @@
 var containsCore = require('./containsCore');
 
-module.exports = containsCore.bind(null, 'ILIKE');
+module.exports = (context, ...rest) => containsCore.apply(null, [context, 'ILIKE', ...rest]);
+

package/src/table/column/string/iEndsWith.js

@@ -1,3 +1,3 @@
 var endsWithCore = require('./endsWithCore');
 
-module.exports = endsWithCore.bind(null, 'ILIKE');
+module.exports = (context, ...rest) => endsWithCore.apply(null, [context, 'ILIKE', ...rest]);

package/src/table/column/string/iEqual.js

@@ -3,12 +3,12 @@ var nullOperator = ' is ';
 var encodeFilterArg = require('../encodeFilterArg');
 const quote = require('../../quote');
 
-function iEqual(column,arg,alias) {
+function iEqual(context, column,arg,alias) {
 	var operator = ' ILIKE ';
-	var encoded = encodeFilterArg(column, arg);
+	var encoded = encodeFilterArg(context, column, arg);
 	if (encoded.sql() == 'null')
 		operator = nullOperator;
-	var firstPart = alias + '.' + quote(column._dbName) + operator;
+	var firstPart = alias + '.' + quote(context, column._dbName) + operator;
 	var filter =  encoded.prepend(firstPart);
 	return newBoolean(filter);
 }

package/src/table/column/string/iStartsWith.js

@@ -1,3 +1,3 @@
 var startsWithCore = require('./startsWithCore');
 
-module.exports = startsWithCore.bind(null, 'ILIKE');
+module.exports = (context, ...rest) => startsWithCore.apply(null, [context, 'ILIKE', ...rest]);