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

package/src/sqlite/newTransaction.js

@@ -6,6 +6,7 @@ const lastInsertedSql = require('./lastInsertedSql');
 const limitAndOffset = require('./limitAndOffset');
 const insertSql = require('./insertSql');
 const insert = require('./insert');
+const quote = require('./quote');
 
 function newResolveTransaction(domain, pool, { readonly = false } = {})  {
 	var rdb = {poolFactory: pool};
@@ -29,7 +30,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {})  {
 		caller.visitSqlite();
 	};
 	rdb.aggregateCount = 0;
-	rdb.quote = (name) => `"${name}"`;
+	rdb.quote = quote;
 
 	if (readonly) {
 		rdb.dbClient = {

package/src/sqlite/pool/newGenericPool.js

@@ -1,7 +1,6 @@
 /* eslint-disable no-prototype-builtins */
-var EventEmitter = require('events').EventEmitter;
+var defaults = require('../../poolDefaults');
 
-var defaults = require('./defaults');
 var genericPool = require('../../generic-pool');
 var sqlite = require('sqlite3');
 
@@ -28,20 +27,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/sqlite/quote.js

@@ -0,0 +1 @@
+module.exports = (name) => `"${name}"`;

package/src/table/aggregate.js

@@ -1,6 +1,6 @@
 function newAggregate(table) {
 
-	function aggregate(fn) {
+	function aggregate(_context, fn) {
 		return fn(table);
 	}
 	return aggregate;

package/src/table/begin.js

@@ -2,13 +2,13 @@ let beginCommand = require('./commands/beginCommand');
 let executeQuery = require('./executeQueries/executeQuery');
 let setSessionSingleton = require('./setSessionSingleton');
 
-function begin(readonly) {
-	setSessionSingleton('changes', []);
-	if (readonly) {
-		setSessionSingleton('transactionLess', true);
+function begin(context, transactionLess) {
+	setSessionSingleton(context, 'changes', []);
+	if (transactionLess) {
+		setSessionSingleton(context, 'transactionLess', true);
 		return Promise.resolve();
 	}
-	return executeQuery(beginCommand());
+	return executeQuery(context, beginCommand(context));
 }
 
 module.exports = begin;

package/src/table/cascadeDelete.js

@@ -2,10 +2,10 @@ var _delete = require('./delete');
 var newObject = require('../newObject');
 var newCascadeDeleteStrategy = require('./newCascadeDeleteStrategy');
 
-function cascadeDelete(table, filter) {
+function cascadeDelete(context, table, filter) {
 	var empty = newObject();
 	var strategy = newCascadeDeleteStrategy(empty, table);
-	return _delete(table, filter, strategy);
+	return _delete(context, table, filter, strategy);
 }
 
 module.exports = cascadeDelete;

package/src/table/column/binary/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;
 		else

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

@@ -3,21 +3,20 @@ var newParam = require('../../query/newParameterized');
 
 function _new(_column) {
 
-
-	function encode(value) {
+	function encode(_context, value) {
 		value = purify(value);
 		if (value === null)
 			return newParam('null');
 		return newParam('?', [Buffer.from(value, 'base64')]);
 	}
-	encode.unsafe = function(value) {
+	encode.unsafe = function(_context, value) {
 		value = purify(value);
 		if (value === null)
 			return 'null';
 		return Buffer.from(value, 'base64');
 	};
 
-	encode.direct = function(value) {
+	encode.direct = function(_context, value) {
 		return Buffer.from(value, 'base64');
 	};
 

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

@@ -2,7 +2,7 @@ var purify = require('./purify');
 
 function _new(column) {
 
-	return function(value) {
+	return function(context, value) {
 		if (value == column.dbNull)
 			return null;
 		return purify(value);

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

@@ -4,34 +4,34 @@ var getSessionSingleton = require('../../getSessionSingleton');
 
 function _new(column) {
 
-	function encode(value) {
+	function encode(context, value) {
 		value = purify(value);
 		if (value === null) {
 			if (column.dbNull === null)
 				return newParam('null');
 			return newParam('\'' + column.dbNull + '\'');
 		}
-		var encodeCore = getSessionSingleton('encodeBoolean');
+		var encodeCore = getSessionSingleton(context, 'encodeBoolean');
 
 
 		return newParam('?', [encodeCore(value)]);
 	}
 
-	encode.unsafe = function(value) {
+	encode.unsafe = function(context, value) {
 		value = purify(value);
 		if (value === null) {
 			if (column.dbNull === null)
 				return 'null';
 			return '\'' + column.dbNull + '\'';
 		}
-		var encodeCore = getSessionSingleton('encodeBoolean');
+		var encodeCore = getSessionSingleton(context, 'encodeBoolean');
 
 
 		return encodeCore(value);
 	};
 
-	encode.direct = function(value) {
-		var encodeCore = getSessionSingleton('encodeBoolean');
+	encode.direct = function(context, value) {
+		var encodeCore = getSessionSingleton(context, 'encodeBoolean');
 
 		return encodeCore(value);
 	};

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

@@ -1,14 +1,12 @@
 var getSessionSingleton = require('../../getSessionSingleton');
 const quote = require('../../quote');
 
-//todo fix
-
-function formatOut(column, alias) {
-	var formatColumn = getSessionSingleton('formatDateOut');
+function formatOut(context, column, alias) {
+	var formatColumn = getSessionSingleton(context, 'formatDateOut');
 	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/date/newDecode.js

@@ -4,8 +4,8 @@ var dateToISOString = require('../../../dateToISOString');
 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;
 		else if (typeof value === 'string')

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

@@ -4,32 +4,32 @@ var getSessionContext = require('../../getSessionContext');
 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)
 				return newPara('null');
 			return newPara('\'' + column.dbNull + '\'');
 		}
-		var context = getSessionContext();
-		var encodeCore = context.encodeDate || encodeDate;
-		var formatIn = context.formatDateIn;
+		var ctx = getSessionContext(context);
+		var encodeCore = ctx.encodeDate || encodeDate;
+		var formatIn = ctx.formatDateIn;
 		return newPara(formatIn ? formatIn('?') : '?', [encodeCore(value)]);
 	};
 
-	encode.unsafe = function(value) {
+	encode.unsafe = function(context, value) {
 		value = purify(value);
 		if (value == null) {
 			if (column.dbNull === null)
 				'null';
 			return '\'' + column.dbNull + '\'';
 		}
-		var encodeCore = getSessionSingleton('encodeDate') || encodeDate;
+		var encodeCore = getSessionSingleton(context, 'encodeDate') || encodeDate;
 		return encodeCore(value);
 	};
 
-	encode.direct = function(value) {
-		var encodeCore = getSessionSingleton('encodeDate') || encodeDate;
+	encode.direct = function(context, value) {
+		var encodeCore = getSessionSingleton(context, 'encodeDate') || encodeDate;
 		return encodeCore(value);
 	};
 

package/src/table/column/date/tryParseISO.js

@@ -1,14 +1,12 @@
-var pattern = /(\d{4}-[01]\d-[0-3]\d(T| )[0-2]\d:[0-5]\d:[0-5]\d\.\d+)|(\d{4}-[01]\d-[0-3]\d(T| )[0-2]\d:[0-5]\d:[0-5]\d)|(\d{4}-[01]\d-[0-3]\d(T| )[0-2]\d:[0-5]\d)/;
+var patternWithTime = /(\d{4}-[01]\d-[0-3]\d(T| )[0-2]\d:[0-5]\d:[0-5]\d\.\d+)|(\d{4}-[01]\d-[0-3]\d(T| )[0-2]\d:[0-5]\d:[0-5]\d)|(\d{4}-[01]\d-[0-3]\d(T| )[0-2]\d:[0-5]\d)/;
+var patternDateOnly = /^\d{4}-[01]\d-[0-3]\d$/;
 
 function tryParseISO(iso) {
-	if (pattern.test(iso))
+	if (patternWithTime.test(iso) || patternDateOnly.test(iso)) {
 		return iso;
-	else
-		throw new TypeError(iso +  ' is not a valid Date');
-
-
-
-
+	} else {
+		throw new TypeError(iso + ' is not a valid Date');
+	}
 }
 
 module.exports = tryParseISO;

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

@@ -1,74 +1,3 @@
-let newParameterized = function() {
-	newParameterized = require('../query/newParameterized');
-	return newParameterized.apply(null, arguments);
-};
-
-let newBoolean = function() {
-	newBoolean = require('./newBoolean');
-	return newBoolean.apply(null, arguments);
-};
-
-function negotiateRawSqlFilter(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(filter[i], optionalTable);
-			if (nextFilter.isObjectFilter)
-				curObjectFilter = curObjectFilter ? curObjectFilter.or(nextFilter) : nextFilter;
-			else
-				curFilter = curFilter ? curFilter.and(nextFilter) : nextFilter;
-		}
-		if (curFilter && curObjectFilter)
-			return curFilter.and(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(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(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 ;
-	}
-	filter.isObjectFilter = true;
-	return filter;
-}
+const { negotiateRawSqlFilter } = require('./utils');
 
 module.exports = negotiateRawSqlFilter;