orange-orm 4.5.0-beta.1 → 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(context, other) {
-		other = negotiateRawSqlFilter(context, other);
-		var nextFilter = negotiateNextAndFilter(filter, other);
-		var next = nextNewBoolean(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 = nextNewBoolean(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 nextNewBoolean(nextFilter);
-	};
-
-	return c;
-}
-
-function _nextNewBoolean(filter) {
-	nextNewBoolean = require('./newBoolean');
-	return nextNewBoolean(filter);
-}
-
-module.exports = newBoolean;
+module.exports = newBoolean;

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/newDeleteCommand.js

@@ -1,10 +1,5 @@
 var newSingleCommand = require('./delete/newSingleCommand');
 
-var nextCommand = function() {
-	nextCommand = require('./newDeleteCommand');
-	nextCommand.apply(null, arguments);
-};
-
 function newCommand(context, queries, table, filter, strategy, relations) {
 	var singleCommand = newSingleCommand(context, table, filter, relations);
 	for (var name in strategy) {
@@ -14,7 +9,7 @@ function newCommand(context, queries, table, filter, strategy, relations) {
 		var childRelation = table._relations[name];
 		var joinRelation = childRelation.joinRelation;
 		var childRelations = [joinRelation].concat(relations);
-		nextCommand(context, queries, childRelation.childTable, filter, childStrategy, childRelations);
+		newCommand(context, queries, childRelation.childTable, filter, childStrategy, childRelations);
 	}
 	queries.push(singleCommand);
 	return queries;

package/src/table/commands/newInsertCommand.js

@@ -29,7 +29,7 @@ InsertCommand.prototype.matches = function(otherRow) {
 InsertCommand.prototype.endEdit = function() {
 	this.sql();
 	var dto = createDto(this._table, this._row);
-	if (this._table._emitChanged.callbacks.length > 0)
+	if (this._disallowCompress || this._table._emitChanged.callbacks.length > 0)
 		this._patch = createPatch([], [dto]);
 };
 
@@ -46,8 +46,11 @@ Object.defineProperty(InsertCommand.prototype, 'parameters', {
 
 Object.defineProperty(InsertCommand.prototype, 'disallowCompress', {
 	get: function() {
-		return this._table._emitChanged.callbacks.length > 0;
+		return this._disallowCompress || this._table._emitChanged.callbacks.length > 0;
 
+	},
+	set: function(value) {
+		this._disallowCompress = value;
 	}
 });
 

package/src/table/commands/newInsertCommandCore.js

@@ -1,17 +1,17 @@
-var newParameterized = require('../query/newParameterized');
-var getSqlTemplate = require('./insert/getSqlTemplate');
-var util = require('util');
+const newParameterized = require('../query/newParameterized');
+const getSqlTemplate = require('./insert/getSqlTemplate');
+const formatString = require('../../format');
 
 function newInsertCommandCore(context, table, row, options = {}) {
-	var parameters = [];
-	var values = [getSqlTemplate(context, table, row, options)];
+	let parameters = [];
+	let values = [getSqlTemplate(context, table, row, options)];
 
-	var columns = table._columns;
-	for (var i = 0; i < columns.length; i++) {
-		var column = columns[i];
-		var alias = column.alias;
+	let columns = table._columns;
+	for (let i = 0; i < columns.length; i++) {
+		let column = columns[i];
+		let alias = column.alias;
 		if (row['__' + column.alias] !== undefined) {
-			var encoded = column.encode(context, row[alias]);
+			let encoded = column.encode(context, row[alias]);
 			if (encoded.parameters.length > 0) {
 				values.push('?');
 				parameters.push(encoded.parameters[0]);
@@ -20,7 +20,7 @@ function newInsertCommandCore(context, table, row, options = {}) {
 		}
 	}
 
-	var sql = util.format.apply(null, values);
+	let sql = formatString.apply(null, values);
 	return newParameterized(sql, parameters);
 }
 

package/src/table/deleteSessionContext.js

@@ -1,7 +1,4 @@
-const process = require('node:process');
-
 function deleteSessionContext(context) {
-	context = context || process.domain;
 	delete context.rdb;
 }
 

package/src/table/executeQueries/resolveExecuteQuery.js

@@ -1,17 +1,10 @@
 const getSessionSingleton = require('../getSessionSingleton');
-const process = require('node:process');
 
 function resolveExecuteQuery(context, query) {
 	return resolve;
 
 	function resolve(success, failed) {
 		try {
-
-			var domain = process.domain;
-			if (domain) {
-				success = process.domain.bind(success);
-				failed = process.domain.bind(failed);
-			}
 			var client = getSessionSingleton(context, 'dbClient');
 			query = negotiateNullParams(query);
 			client.executeQuery(query, onCompleted);

package/src/table/newCascadeDeleteStrategy.js

@@ -1,4 +1,3 @@
-var addSubStrategies = _addSubStrategies;
 var newObject = require('../newObject');
 
 function newCascadeDeleteStrategy(strategy, table) {
@@ -10,7 +9,7 @@ function newCascadeDeleteStrategy(strategy, table) {
 	c.visitOne = function(relation) {
 		var subStrategy = newObject();
 		strategy[relationName] = subStrategy;
-		addSubStrategies(subStrategy, relation.childTable);
+		newCascadeDeleteStrategy(subStrategy, relation.childTable);
 	};
 
 	c.visitMany = c.visitOne;
@@ -22,9 +21,4 @@ function newCascadeDeleteStrategy(strategy, table) {
 	return strategy;
 }
 
-function _addSubStrategies(strategy, table) {
-	addSubStrategies = require('./newCascadeDeleteStrategy');
-	addSubStrategies(strategy, table);
-}
-
 module.exports = newCascadeDeleteStrategy;

package/src/table/newRelatedTable.js

@@ -1,5 +1,4 @@
 var newRelatedColumn = require('./relatedTable/relatedColumn');
-var nextRelatedTable = _nextRelatedTable;
 var subFilter = require('./relatedTable/subFilter');
 var any = require('./relatedTable/any');
 var all = require('./relatedTable/all');
@@ -15,14 +14,14 @@ function newRelatedTable(relations, isShallow, depth = 0) {
 	// if (isShallow)
 	// 	c = any(relations.slice(-1), depth);
 	// else
-	c = any(relations, depth);
+	c = any(newRelatedTable, relations, depth);
 	// @ts-ignore
-	c.all = all(relations, depth);
+	c.all = all(newRelatedTable, relations, depth);
 	// @ts-ignore
 	c.any = c;
 
 	// @ts-ignore
-	c.none = none(relations, depth);
+	c.none = none(newRelatedTable, relations, depth);
 
 	// @ts-ignore
 	c.where =  where(relations, depth);
@@ -58,7 +57,7 @@ function newRelatedTable(relations, isShallow, depth = 0) {
 
 		Object.defineProperty(c, alias, {
 			get: function() {
-				return nextRelatedTable(children, false, depth);
+				return newRelatedTable(children, false, depth);
 			}
 		});
 	}
@@ -91,9 +90,4 @@ function newRelatedTable(relations, isShallow, depth = 0) {
 	return cProxy;
 }
 
-function _nextRelatedTable(relations, isShallow, depth) {
-	nextRelatedTable = require('./newRelatedTable');
-	return nextRelatedTable(relations, isShallow, depth);
-}
-
 module.exports = newRelatedTable;

package/src/table/query/newParameterized.js

@@ -1,11 +1,6 @@
 var extractSql = require('./extractSql');
 var extractParameters = require('./parameterized/extractParameters');
 
-var nextParameterized = function(text, params) {
-	nextParameterized = require('../query/newParameterized');
-	return nextParameterized(text, params);
-};
-
 function Parameterized(text, parameters) {
 	this._text = text;
 	this.parameters = parameters;
@@ -18,21 +13,23 @@ Parameterized.prototype.sql = function() {
 Parameterized.prototype.prepend = function(other) {
 	if (other.sql) {
 		var params = other.parameters.concat(this.parameters);
-		return nextParameterized(other.sql() + this._text, params);
+		return newParameterized(other.sql() + this._text, params);
 	} else
-		return nextParameterized(other + this._text, this.parameters);
+		return newParameterized(other + this._text, this.parameters);
 };
 
 Parameterized.prototype.append = function(other) {
 	if (other.sql) {
 		var params = this.parameters.concat(other.parameters);
-		return nextParameterized(this._text + other.sql(), params);
+		return newParameterized(this._text + other.sql(), params);
 	} else
-		return nextParameterized(this._text + other, this.parameters);
+		return newParameterized(this._text + other, this.parameters);
 };
 
-module.exports = function(text, parameters) {
+function newParameterized(text, parameters) {
 	text = extractSql(text);
 	parameters = extractParameters(parameters);
 	return new Parameterized(text, parameters);
-};
+}
+
+module.exports = newParameterized;

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

@@ -1,16 +1,3 @@
-var newShallowColumnSql = require('./newShallowColumnSql');
-var newJoinedColumnSql = _initJoinedColumnSql;
+const { joinLegToColumnSql} = require('./sharedJoinUtils');
 
-function sql(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 _initJoinedColumnSql(context,span,alias,ignoreNull) {
-	newJoinedColumnSql = require('./newJoinedColumnSql');
-	return newJoinedColumnSql(context,span,alias,ignoreNull);
-}
-
-module.exports = sql;
+module.exports = joinLegToColumnSql;

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

@@ -1,27 +1,4 @@
-var joinLegToColumnSql = require('./joinLegToColumnSql');
+const { newJoinedColumnSql } = require('./sharedJoinUtils');
 
-module.exports = function(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 = newJoinedColumnSql;

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(context,leg,alias,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/oneLegToJoinSql.js

@@ -1,13 +1,7 @@
 var oneLegToShallowJoinSql = require('./oneLegToShallowJoinSql');
-var newJoinSql = _newJoinSql;
 
-function toJoinSql(context,leg,alias,childAlias) {
+function toJoinSql(newJoinSql, context,leg,alias,childAlias) {
 	return oneLegToShallowJoinSql(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/newJoinSql.js

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

package/src/table/relatedTable/aggregate.js

@@ -1,4 +1,3 @@
-let newRelatedTable = _newRelatedTable;
 let tryGetSessionContext = require('../tryGetSessionContext');
 
 function newAggregate(_relations) {
@@ -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,9 +1,8 @@
-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(context, fn) {
 		let relatedTable = newRelatedTable(relations, isShallow, depth + 1);
@@ -16,9 +15,4 @@ function newAll(relations, depth) {
 	return all;
 }
 
-function _newRelatedTable() {
-	newRelatedTable = require('../newRelatedTable');
-	return newRelatedTable.apply(null, arguments);
-}
-
 module.exports = newAll;

package/src/table/relatedTable/any.js

@@ -1,10 +1,8 @@
-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(context, fn) {
 		let relatedTable = newRelatedTable(relations, isShallow, depth + 1);
@@ -16,11 +14,6 @@ function newAny(relations, depth) {
 	return any;
 }
 
-function _newRelatedTable() {
-	newRelatedTable = require('../newRelatedTable');
-	return newRelatedTable.apply(null, arguments);
-}
-
 module.exports = newAny;
 
 //

package/src/table/relatedTable/none.js

@@ -1,9 +1,8 @@
-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(context, fn) {
 		let relatedTable = newRelatedTable(relations, isShallow, depth + 1);
@@ -14,9 +13,4 @@ function newNone(relations, depth) {
 	return none;
 }
 
-function _newRelatedTable() {
-	newRelatedTable = require('../newRelatedTable');
-	return newRelatedTable.apply(null, arguments);
-}
-
 module.exports = newNone;

package/src/table/relatedTable/where.js

@@ -1,4 +1,3 @@
-let newRelatedTable = _newRelatedTable;
 const negotiateRawSqlFilter = require('../column/negotiateRawSqlFilter');
 let tryGetSessionContext = require('../tryGetSessionContext');
 
@@ -42,9 +41,4 @@ function newWhere(_relations, _depth) {
 
 }
 
-function _newRelatedTable() {
-	newRelatedTable = require('../newRelatedTable');
-	return newRelatedTable.apply(null, arguments);
-}
-
 module.exports = newWhere;