orange-orm 4.0.0 → 4.1.0

package/src/table/getManyDtoFast/getSubRows.js

@@ -1,172 +0,0 @@
-var newSingleQuery = require('./query/newSingleQuery');
-var extractOrderBy = require('../../table/query/extractOrderBy');
-var newShallowJoinSql = require('../query/singleQuery/joinSql/newShallowJoinSql');
-const executeQueries = require('../executeQueries');
-
-async function getSubRows(parentRows, filter, span, alias, innerJoin, orderBy) {
-	var promises = [];
-	var c = {};
-
-	c.visitOne = function(leg) {
-		const rightAlias = alias;
-		var nextAlias = rightAlias + '_0';
-		var parentTable = leg.table;
-		var childColumns = parentTable._primaryColumns;
-		var parentColumns = leg.columns;
-		var shallowJoin = newShallowJoinSql(parentTable, parentColumns, childColumns, nextAlias, rightAlias);
-		var nextOrderBy = orderBy + ',' + extractOrderBy(leg.span.table, nextAlias, leg.span.orderBy).substring(9);
-		var nextInnerJoin = shallowJoin.append(innerJoin);
-		var query = newSingleQuery(leg.span.table, filter, leg.span, nextAlias, nextInnerJoin, nextOrderBy);
-
-		promises.push(executeQueries([query])
-			.then(res => res[0])
-			.then(async (rows) => {
-				importOne(rows, leg);
-				await getSubRows(rows, filter, leg.span, alias + '_0', nextOrderBy);
-			}));
-	};
-
-	c.visitMany = function(leg) {
-		const rightAlias = alias;
-		var nextAlias = rightAlias + '_0';
-		var parentTable = leg.table;
-		var childColumns = parentTable._primaryColumns;
-		var parentColumns = leg.columns;
-		var shallowJoin = newShallowJoinSql(parentTable, parentColumns, childColumns, nextAlias, rightAlias);
-		var nextOrderBy = orderBy + ',' + extractOrderBy(leg.span.table, nextAlias, leg.span.orderBy).substring(9);
-		var nextInnerJoin = shallowJoin.append(innerJoin);
-		var query = newSingleQuery(leg.span.table, filter, leg.span, nextAlias, nextInnerJoin, nextOrderBy);
-
-		promises.push(executeQueries([query])
-			.then(res => res[0])
-			.then(async (rows) => {
-				importMany(rows, leg);
-				await getSubRows(rows, filter, leg.span, alias + '_0', nextInnerJoin, nextOrderBy);
-			}));
-	};
-
-	c.visitJoin = function(leg) {
-		var nextAlias = alias + '_0';
-		var span = leg.span;
-		var parentTable = leg.table;
-		var childColumns = span.table._primaryColumns;
-		var parentColumns = leg.columns;
-		var shallowJoin = newShallowJoinSql(parentTable, childColumns, parentColumns, nextAlias, alias);
-		var nextOrderBy = orderBy + ',' + extractOrderBy(leg.span.table, nextAlias, leg.span.orderBy).substring(9);
-		var nextInnerJoin = shallowJoin.append(innerJoin);
-		var query = newSingleQuery(span.table, filter, span, nextAlias, nextInnerJoin, nextOrderBy);
-
-		promises.push(executeQueries([query])
-			.then(res => res[0])
-			.then(async (rows) => {
-				importJoined(rows, leg);
-				await getSubRows(rows, filter, leg.span, alias + '_0', nextInnerJoin, nextOrderBy);
-			}));
-	};
-
-	const legs = span.legs.toArray();
-	for (let i = 0; i < legs.length; i++) {
-		legs[i].accept(c);
-		await Promise.all(promises);
-	}
-
-	function importOne(rows, leg) {
-		const prop = leg.name;
-		var parentColumns = leg.table._primaryColumns;
-		var childColumns = leg.columns;
-		importOneObjects(rows, prop, parentColumns, childColumns);
-	}
-
-	function importMany(rows, leg) {
-		const prop = leg.name;
-		var parentColumns = leg.table._primaryColumns;
-		var childColumns = leg.columns;
-		let j = 0;
-		for (let i = 0; i < parentRows.length; i++) {
-			const array = [rows[j]];
-			while (j+1 < rows.length && isChild(parentRows[i], rows[j+1], parentColumns, childColumns)) {
-				j++;
-				array.push(rows[j]);
-			}
-			parentRows[i][prop] = array;
-			j++;
-			if (j >= rows.length)
-				return;
-		}
-
-	}
-
-	function importJoined(rows, leg) {
-		const prop = leg.name;
-		var parentColumns = leg.columns;
-		var childColumns = leg.span.table._primaryColumns;
-		for (let i = 0; i < parentRows.length; i++) {
-			if (isChild(parentRows[i], rows[i], parentColumns, childColumns))
-				parentRows[i][prop] = rows[i];
-			else
-				parentRows[i][prop] = null;
-		}
-	}
-
-	function importOneObjects(rows, prop, parentColumns, childColumns) {
-		for (let i = 0; i < parentRows.length; i++) {
-			if (isChild(parentRows[i], rows[i], parentColumns, childColumns))
-				parentRows[i][prop] = rows[i];
-			else
-				parentRows[i][prop] = null;
-		}
-	}
-
-
-	// function importArrays(rows, prop, parentColumns, childColumns) {
-	// 	let j = 0;
-	// 	for (let i = 0; i < parentRows.length; i++) {
-	// 		const array = [rows[j]];
-	// 		while (isChild)
-
-	// 		// parentRows[i][prop] = [];
-	// 		// if (isChild(parentRows[i], rows[j], parentColumns, childColumns)) {
-	// 		// 	parentRows[i][prop] = rows[j];
-	// 		// 	j++;
-	// 		// 	if (j == parentRows.length)
-	// 		// 		return;
-	// 		// 	while (isChild(parentRows[i], rows[j], parentColumns, childColumns)) {
-	// 		// 		if (j == parentRows.length)
-	// 		// 			return;
-	// 		// 		parentRows[i][prop] = rows[j];
-	// 		// 		j++;
-	// 		// 	}
-	// 		// }
-	// 	}
-	// let j = 0;
-	// for (let i = 0; i < rows.length; i++) {
-	// 	const row = rows[i];
-	// 	while (j < parentRows.length && !isChild(parentRows[j], row, parentColumns, childColumns)) {
-	// 		if (!parentRows[j][prop])
-	// 			parentRows[j][prop] = [];
-	// 		j++;
-	// 	}
-	// 	if (j < parentRows.length)
-	// 		if (parentRows[j][prop])
-	// 			parentRows[j][prop].push(row);
-	// 		else
-	// 			parentRows[j][prop] = [row];
-	// 	else
-	// 		return;
-
-	// }
-	// }
-
-
-	function isChild(parentRow, row, parentColumns, childColumns) {
-		for (let i = 0; i < childColumns.length; i++) {
-			if (row[childColumns[i].alias] == parentRow[parentColumns[i].alias])
-				continue;
-			return false;
-		}
-		return true;
-	}
-
-}
-
-module.exports = getSubRows;

package/src/table/getManyDtoFast/newQuery.js

@@ -1,8 +0,0 @@
-var newQueryCore = require('./newQueryCore');
-
-function newQuery() {
-	var query = newQueryCore.apply(null, arguments);
-	return query;
-}
-
-module.exports = newQuery;

package/src/table/getManyDtoFast/newQueryCore.js

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

package/src/table/getManyDtoFast/query/newSingleQuery.js

@@ -1,20 +0,0 @@
-var newColumnSql = require('./singleQuery/newShallowColumnSql');
-var newWhereSql = require('../../../table/query/singleQuery/newWhereSql');
-var negotiateLimit = require('../../../table/query/singleQuery/negotiateLimit');
-var newParameterized = require('../../../table/query/newParameterized');
-
-function _new(table, filter, span, alias, innerJoin, orderBy, limit, offset = '') {
-
-	var name = table._dbName;
-	var columnSql = newColumnSql(table, alias, span);
-	var whereSql = newWhereSql(table, filter, alias);
-	var safeLimit = negotiateLimit(limit);
-
-	return newParameterized('select ' + safeLimit + ' ' + columnSql + ' from ' + name + ' ' + alias)
-		.append(innerJoin)
-		.append(whereSql)
-		.append(orderBy + offset);
-
-}
-
-module.exports = _new;

package/src/table/getManyDtoFast/query/newSubQueries/joinLegToQuery.js

@@ -1,18 +0,0 @@
-var newShallowJoinSql = require('../../../../table/query/singleQuery/joinSql/newShallowJoinSqlCore');
-var newQuery = require('../../newQueryCore');
-var newParameterized = require('../../../../table/query/newParameterized');
-
-function joinLegToQuery(parentAlias,leg,_legNo) {
-	var childAlias = parentAlias + leg.name;
-	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 query.prepend(',JSON_QUERY((').append(` FOR JSON PATH, INCLUDE_NULL_VALUES, WITHOUT_ARRAY_WRAPPER)) "${leg.name}"`);
-}
-
-module.exports = joinLegToQuery;

package/src/table/getManyDtoFast/query/newSubQueries/manyLegToQuery.js

@@ -1,20 +0,0 @@
-var newShallowJoinSql = require('../../../../table/query/singleQuery/joinSql/newShallowJoinSqlCore');
-var newQuery = require('../../newQueryCore');
-var newParameterized = require('../../../../table/query/newParameterized');
-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 shallowJoin = newShallowJoinSql(rightTable, leftColumns, rightColumns, leftAlias, rightAlias);
-	var filter = newParameterized(shallowJoin);
-	var query = newQuery(span.table, filter, span, leftAlias);
-	return util.format(',JSON_QUERY( coalesce((%s FOR JSON PATH, INCLUDE_NULL_VALUES),\'[]\')) "%s"', query.sql(), leg.name);
-
-}
-
-module.exports = manyLegToQuery;

package/src/table/getManyDtoFast/query/newSubQueries/oneLegToQuery.js

@@ -1,21 +0,0 @@
-var newShallowJoinSql = require('../../../../table/query/singleQuery/joinSql/newShallowJoinSqlCore');
-var newQuery = require('../../newQueryCore');
-var newParameterized = require('../../../../table/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);
-	var sql = 'SELECT TOP 1' + query.sql().substring(6);
-	return util.format(',JSON_QUERY((%s FOR JSON PATH, INCLUDE_NULL_VALUES, WITHOUT_ARRAY_WRAPPER)) "%s"',sql, leg.name );
-
-}
-
-module.exports = oneLegToQuery;

package/src/table/getManyDtoFast/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/getManyDtoFast/query/singleQuery/newShallowColumnSql.js

@@ -1,21 +0,0 @@
-var util = require('util');
-
-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 (!columnsMap || (columnsMap.get(column))) {
-			sql = sql + separator + util.format(columnFormat, column._dbName, column.alias);
-			separator = ',' + alias + '.';
-		}
-	}
-	return sql;
-}
-
-module.exports = _new;