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

package/src/table/createReadStreamDefault.js

@@ -1,102 +0,0 @@
-var extractFilter = require('./query/extractFilter');
-var cloneStrategy = require('./cloneStrategy');
-var defaultBatchSize = 200;
-var Readable = require('stream').Readable;
-var createBatchFilter = require('./readStreamDefault/createBatchFilter');
-
-function createReadStream(table, db, filter, strategy, streamOptions) {
-	filter = extractFilter(filter);
-	var batchFilter;
-	strategy = cloneStrategy(strategy);
-	calculateOrderBy();
-	streamOptions = streamOptions || {};
-	var batchSize = streamOptions.batchSize || defaultBatchSize;
-	batchSize = (batchSize + 1) / 2 >> 0;
-	var maxRows = strategy.limit;
-	var currentRowCount = 0;
-	var busy;
-	var waitingforMore;
-	var dtos = [];
-	var lastDto;
-	var done;
-
-	var stream = Readable({ objectMode: true });
-	stream._read = function() {
-		waitingforMore = true;
-		if (!busy) {
-			if (dtos.length > 0)
-				negotiatePushStream();
-			else
-				getDtos();
-		}
-	};
-	if (process.domain)
-		process.domain.add(stream);
-
-	function getDtos() {
-		busy = true;
-		return db.transaction(async () => {
-			await getBatch()
-				.then(onDtos);
-		})
-			.then(negotiatePushStream, onError);
-	}
-
-	function onDtos(result) {
-		busy = false;
-		currentRowCount += result.length;
-		lastDto = result[result.length - 1];
-		dtos = dtos.concat(result);
-		if (currentRowCount >= maxRows || result.length < batchSize) {
-			dtos.push(null);
-			done = true;
-		}
-	}
-
-	function negotiatePushStream() {
-		if (dtos.length <= batchSize && !done)
-			getDtos();
-		if (!waitingforMore)
-			return;
-		waitingforMore = false;
-		stream.push(dtos.shift());
-	}
-
-	function getBatch() {
-		calculateLimit();
-		calculateBatchFilter();
-		return table.getMany(batchFilter, strategy);
-	}
-
-	function calculateLimit() {
-		if (maxRows === undefined || maxRows === null)
-			strategy.limit = batchSize;
-		else {
-			var rowsLeft = maxRows - currentRowCount;
-			strategy.limit = Math.min(rowsLeft, batchSize);
-		}
-	}
-
-	function calculateOrderBy() {
-		strategy.orderBy = strategy.orderBy || [];
-		if (typeof strategy.orderBy === 'string') {
-			strategy.orderBy = [strategy.orderBy];
-		}
-		var primaryColumns = table._primaryColumns;
-		for (var i = 0; i < primaryColumns.length; i++) {
-			strategy.orderBy.push(primaryColumns[i].alias);
-		}
-	}
-
-	function calculateBatchFilter() {
-		batchFilter = createBatchFilter(table, filter, strategy, lastDto);
-	}
-
-	function onError(e) {
-		stream.emit('error', e);
-	}
-
-	return stream;
-}
-
-module.exports = createReadStream;

package/src/table/createReadStreamNative.js

@@ -1,17 +0,0 @@
-var createReadStreamCore = require('./createReadStreamCoreNative');
-var Stream = require('stream');
-
-function createReadStreamNative(table, db, filter, strategy, streamOptions) {
-	var transformer = Stream.Transform({ objectMode: true });
-	transformer._transform = function(chunk, _enc, cb) {
-		let result = chunk.result;
-		if (typeof result === 'string')
-			result = JSON.parse(result);
-		transformer.push(result);
-		cb();
-	};
-
-	return createReadStreamCore(table, db, filter, strategy, transformer, streamOptions);
-}
-
-module.exports = createReadStreamNative;

package/src/table/readStream/extractLimit.js

@@ -1,7 +0,0 @@
-function extractLimit(span) {
-	if (span.limit)
-		return ' limit ' + span.limit;
-	return '';
-}
-
-module.exports = extractLimit;

package/src/table/readStream/extractOrderBy.js

@@ -1,59 +0,0 @@
-const getSessionSingleton = require('../getSessionSingleton');
-
-function extractOrderBy(alias, span) {
-	const quote = getSessionSingleton('quote');
-	alias = quote(alias);
-	var table = span.table;
-	var dbNames = [];
-	var orderBy = span.orderBy;
-	var i;
-	if (span.orderBy) {
-		if (typeof orderBy === 'string')
-			orderBy = [orderBy];
-		for (i = 0; i < orderBy.length; i++) {
-			var nameAndDirection = extractNameAndDirection(orderBy[i]);
-			pushColumn(nameAndDirection.name, nameAndDirection.direction);
-		}
-	} else
-		for (i = 0; i < table._primaryColumns.length; i++) {
-			pushColumn(table._primaryColumns[i].alias);
-		}
-
-	function extractNameAndDirection(orderBy) {
-		var elements = orderBy.split(' ');
-		var direction = '';
-		if (elements.length > 1) {
-			direction = ' ' + elements[1];
-		}
-		return {
-			name: elements[0],
-			direction: direction
-		};
-	}
-
-	function pushColumn(property, direction) {
-		direction = direction || '';
-		var column = getTableColumn(property);
-		var jsonQuery = getJsonQuery(property, column.alias);
-
-		dbNames.push(alias + '.' + quote(column._dbName) + jsonQuery + direction);
-	}
-	function getTableColumn(property) {
-		var column = table[property] || table[property.split(/(-|#)>+/g)[0]];
-		if(!column){
-			throw new Error(`Unable to get column on orderBy '${property}'. If jsonb query, only #>, #>>, -> and ->> allowed. Only use ' ' to seperate between query and direction. Does currently not support casting.`);
-		}
-		return column;
-	}
-	function getJsonQuery(property, column) {
-		let containsJson = (/(-|#)>+/g).test(property);
-		if(!containsJson){
-			return '';
-		}
-		return property.replace(column, '');
-	}
-
-	return ' order by ' + dbNames.join(',');
-}
-
-module.exports = extractOrderBy;

package/src/table/readStream/mySql/newQuery.js

@@ -1,16 +0,0 @@
-var newSingleQuery = require('./query/newSingleQuery');
-var newSubQueries = require('./query/newSubQueries');
-var extractFilter = require('../../query/extractFilter');
-var extractOrderBy = require('../extractOrderBy');
-var extractLimit = require('../extractLimit');
-
-function newQuery(table,filter,span,alias) {
-	filter = extractFilter(filter);
-	var orderBy = extractOrderBy(alias,span);
-	var limit = extractLimit(span);
-
-	var subQueries = newSubQueries(table,span,alias);
-	return newSingleQuery(table,filter,alias,subQueries,orderBy,limit);
-}
-
-module.exports = newQuery;

package/src/table/readStream/mySql/query/newSingleQuery.js

@@ -1,21 +0,0 @@
-var newColumnSql = require('./singleQuery/newShallowColumnSql');
-var newWhereSql = require('../../../query/singleQuery/newWhereSql');
-var template = 'select json_object(%s%s) as result from %s %s%s%s%s';
-var util = require('util');
-
-function _new(table,filter,alias,subQueries,orderBy,limit) {
-	var c = {};
-
-	c.sql = function() {
-		var name = table._dbName;
-		var columnSql = newColumnSql(table,alias);
-		var whereSql = newWhereSql(table,filter,alias);
-		return util.format(template, columnSql, subQueries, name, alias, whereSql, orderBy, limit);
-	};
-
-	c.parameters = filter.parameters;
-
-	return c;
-}
-
-module.exports = _new;

package/src/table/readStream/mySql/query/newSubQueries/joinLegToQuery.js

@@ -1,20 +0,0 @@
-var newShallowJoinSql = require('../../../../query/singleQuery/joinSql/newShallowJoinSqlCore');
-const quote = require('../../../../quote');
-var newQuery = require('./newQueryCore');
-var util = require('util');
-
-function joinLegToQuery(parentAlias,leg,legNo) {
-	var childAlias = parentAlias + 'x' + legNo;
-	var span = leg.span;
-	var childTable = span.table;
-	var parentTable = leg.table;
-	var childColumns = span.table._primaryColumns;
-	var parentColumns = leg.columns;
-
-	var shallowJoin  = newShallowJoinSql(parentTable,childColumns,parentColumns,childAlias,parentAlias);
-	var query = newQuery(childTable,span,childAlias);
-
-	return util.format(',\'%s\',(select %s from %s %s where %s)', leg.name, query.sql(), quote(childTable._dbName), quote(childAlias), shallowJoin);
-}
-
-module.exports = joinLegToQuery;

package/src/table/readStream/mySql/query/newSubQueries/manyLegToQuery.js

@@ -1,22 +0,0 @@
-var newShallowJoinSql = require('../../../../query/singleQuery/joinSql/newShallowJoinSqlCore');
-var extractOrderBy = require('../../../extractOrderBy');
-var newQuery = require('./newQueryCore');
-var util = require('util');
-
-function manyLegToQuery(rightAlias,leg,legNo) {
-	var leftAlias = rightAlias + 'x' + legNo;
-	var span = leg.span;
-	var rightTable = leg.table;
-	var rightColumns = rightTable._primaryColumns;
-	var leftColumns = leg.columns;
-	var orderBy = extractOrderBy(leftAlias, span);
-
-	var shallowJoin  = newShallowJoinSql(rightTable,leftColumns,rightColumns,leftAlias,rightAlias);
-	var query = newQuery(span.table,span,leftAlias);
-
-
-	return util.format(',\'%s\',(select cast(concat(\'[\',ifnull(group_concat(%s%s),\'\'),\']\') as json) from %s %s where %s)',
-		leg.name, query.sql(), orderBy, span.table._dbName, leftAlias, shallowJoin);
-}
-
-module.exports = manyLegToQuery;

package/src/table/readStream/mySql/query/newSubQueries/newQueryCore.js

@@ -1,9 +0,0 @@
-var newSingleQuery = require('./newSingleQueryCore');
-var newSubQueries = require('../newSubQueries');
-
-function newQueryCore(table,span,alias) {
-	var subQueries = newSubQueries(table,span,alias);
-	return newSingleQuery(table,alias,subQueries);
-}
-
-module.exports = newQueryCore;

package/src/table/readStream/mySql/query/newSubQueries/newSingleQueryCore.js

@@ -1,18 +0,0 @@
-var newColumnSql = require('../singleQuery/newShallowColumnSql');
-var template = 'json_object(%s%s)';
-var util = require('util');
-
-function _new(table,alias,subQueries) {
-	var c = {};
-
-	c.sql = function() {
-		var columnSql = newColumnSql(table,alias);
-		return util.format(template, columnSql, subQueries);
-	};
-
-	c.parameters = [];
-
-	return c;
-}
-
-module.exports = _new;

package/src/table/readStream/mySql/query/newSubQueries/oneLegToQuery.js

@@ -1,22 +0,0 @@
-var newShallowJoinSql = require('../../../../query/singleQuery/joinSql/newShallowJoinSqlCore');
-var newQuery = require('./newQueryCore');
-var extractOrderBy = require('../../../../query/extractOrderBy');
-var util = require('util');
-
-function manyLegToQuery(rightAlias,leg,legNo) {
-	var leftAlias = rightAlias + 'x' + legNo;
-	var span = leg.span;
-	var rightTable = leg.table;
-	var rightColumns = rightTable._primaryColumns;
-	var leftColumns = leg.columns;
-	var orderBy = extractOrderBy(rightTable,rightAlias);
-
-	var shallowJoin  = newShallowJoinSql(rightTable,leftColumns,rightColumns,leftAlias,rightAlias);
-	var query = newQuery(span.table,span,leftAlias);
-
-
-	return util.format(',\'%s\',(select %s from %s %s where %s%s LIMIT 1)',
-		leg.name, query.sql(), span.table._dbName, leftAlias, shallowJoin, orderBy);
-}
-
-module.exports = manyLegToQuery;

package/src/table/readStream/mySql/query/newSubQueries.js

@@ -1,47 +0,0 @@
-var joinLegToQuery = _joinLegToQuery;
-var oneLegToQuery = _oneLegToQuery;
-var manyLegToQuery = _manyLegToQuery;
-
-function newSubQueries(table,span,alias) {
-	var result = [];
-	var c = {};
-	var _legNo;
-
-	c.visitJoin = function(leg) {
-		result.push(joinLegToQuery( alias,leg,_legNo));
-	};
-	c.visitOne = function(leg) {
-		result.push(oneLegToQuery( alias,leg,_legNo));
-	};
-	c.visitMany = function(leg) {
-		result.push(manyLegToQuery( alias,leg,_legNo));
-	};
-
-	span.legs.forEach(onEachLeg);
-
-	function onEachLeg(leg,legNo) {
-		_legNo = legNo;
-		leg.accept(c);
-	}
-
-	return result.join('');
-}
-
-function _joinLegToQuery() {
-	joinLegToQuery = require('./newSubQueries/joinLegToQuery');
-	return joinLegToQuery.apply(null,arguments);
-}
-
-function _oneLegToQuery() {
-	oneLegToQuery = require('./newSubQueries/oneLegToQuery');
-	return oneLegToQuery.apply(null,arguments);
-}
-
-function _manyLegToQuery() {
-	manyLegToQuery = require('./newSubQueries/manyLegToQuery');
-	return manyLegToQuery.apply(null,arguments);
-}
-
-
-
-module.exports = newSubQueries;

package/src/table/readStream/mySql/query/singleQuery/newShallowColumnSql.js

@@ -1,18 +0,0 @@
-var util = require('util');
-const quote = require('../../../../quote');
-
-function _new(table,alias) {
-	var columnFormat = '\'%s\',%s.%s';
-	var columns = table._columns;
-	var sql = '';
-	var separator = '';
-	for (var i = 0; i < columns.length; i++) {
-		var column = columns[i];
-		if (!('serializable' in column && !column.serializable))
-			sql = sql + separator + util.format(columnFormat, quote(column.alias), alias, quote(column._dbName));
-		separator = ',';
-	}
-	return sql;
-}
-
-module.exports = _new;

package/src/table/readStream/newQuery.js

@@ -1,32 +0,0 @@
-var newMySqlQuery = require('./mySql/newQuery');
-var newPgQuery = require('./pg/newQuery');
-
-function newQuery(db) {
-	var c = {};
-	var _newQuery;
-
-	c.visitPg = function() {
-		_newQuery = newPgQuery;
-	};
-	c.visitMySql = function() {
-		_newQuery = newMySqlQuery;
-	};
-
-	c.visitSqlite = function() {
-		throw new Error('Sqlite not supported');
-	};
-
-	c.visitSap = function() {
-		throw new Error('Sap not supported');
-	};
-
-	db.accept(c);
-
-	var args = [];
-	for (var i = 1; i < arguments.length; i++) {
-		args.push(arguments[i]);
-	}
-	return _newQuery.apply(null, args);
-}
-
-module.exports = newQuery;

package/src/table/readStream/newQueryStream.js

@@ -1,8 +0,0 @@
-var getSessionSingleton = require('../getSessionSingleton');
-
-function newQueryStream(query, options) {
-	var dbClient = getSessionSingleton('dbClient');
-	return dbClient.streamQuery(query, options);
-}
-
-module.exports = newQueryStream;

package/src/table/readStream/pg/newQuery.js

@@ -1,8 +0,0 @@
-var newQueryCore = require('./newQueryCore');
-
-function newQuery() {
-	var query = newQueryCore.apply(null, arguments);
-	return query.prepend('select row_to_json(r)::text as result from (').append(') r');
-}
-
-module.exports = newQuery;

package/src/table/readStream/pg/newQueryCore.js

@@ -1,17 +0,0 @@
-var newSingleQuery = require('./query/newSingleQuery');
-var newSubQueries = require('./query/newSubQueries');
-var extractFilter = require('../../query/extractFilter');
-var extractOrderBy = require('../extractOrderBy');
-var extractLimit = require('../extractLimit');
-var newParameterized = require('../../query/newParameterized');
-
-function newQuery(table,filter,span,alias) {
-	filter = extractFilter(filter);
-	var orderBy = extractOrderBy(alias,span);
-	var limit = extractLimit(span);
-	var subQueries = newSubQueries(table,span,alias);
-	var query = newSingleQuery(table,filter,span,alias,subQueries,orderBy,limit);
-	return newParameterized(query.sql(), query.parameters);
-}
-
-module.exports = newQuery;

package/src/table/readStream/pg/query/newSingleQuery.js

@@ -1,19 +0,0 @@
-var newColumnSql = require('./singleQuery/newShallowColumnSql');
-var newWhereSql = require('../../../query/singleQuery/newWhereSql');
-
-function _new(table,filter,span, alias,subQueries,orderBy,limit) {
-	var c = {};
-
-	c.sql = function() {
-		var name = table._dbName;
-		var columnSql = newColumnSql(table,alias,span);
-		var whereSql = newWhereSql(table,filter,alias);
-		return 'select ' + columnSql + subQueries + ' from ' + name + ' ' + alias + whereSql + orderBy + limit;
-	};
-
-	c.parameters = filter.parameters;
-
-	return c;
-}
-
-module.exports = _new;

package/src/table/readStream/pg/query/newSubQueries/joinLegToQuery.js

@@ -1,19 +0,0 @@
-var newShallowJoinSql = require('../../../../query/singleQuery/joinSql/newShallowJoinSqlCore');
-var newQuery = require('../../newQueryCore');
-var newParameterized = require('../../../../query/newParameterized');
-var util = require('util');
-
-function joinLegToQuery(parentAlias,leg,legNo) {
-	var childAlias = parentAlias + 'x' + legNo;
-	var span = leg.span;
-	var parentTable = leg.table;
-	var childColumns = span.table._primaryColumns;
-	var parentColumns = leg.columns;
-
-	var shallowJoin  = newShallowJoinSql(parentTable,childColumns,parentColumns,childAlias,parentAlias);
-	var filter = newParameterized(shallowJoin);
-	var query = newQuery(span.table,filter,span,childAlias);
-	return util.format(',(select row_to_json(r) from (%s limit 1) r) "%s"', query.sql(), leg.name );
-}
-
-module.exports = joinLegToQuery;

package/src/table/readStream/pg/query/newSubQueries/manyLegToQuery.js

@@ -1,22 +0,0 @@
-var newShallowJoinSql = require('../../../../query/singleQuery/joinSql/newShallowJoinSqlCore');
-var newQuery = require('../../newQueryCore');
-var newParameterized = require('../../../../query/newParameterized');
-var extractOrderBy = require('../../../../query/extractOrderBy');
-var util = require('util');
-
-function manyLegToQuery(rightAlias, leg, legNo) {
-	var leftAlias = rightAlias + 'x' + legNo;
-	var span = leg.span;
-	var rightTable = leg.table;
-	var rightColumns = rightTable._primaryColumns;
-	var leftColumns = leg.columns;
-	var orderBy = extractOrderBy(rightTable, rightAlias);
-
-	var shallowJoin = newShallowJoinSql(rightTable, leftColumns, rightColumns, leftAlias, rightAlias);
-	var filter = newParameterized(shallowJoin);
-	var query = newQuery(span.table, filter, span, leftAlias, orderBy);
-	return util.format(',(select coalesce(json_agg(row_to_json(r)),\'[]\') from (%s) r ) "%s"', query.sql(), leg.name);
-
-}
-
-module.exports = manyLegToQuery;

package/src/table/readStream/pg/query/newSubQueries/oneLegToQuery.js

@@ -1,19 +0,0 @@
-var newShallowJoinSql = require('../../../../query/singleQuery/joinSql/newShallowJoinSqlCore');
-var newQuery = require('../../newQueryCore');
-var newParameterized = require('../../../../query/newParameterized');
-var util = require('util');
-
-function oneLegToQuery(rightAlias,leg,legNo) {
-	var leftAlias = rightAlias + 'x' + legNo;
-	var span = leg.span;
-	var rightTable = leg.table;
-	var rightColumns = rightTable._primaryColumns;
-	var leftColumns = leg.columns;
-
-	var shallowJoin  = newShallowJoinSql(rightTable,leftColumns,rightColumns,leftAlias,rightAlias);
-	var filter = newParameterized(shallowJoin);
-	var query = newQuery(span.table,filter,span,leftAlias);
-	return util.format(',(select row_to_json(r) from (%s limit 1) r) "%s"', query.sql(), leg.name );
-}
-
-module.exports = oneLegToQuery;

package/src/table/readStream/pg/query/newSubQueries.js

@@ -1,47 +0,0 @@
-var joinLegToQuery = _joinLegToQuery;
-var oneLegToQuery = _oneLegToQuery;
-var manyLegToQuery = _manyLegToQuery;
-
-function newSubQueries(table,span,alias) {
-	var result = [];
-	var c = {};
-	var _legNo;
-
-	c.visitJoin = function(leg) {
-		result.push(joinLegToQuery( alias,leg,_legNo));
-	};
-	c.visitOne = function(leg) {
-		result.push(oneLegToQuery( alias,leg,_legNo));
-	};
-	c.visitMany = function(leg) {
-		result.push(manyLegToQuery( alias,leg,_legNo));
-	};
-
-	span.legs.forEach(onEachLeg);
-
-	function onEachLeg(leg,legNo) {
-		_legNo = legNo;
-		leg.accept(c);
-	}
-
-	return result.join('');
-}
-
-function _joinLegToQuery() {
-	joinLegToQuery = require('./newSubQueries/joinLegToQuery');
-	return joinLegToQuery.apply(null,arguments);
-}
-
-function _oneLegToQuery() {
-	oneLegToQuery = require('./newSubQueries/oneLegToQuery');
-	return oneLegToQuery.apply(null,arguments);
-}
-
-function _manyLegToQuery() {
-	manyLegToQuery = require('./newSubQueries/manyLegToQuery');
-	return manyLegToQuery.apply(null,arguments);
-}
-
-
-
-module.exports = newSubQueries;

package/src/table/readStream/pg/query/singleQuery/newShallowColumnSql.js

@@ -1,20 +0,0 @@
-var util = require('util');
-const quote = require('../../../../quote');
-
-function _new(table,alias,span) {
-	let columnsMap = span.columns;
-	var columnFormat = '%s as "%s"';
-	var columns = table._columns;
-	var sql = '';
-	var separator = alias + '.';
-	for (var i = 0; i < columns.length; i++) {
-		var column = columns[i];
-		if (!('serializable' in column && !column.serializable) && (!columnsMap || (columnsMap.get(column)))) {
-			sql = sql + separator + util.format(columnFormat, quote(column._dbName), quote(column.alias));
-			separator = ',' + alias + '.';
-		}
-	}
-	return sql;
-}
-
-module.exports = _new;

package/src/table/readStreamDefault/createBatchFilter.js

@@ -1,39 +0,0 @@
-var emptyFilter = require('../../emptyFilter');
-
-function createBatchFilter(table, filter, strategy, lastDto) {
-	if (!lastDto) {
-		return filter;
-	}
-
-	var orderBy = strategy.orderBy;
-
-	for (var i = 0; i < strategy.orderBy.length; i++) {
-		var subFilter = createSubFilter(i);
-		filter = filter.or(subFilter);
-	}
-
-	function createSubFilter(index) {
-		var subFilter = emptyFilter;
-		for (var i = 0; i < index + 1; i++) {
-			var order = orderBy[i];
-			var elements = order.split(' ');
-			var name = elements[0];
-			var direction = elements[1] || 'asc';
-			var value = lastDto[name];
-			if (index === i) {
-				if (direction === 'asc')
-					subFilter = subFilter.and(table[name].greaterThan(value));
-				else
-					subFilter = subFilter.and(table[name].lessThan(value));
-			} else
-				subFilter = subFilter.and(table[name].eq(value));
-		}
-		return subFilter;
-	}
-
-	return filter;
-}
-
-
-
-module.exports = createBatchFilter;