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

package/src/table/column/newBoolean.js

@@ -1,54 +1,3 @@
-var nextNewBoolean = _nextNewBoolean;
-var negotiateRawSqlFilter = require('./negotiateRawSqlFilter');
-var negotiateNextAndFilter = require('./negotiateNextAndFilter');
-var negotiateNextOrFilter = require('./negotiateNextOrFilter');
+const { newBoolean } = require('./utils');
 
-function newBoolean(filter) {
-	var c = {};
-	c.sql = filter.sql.bind(filter);
-	c.parameters = filter.parameters;
-
-	c.append = function(other) {
-		var nextFilter = filter.append(other);
-		return nextNewBoolean(nextFilter);
-	};
-
-	c.prepend = function(other) {
-		var nextFilter = filter.prepend(other);
-		return nextNewBoolean(nextFilter);
-	};
-
-	c.and = function(other) {
-		other = negotiateRawSqlFilter(other);
-		var nextFilter = negotiateNextAndFilter(filter, other);
-		var next = nextNewBoolean(nextFilter);
-		for (var i = 1; i < arguments.length; i++) {
-			next = next.and(arguments[i]);
-		}
-		return next;
-	};
-
-	c.or = function(other) {
-		other = negotiateRawSqlFilter(other);
-		var nextFilter = negotiateNextOrFilter(filter, other);
-		var next = nextNewBoolean(nextFilter);
-		for (var i = 1; i < arguments.length; i++) {
-			next = next.or(arguments[i]);
-		}
-		return next;
-	};
-
-	c.not = function() {
-		var nextFilter = filter.prepend('NOT (').append(')');
-		return nextNewBoolean(nextFilter);
-	};
-
-	return c;
-}
-
-function _nextNewBoolean(filter) {
-	nextNewBoolean = require('./newBoolean');
-	return nextNewBoolean(filter);
-}
-
-module.exports = newBoolean;
+module.exports = newBoolean;

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]);

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

@@ -3,7 +3,7 @@ var purify = require('./purify');
 
 function _new(column) {
 
-	var encode = function(value) {
+	var encode = function(_context, value) {
 		value = purify(value);
 		if (value == null) {
 			if (column.dbNull === null)
@@ -13,7 +13,7 @@ function _new(column) {
 		return newPara('?', [value]);
 	};
 
-	encode.unsafe = function(value) {
+	encode.unsafe = function(_context, value) {
 		value = purify(value);
 		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/string/startsWith.js

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

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

@@ -2,14 +2,14 @@ var newBoolean = require('../newBoolean');
 var nullOperator = ' is ';
 var quote = require('../../quote');
 
-function startsWithCore(operator, column,arg,alias) {
+function startsWithCore(context, operator, column,arg,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 = quote(alias) + '.' + quote(column._dbName) + operator;
+		encoded = column.encode(context, arg + '%');
+	var firstPart = quote(context, alias) + '.' + quote(context, column._dbName) + operator;
 	var filter =  encoded.prepend(firstPart);
 	return newBoolean(filter);
 }

package/src/table/column/string.js

@@ -17,34 +17,34 @@ function _new(table, column) {
 	column.decode = newDecode(column);
 	var extractAlias = _extractAlias.bind(null, table);
 
-	column.startsWith = function(arg, alias) {
+	column.startsWith = function(context, arg, alias) {
 		alias = extractAlias(alias);
-		return startsWith(column, arg, alias);
+		return startsWith(context, column, arg, alias);
 	};
-	column.endsWith = function(arg, alias) {
+	column.endsWith = function(context, arg, alias) {
 		alias = extractAlias(alias);
-		return endsWith(column, arg, alias);
+		return endsWith(context, column, arg, alias);
 	};
-	column.contains = function(arg, alias) {
+	column.contains = function(context, arg, alias) {
 		alias = extractAlias(alias);
-		return contains(column, arg, alias);
+		return contains(context, column, arg, alias);
 	};
-	column.iStartsWith = function(arg, alias) {
+	column.iStartsWith = function(context, arg, alias) {
 		alias = extractAlias(alias);
-		return iStartsWith(column, arg, alias);
+		return iStartsWith(context, column, arg, alias);
 	};
-	column.iEndsWith = function(arg, alias) {
+	column.iEndsWith = function(context, arg, alias) {
 		alias = extractAlias(alias);
-		return iEndsWith(column, arg, alias);
+		return iEndsWith(context, column, arg, alias);
 	};
-	column.iContains = function(arg, alias) {
+	column.iContains = function(context, arg, alias) {
 		alias = extractAlias(alias);
-		return iContains(column, arg, alias);
+		return iContains(context, column, arg, alias);
 	};
 
-	column.iEqual = function(arg, alias) {
+	column.iEqual = function(context, arg, alias) {
 		alias = extractAlias(alias);
-		return iEqual(column, arg, alias);
+		return iEqual(context, column, arg, alias);
 	};
 
 	column.iEq = column.iEqual;

package/src/table/column/utils.js

@@ -0,0 +1,113 @@
+const newParameterized = require('../query/newParameterized');
+const negotiateNextAndFilter = require('./negotiateNextAndFilter');
+const negotiateNextOrFilter = require('./negotiateNextOrFilter');
+
+function newBoolean(filter) {
+	var c = {};
+	c.sql = filter.sql.bind(filter);
+	c.parameters = filter.parameters;
+
+	c.append = function(other) {
+		var nextFilter = filter.append(other);
+		return newBoolean(nextFilter);
+	};
+
+	c.prepend = function(other) {
+		var nextFilter = filter.prepend(other);
+		return newBoolean(nextFilter);
+	};
+
+	c.and = function(context, other) {
+		other = negotiateRawSqlFilter(context, other);
+		var nextFilter = negotiateNextAndFilter(filter, other);
+		var next = newBoolean(nextFilter);
+		for (var i = 2; i < arguments.length; i++) {
+			next = next.and(context, arguments[i]);
+		}
+		return next;
+	};
+
+	c.or = function(context, other) {
+		other = negotiateRawSqlFilter(context, other);
+		var nextFilter = negotiateNextOrFilter(filter, other);
+		var next = newBoolean(nextFilter);
+		for (var i = 2; i < arguments.length; i++) {
+			next = next.or(context, arguments[i]);
+		}
+		return next;
+	};
+
+	c.not = function(_context) {
+		var nextFilter = filter.prepend('NOT (').append(')');
+		return newBoolean(nextFilter);
+	};
+
+	return c;
+}
+
+
+function negotiateRawSqlFilter(context, filter, optionalTable, emptyArrayMeansFalse) {
+	if (Array.isArray(filter) && filter.length === 0) {
+		const sql = emptyArrayMeansFalse ? '1 = 2' : '1 = 1';
+		return newBoolean(newParameterized(sql));
+	}
+	else if (Array.isArray(filter)) {
+		let curFilter;
+		let curObjectFilter;
+		for (let i = 0; i < filter.length; i++) {
+			let nextFilter = negotiateRawSqlFilter(context,filter[i], optionalTable);
+			if (nextFilter.isObjectFilter)
+				curObjectFilter = curObjectFilter ? curObjectFilter.or(context, nextFilter) : nextFilter;
+			else
+				curFilter = curFilter ? curFilter.and(context, nextFilter) : nextFilter;
+		}
+		if (curFilter && curObjectFilter)
+			return curFilter.and(context, curObjectFilter);
+		else if (curFilter)
+			return curFilter;
+		else
+			return curObjectFilter;
+	}
+	else {
+		let params = [];
+		if (filter) {
+			if (filter.and)
+				return filter;
+			if (filter.sql) {
+				let sql = filter.sql;
+				if (typeof filter.sql === 'function') {
+					sql = filter.sql();
+				}
+				params.push(sql, filter.parameters);
+			}
+			else if (isObjectFilter(filter, optionalTable))
+				return newObjectFilter(context, filter, optionalTable);
+			else
+				params = [filter];
+		} else {
+			params = [filter];
+		}
+
+		let parameterized = newParameterized.apply(null, params);
+		return newBoolean(parameterized);
+	}
+}
+
+function isObjectFilter(object, optionalTable) {
+	return optionalTable && object;
+}
+
+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(context, object[column.alias]);
+		filter = filter  ? filter.and(context, colFilter) : colFilter ;
+	}
+	filter.isObjectFilter = true;
+	return filter;
+}
+
+
+module.exports = { negotiateRawSqlFilter, newBoolean};

package/src/table/column.js

@@ -1,5 +1,4 @@
 const Ajv = require('ajv');
-const inspect = require('util').inspect;
 
 function defineColumn(column, table) {
 	var c = {};
@@ -139,7 +138,7 @@ function defineColumn(column, table) {
 				previousValidate.apply(null, arguments);
 			let valid = validate.apply(null, arguments);
 			if (!valid) {
-				let e = new Error(`Column ${table._dbName}.${column._dbName} violates JSON Schema: ${inspect(validate.errors, false, 10)}`);
+				let e = new Error(`Column ${table._dbName}.${column._dbName} violates JSON Schema: ${inspect(validate.errors)}`);
 				e.errors = validate.errors;
 				e.status = 400;
 				throw e;
@@ -151,4 +150,9 @@ function defineColumn(column, table) {
 	return c;
 }
 
+function inspect(obj) {
+	return JSON.stringify(obj, null, 2);
+}
+
+
 module.exports = defineColumn;

package/src/table/commands/beginCommand.js

@@ -1,8 +1,8 @@
 let newParameterized = require('../query/newParameterized');
 let getSessionContext = require('../getSessionContext');
 
-module.exports = function() {
-	let command = newParameterized(getSessionContext().begin || 'BEGIN');
+module.exports = function(context) {
+	let command = newParameterized(getSessionContext(context).begin || 'BEGIN');
 	command.endEdit = empty;
 	command.matches = empty;
 

package/src/table/commands/compressChanges.js

@@ -1,8 +1,8 @@
 var newParameterized = require('../query/newParameterized');
 var getSessionSingleton = require('../getSessionSingleton');
 
-function compress(queries) {
-	var multipleStatements = getSessionSingleton('multipleStatements');
+function compress(context, queries) {
+	var multipleStatements = getSessionSingleton(context, 'multipleStatements');
 	var compressed = [];
 	var queryCount = queries.length;
 

package/src/table/commands/delete/newSingleCommand.js

@@ -4,14 +4,14 @@ var extractFilter = require('../../query/extractFilter');
 var newSingleCommandCore = require('./singleCommand/newSingleCommandCore');
 var createAlias = require('./createAlias');
 
-function _new(table,filter,relations) {
+function _new(context, table, filter, relations) {
 	var alias = createAlias(table, relations.length);
 	filter = extractFilter(filter);
-	filter = newSubFilter(relations, filter);
-	var discriminator = newDiscriminatorSql(table, alias);
+	filter = newSubFilter(context, relations, filter);
+	var discriminator = newDiscriminatorSql(context, table, alias);
 	if (discriminator !== '')
-		filter = filter.and(discriminator);
-	return newSingleCommandCore(table, filter, alias);
+		filter = filter.and(context, discriminator);
+	return newSingleCommandCore(context, table, filter, alias);
 }
 
 module.exports = _new;

package/src/table/commands/delete/singleCommand/joinSql.js

@@ -1,21 +1,21 @@
-var newShallowJoinSql = require('../../../query/singleQuery/joinSql/newShallowJoinSql');
-var createAlias = require('../createAlias');
+const newShallowJoinSql = require('../../../query/singleQuery/joinSql/newShallowJoinSql');
+const createAlias = require('../createAlias');
 
-function newJoinSql(relations) {
-	var length = relations.length;
-	var leftAlias,
+function newJoinSql(context, relations) {
+	const length = relations.length;
+	let leftAlias,
 		rightAlias;
-	var sql = '';
+	let sql = '';
 
 	function addSql(relation) {
-		var rightColumns = relation.childTable._primaryColumns;
-		var leftColumns = relation.columns;
-		sql += ' INNER' + newShallowJoinSql(relation.childTable,leftColumns,rightColumns,leftAlias,rightAlias).sql();
+		const rightColumns = relation.childTable._primaryColumns;
+		const leftColumns = relation.columns;
+		sql += ' INNER' + newShallowJoinSql(context, relation.childTable, leftColumns, rightColumns, leftAlias, rightAlias).sql();
 	}
 
-	relations.forEach(function(relation, i){
-		leftAlias = 'x' + (length-i);
-		rightAlias = createAlias(relation.childTable, length-i-1);
+	relations.forEach(function(relation, i) {
+		leftAlias = 'x' + (length - i);
+		rightAlias = createAlias(relation.childTable, length - i - 1);
 		addSql(relation);
 
 	});

package/src/table/commands/delete/singleCommand/newSingleCommandCore.js

@@ -1,13 +1,13 @@
 var getSessionSingleton = require('../../../getSessionSingleton');
 
-function newSingleCommandCore(table,filter,alias) {
+function newSingleCommandCore(context, table, filter, alias) {
 	var c = {};
 
 	c.sql = function() {
 		var whereSql = filter.sql();
 		if (whereSql)
 			whereSql = ' where ' + whereSql;
-		var deleteFromSql = getSessionSingleton('deleteFromSql');
+		var deleteFromSql = getSessionSingleton(context, 'deleteFromSql');
 		return deleteFromSql(table, alias, whereSql);
 	};
 

package/src/table/commands/delete/singleCommand/selectSql.js

@@ -1,11 +1,11 @@
-var newParameterized = require('../../../query/newParameterized');
-var newBoolean = require('../../../column/newBoolean');
+const newParameterized = require('../../../query/newParameterized');
+const newBoolean = require('../../../column/newBoolean');
 const quote = require('../../../quote');
 
-function newSelectSql(table, alias) {
-	var colName = quote(table._primaryColumns[0]._dbName);
-	alias = quote(alias);
-	var sql = 'SELECT ' + alias + '.' + colName + ' FROM ' + quote(table._dbName) + ' ' + alias;
+function newSelectSql(context, table, alias) {
+	const colName = quote(context, table._primaryColumns[0]._dbName);
+	alias = quote(context, alias);
+	let sql = 'SELECT ' + alias + '.' + colName + ' FROM ' + quote(context, table._dbName) + ' ' + alias;
 	sql = newParameterized(sql);
 	return newBoolean(sql);
 }