orange-orm 4.5.1 → 4.5.2

package/docs/changelog.md

@@ -1,4 +1,6 @@
 ## Changelog
+__4.5.2__  
+Bugfix: Aggregate functions are not allowed on root tables .  See [#120](https://github.com/alfateam/orange-orm/issues/121)  
 __4.5.1__  
 Bugfix: "Changed by Other User" Error Triggered by Precision Mismatch in Numeric Column.  See [#120](https://github.com/alfateam/orange-orm/issues/120)  
 __4.5.0__  

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orange-orm",
-  "version": "4.5.1",
+  "version": "4.5.2",
   "main": "./src/index.js",
   "browser": "./src/client/index.mjs",
   "bin": {

package/src/client/index.mjs

@@ -3951,6 +3951,178 @@ function requireExtractAlias () {
 	return extractAlias;
 }
 
+var columnAggregate_1$1;
+var hasRequiredColumnAggregate$1;
+
+function requireColumnAggregate$1 () {
+	if (hasRequiredColumnAggregate$1) return columnAggregate_1$1;
+	hasRequiredColumnAggregate$1 = 1;
+	const getSessionSingleton = requireGetSessionSingleton();
+
+	function columnAggregate(context, operator, column, table, coalesce = true) {
+		const quote = getSessionSingleton(context, 'quote');
+
+		const tableAlias = quote(table._rootAlias || table._dbName);
+		const columnName = quote(column._dbName);
+
+		return {
+			expression: (alias) => coalesce ? `COALESCE(${operator}(${tableAlias}.${columnName}), 0) as ${quote(alias)}` : `${operator}(${tableAlias}.${columnName}) as ${quote(alias)}`,
+			joins: ['']
+		};
+	}
+
+	columnAggregate_1$1 = columnAggregate;
+	return columnAggregate_1$1;
+}
+
+var newDiscriminatorSql_1$1;
+var hasRequiredNewDiscriminatorSql$1;
+
+function requireNewDiscriminatorSql$1 () {
+	if (hasRequiredNewDiscriminatorSql$1) return newDiscriminatorSql_1$1;
+	hasRequiredNewDiscriminatorSql$1 = 1;
+	const getSessionSingleton = requireGetSessionSingleton();
+
+	function newDiscriminatorSql(context, table, alias) {
+		const quote = getSessionSingleton(context, 'quote');
+		alias = quote(alias);
+		var result = '';
+		var formulaDiscriminators = table._formulaDiscriminators;
+		var columnDiscriminators = table._columnDiscriminators;
+		addFormula();
+		addColumn();
+		return result;
+
+		function addFormula() {
+			for (var i = 0; i<formulaDiscriminators.length; i++) {
+				var current = formulaDiscriminators[i].replace('@this',alias);
+				and();
+				result += '(' + current + ')';
+			}
+		}
+
+		function addColumn() {
+			for (var i = 0; i< columnDiscriminators.length; i++) {
+				var current = columnDiscriminators[i].split('=');
+				and();
+				result += alias + '.' + quote(current[0]) + '=' + current[1];
+			}
+		}
+
+		function and() {
+			if(result)
+				result += ' AND ';
+			else
+				result = ' ';
+		}
+	}
+
+	newDiscriminatorSql_1$1 = newDiscriminatorSql;
+	return newDiscriminatorSql_1$1;
+}
+
+var newDiscriminatorSql_1;
+var hasRequiredNewDiscriminatorSql;
+
+function requireNewDiscriminatorSql () {
+	if (hasRequiredNewDiscriminatorSql) return newDiscriminatorSql_1;
+	hasRequiredNewDiscriminatorSql = 1;
+	var newDiscriminatorSqlCore = requireNewDiscriminatorSql$1();
+
+	function newDiscriminatorSql(context, table, alias) {
+		var result = newDiscriminatorSqlCore(context,table,alias);
+		if (result)
+			return ' AND' + result;
+		return result;
+
+	}
+
+	newDiscriminatorSql_1 = newDiscriminatorSql;
+	return newDiscriminatorSql_1;
+}
+
+var newShallowJoinSqlCore;
+var hasRequiredNewShallowJoinSqlCore;
+
+function requireNewShallowJoinSqlCore () {
+	if (hasRequiredNewShallowJoinSqlCore) return newShallowJoinSqlCore;
+	hasRequiredNewShallowJoinSqlCore = 1;
+	const newDiscriminatorSql = requireNewDiscriminatorSql();
+	const newParameterized = requireNewParameterized();
+	const getSessionSingleton = requireGetSessionSingleton();
+
+	function _new(context, rightTable, leftColumns, rightColumns, leftAlias, rightAlias, filter) {
+		const quote = getSessionSingleton(context, 'quote');
+		leftAlias = quote(leftAlias);
+		rightAlias = quote(rightAlias);
+		var sql = '';
+		var delimiter = '';
+		for (var i = 0; i < leftColumns.length; i++) {
+			addColumn(i);
+			delimiter = ' AND ';
+		}
+
+		function addColumn(index) {
+			var leftColumn = leftColumns[index];
+			var rightColumn = rightColumns[index];
+			sql += delimiter + leftAlias + '.' + quote(leftColumn._dbName) + '=' + rightAlias + '.' + quote(rightColumn._dbName);
+		}
+
+		sql += newDiscriminatorSql(context, rightTable, rightAlias);
+		var result = newParameterized(sql);
+		if (filter)
+			result = result.append(delimiter).append(filter);
+		return result;
+	}
+
+	newShallowJoinSqlCore = _new;
+	return newShallowJoinSqlCore;
+}
+
+var columnAggregateGroup$1;
+var hasRequiredColumnAggregateGroup$1;
+
+function requireColumnAggregateGroup$1 () {
+	if (hasRequiredColumnAggregateGroup$1) return columnAggregateGroup$1;
+	hasRequiredColumnAggregateGroup$1 = 1;
+	var getSessionContext = requireGetSessionContext();
+	var newJoinCore = requireNewShallowJoinSqlCore();
+	const getSessionSingleton = requireGetSessionSingleton();
+
+	function columnAggregate(context, operator, column, table, coalesce = true) {
+		const quote = getSessionSingleton(context, 'quote');
+		const rdb = getSessionContext(context);
+		const outerAlias = 'y' + rdb.aggregateCount++;
+		const outerAliasQuoted = quote(outerAlias);
+		const alias = quote('x');
+		const foreignKeys = getForeignKeys(table);
+		const select = ` LEFT JOIN (SELECT ${foreignKeys},${operator}(${alias}.${quote(column._dbName)}) as amount`;
+		const onClause = createOnClause(context, table, outerAlias);
+		const from = ` FROM ${quote(table._dbName)} ${alias} GROUP BY ${foreignKeys}) ${outerAliasQuoted} ON (${onClause})`;
+		const join = select + from;
+
+		return {
+			expression: (alias) => coalesce ? `COALESCE(${outerAliasQuoted}.amount, 0) as ${quote(alias)}` : `${outerAliasQuoted}.amount as ${alias}`,
+			joins: [join]
+		};
+
+		function getForeignKeys(table) {
+			return table._primaryColumns.map(x => `${alias}.${quote(x._dbName)}`).join(',');
+		}
+	}
+
+	function createOnClause(context, table, rightAlias) {
+		let leftAlias = table._rootAlias || table._dbName;
+		const columns = table._primaryColumns;
+		return newJoinCore(context, table, columns, columns, leftAlias, rightAlias).sql();
+	}
+
+
+
+	columnAggregateGroup$1 = columnAggregate;
+	return columnAggregateGroup$1;
+}
+
 var newColumn;
 var hasRequiredNewColumn;
 
@@ -3966,6 +4138,8 @@ function requireNewColumn () {
 	const _in = require_in();
 	const _extractAlias = requireExtractAlias();
 	const quote = requireQuote$1();
+	const aggregate = requireColumnAggregate$1();
+	const aggregateGroup = requireColumnAggregateGroup$1();
 
 	newColumn = function(table, name) {
 		var c = {};
@@ -4035,6 +4209,17 @@ function requireNewColumn () {
 		c.IN = c.in;
 		c.self = self;
 
+		c.groupSum = (context, ...rest) => aggregateGroup.apply(null, [context, 'sum', c, table, ...rest]);
+		c.groupAvg = (context, ...rest) => aggregateGroup.apply(null, [context, 'avg', c, table, ...rest]);
+		c.groupMin = (context, ...rest) => aggregateGroup.apply(null, [context, 'min', c, table, ...rest]);
+		c.groupMax = (context, ...rest) => aggregateGroup.apply(null, [context, 'max', c, table, ...rest]);
+		c.groupCount = (context, ...rest) => aggregateGroup.apply(null, [context, 'count', c, table, false, ...rest]);
+		c.sum = (context, ...rest) => aggregate.apply(null, [context, 'sum', c, table, ...rest]);
+		c.avg = (context, ...rest) => aggregate.apply(null, [context, 'avg', c, table, ...rest]);
+		c.min = (context, ...rest) => aggregate.apply(null, [context, 'min', c, table, ...rest]);
+		c.max = (context, ...rest) => aggregate.apply(null, [context, 'max', c, table, ...rest]);
+		c.count = (context, ...rest) => aggregate.apply(null, [context, 'count', c, table, false, ...rest]);
+
 		function self(context) {
 			const tableAlias = quote(context,table._rootAlias || table._dbName);
 			const columnName = quote(context, c._dbName);
@@ -5670,110 +5855,6 @@ function requireNewColumnSql () {
 	return newColumnSql;
 }
 
-var newDiscriminatorSql_1$1;
-var hasRequiredNewDiscriminatorSql$1;
-
-function requireNewDiscriminatorSql$1 () {
-	if (hasRequiredNewDiscriminatorSql$1) return newDiscriminatorSql_1$1;
-	hasRequiredNewDiscriminatorSql$1 = 1;
-	const getSessionSingleton = requireGetSessionSingleton();
-
-	function newDiscriminatorSql(context, table, alias) {
-		const quote = getSessionSingleton(context, 'quote');
-		alias = quote(alias);
-		var result = '';
-		var formulaDiscriminators = table._formulaDiscriminators;
-		var columnDiscriminators = table._columnDiscriminators;
-		addFormula();
-		addColumn();
-		return result;
-
-		function addFormula() {
-			for (var i = 0; i<formulaDiscriminators.length; i++) {
-				var current = formulaDiscriminators[i].replace('@this',alias);
-				and();
-				result += '(' + current + ')';
-			}
-		}
-
-		function addColumn() {
-			for (var i = 0; i< columnDiscriminators.length; i++) {
-				var current = columnDiscriminators[i].split('=');
-				and();
-				result += alias + '.' + quote(current[0]) + '=' + current[1];
-			}
-		}
-
-		function and() {
-			if(result)
-				result += ' AND ';
-			else
-				result = ' ';
-		}
-	}
-
-	newDiscriminatorSql_1$1 = newDiscriminatorSql;
-	return newDiscriminatorSql_1$1;
-}
-
-var newDiscriminatorSql_1;
-var hasRequiredNewDiscriminatorSql;
-
-function requireNewDiscriminatorSql () {
-	if (hasRequiredNewDiscriminatorSql) return newDiscriminatorSql_1;
-	hasRequiredNewDiscriminatorSql = 1;
-	var newDiscriminatorSqlCore = requireNewDiscriminatorSql$1();
-
-	function newDiscriminatorSql(context, table, alias) {
-		var result = newDiscriminatorSqlCore(context,table,alias);
-		if (result)
-			return ' AND' + result;
-		return result;
-
-	}
-
-	newDiscriminatorSql_1 = newDiscriminatorSql;
-	return newDiscriminatorSql_1;
-}
-
-var newShallowJoinSqlCore;
-var hasRequiredNewShallowJoinSqlCore;
-
-function requireNewShallowJoinSqlCore () {
-	if (hasRequiredNewShallowJoinSqlCore) return newShallowJoinSqlCore;
-	hasRequiredNewShallowJoinSqlCore = 1;
-	const newDiscriminatorSql = requireNewDiscriminatorSql();
-	const newParameterized = requireNewParameterized();
-	const getSessionSingleton = requireGetSessionSingleton();
-
-	function _new(context, rightTable, leftColumns, rightColumns, leftAlias, rightAlias, filter) {
-		const quote = getSessionSingleton(context, 'quote');
-		leftAlias = quote(leftAlias);
-		rightAlias = quote(rightAlias);
-		var sql = '';
-		var delimiter = '';
-		for (var i = 0; i < leftColumns.length; i++) {
-			addColumn(i);
-			delimiter = ' AND ';
-		}
-
-		function addColumn(index) {
-			var leftColumn = leftColumns[index];
-			var rightColumn = rightColumns[index];
-			sql += delimiter + leftAlias + '.' + quote(leftColumn._dbName) + '=' + rightAlias + '.' + quote(rightColumn._dbName);
-		}
-
-		sql += newDiscriminatorSql(context, rightTable, rightAlias);
-		var result = newParameterized(sql);
-		if (filter)
-			result = result.append(delimiter).append(filter);
-		return result;
-	}
-
-	newShallowJoinSqlCore = _new;
-	return newShallowJoinSqlCore;
-}
-
 var newShallowJoinSql;
 var hasRequiredNewShallowJoinSql;
 
@@ -9193,7 +9274,7 @@ function requireColumnAggregate () {
 		const columnName = quote(column._dbName);
 
 		return {
-			expression: (alias) => coalesce ? `COALESCE(${operator}(${tableAlias}.${columnName}), 0) as ${quote(alias)}` : `${operator}(${tableAlias}.${columnName}) as ${alias}`,
+			expression: (alias) => coalesce ? `COALESCE(${operator}(${tableAlias}.${columnName}), 0) as ${quote(alias)}` : `${operator}(${tableAlias}.${columnName}) as ${quote(alias)}`,
 
 			joins: newJoinArray(context, relations)
 		};

package/src/map.d.ts

@@ -664,23 +664,13 @@ type RelatedColumns<T> = RemoveNeverFlat<{
 	: never;
 }>;
 
-
 type AggregateColumns<T> = RemoveNeverFlat<{
-	[K in keyof T]:
-	T[K] extends ManyRelation
-	? AggregateColumns2<T[K]>
-	: T[K] extends RelatedTable
-	? AggregateColumns2<T[K]>
-	: never;
-}>;
-
-type AggregateColumns2<T> = RemoveNeverFlat<{
 	[K in keyof T]:
 	T[K] extends NumericColumnTypeDef<infer M> ? NumericColumnSymbol
 	: T[K] extends ManyRelation
-	? AggregateColumns2<T[K]>
+	? AggregateColumns<T[K]>
 	: T[K] extends RelatedTable
-	? AggregateColumns2<T[K]>
+	? AggregateColumns<T[K]>
 	: never;
 }>;
 

package/src/table/column/columnAggregate.js

@@ -0,0 +1,15 @@
+const getSessionSingleton = require('../getSessionSingleton');
+
+function columnAggregate(context, operator, column, table, coalesce = true) {
+	const quote = getSessionSingleton(context, 'quote');
+
+	const tableAlias = quote(table._rootAlias || table._dbName);
+	const columnName = quote(column._dbName);
+
+	return {
+		expression: (alias) => coalesce ? `COALESCE(${operator}(${tableAlias}.${columnName}), 0) as ${quote(alias)}` : `${operator}(${tableAlias}.${columnName}) as ${quote(alias)}`,
+		joins: ['']
+	};
+}
+
+module.exports = columnAggregate;

package/src/table/column/columnAggregateGroup.js

@@ -0,0 +1,35 @@
+var getSessionContext = require('../getSessionContext');
+var newJoinCore = require('../query/singleQuery/joinSql/newShallowJoinSqlCore');
+const getSessionSingleton = require('../getSessionSingleton');
+
+function columnAggregate(context, operator, column, table, coalesce = true) {
+	const quote = getSessionSingleton(context, 'quote');
+	const rdb = getSessionContext(context);
+	const outerAlias = 'y' + rdb.aggregateCount++;
+	const outerAliasQuoted = quote(outerAlias);
+	const alias = quote('x');
+	const foreignKeys = getForeignKeys(table);
+	const select = ` LEFT JOIN (SELECT ${foreignKeys},${operator}(${alias}.${quote(column._dbName)}) as amount`;
+	const onClause = createOnClause(context, table, outerAlias);
+	const from = ` FROM ${quote(table._dbName)} ${alias} GROUP BY ${foreignKeys}) ${outerAliasQuoted} ON (${onClause})`;
+	const join = select + from;
+
+	return {
+		expression: (alias) => coalesce ? `COALESCE(${outerAliasQuoted}.amount, 0) as ${quote(alias)}` : `${outerAliasQuoted}.amount as ${alias}`,
+		joins: [join]
+	};
+
+	function getForeignKeys(table) {
+		return table._primaryColumns.map(x => `${alias}.${quote(x._dbName)}`).join(',');
+	}
+}
+
+function createOnClause(context, table, rightAlias) {
+	let leftAlias = table._rootAlias || table._dbName;
+	const columns = table._primaryColumns;
+	return newJoinCore(context, table, columns, columns, leftAlias, rightAlias).sql();
+}
+
+
+
+module.exports = columnAggregate;

package/src/table/column/newColumn.js

@@ -7,6 +7,8 @@ const greaterThanOrEqual = require('./greaterThanOrEqual');
 const _in = require('./in');
 const _extractAlias = require('./extractAlias');
 const quote = require('../../table/quote');
+const aggregate = require('./columnAggregate');
+const aggregateGroup = require('./columnAggregateGroup');
 
 module.exports = function(table, name) {
 	var c = {};
@@ -76,6 +78,17 @@ module.exports = function(table, name) {
 	c.IN = c.in;
 	c.self = self;
 
+	c.groupSum = (context, ...rest) => aggregateGroup.apply(null, [context, 'sum', c, table, ...rest]);
+	c.groupAvg = (context, ...rest) => aggregateGroup.apply(null, [context, 'avg', c, table, ...rest]);
+	c.groupMin = (context, ...rest) => aggregateGroup.apply(null, [context, 'min', c, table, ...rest]);
+	c.groupMax = (context, ...rest) => aggregateGroup.apply(null, [context, 'max', c, table, ...rest]);
+	c.groupCount = (context, ...rest) => aggregateGroup.apply(null, [context, 'count', c, table, false, ...rest]);
+	c.sum = (context, ...rest) => aggregate.apply(null, [context, 'sum', c, table, ...rest]);
+	c.avg = (context, ...rest) => aggregate.apply(null, [context, 'avg', c, table, ...rest]);
+	c.min = (context, ...rest) => aggregate.apply(null, [context, 'min', c, table, ...rest]);
+	c.max = (context, ...rest) => aggregate.apply(null, [context, 'max', c, table, ...rest]);
+	c.count = (context, ...rest) => aggregate.apply(null, [context, 'count', c, table, false, ...rest]);
+
 	function self(context) {
 		const tableAlias = quote(context,table._rootAlias || table._dbName);
 		const columnName = quote(context, c._dbName);

package/src/table/relatedTable/columnAggregate.js

@@ -11,7 +11,7 @@ function columnAggregate(context, operator, column, relations, coalesce = true)
 	const columnName = quote(column._dbName);
 
 	return {
-		expression: (alias) => coalesce ? `COALESCE(${operator}(${tableAlias}.${columnName}), 0) as ${quote(alias)}` : `${operator}(${tableAlias}.${columnName}) as ${alias}`,
+		expression: (alias) => coalesce ? `COALESCE(${operator}(${tableAlias}.${columnName}), 0) as ${quote(alias)}` : `${operator}(${tableAlias}.${columnName}) as ${quote(alias)}`,
 
 		joins: newJoinArray(context, relations)
 	};