orange-orm 5.0.0-beta.9 → 5.0.0

package/dist/index.browser.mjs

@@ -10102,7 +10102,7 @@ function requireNewOneLeg () {
 		c.expand = relation.expand;
 
 		c.accept = function(visitor) {
-			visitor.visitOne(c);
+			return visitor.visitOne(c);
 		};
 
 		return c;
@@ -10994,8 +10994,6 @@ function requireGetManyDto$1 () {
 		}
 
 		let span = spanFromParent || strategyToSpan(table, strategy);
-		if (!spanFromParent)
-			assignAliases(span, table._dbName);
 		let alias = table._dbName;
 
 		const query = newQuery(context, table, filter, span, alias);
@@ -11003,13 +11001,6 @@ function requireGetManyDto$1 () {
 		return decode(context, strategy, span, await res[0], undefined, updateParent);
 	}
 
-	function assignAliases(span, alias) {
-		span._alias = alias;
-		span.legs.forEach((leg) => {
-			assignAliases(leg.span, alias + leg.name);
-		});
-	}
-
 	function newCreateRow(span) {
 		let columnsMap = span.columns;
 		const columns = span.table._columns.filter(column => !columnsMap || columnsMap.get(column));
@@ -11095,8 +11086,6 @@ function requireGetManyDto$1 () {
 		const fkIds = new Array(rows.length);
 		const getIds = createGetIds();
 		const aggregateKeys = Object.keys(span.aggregates);
-		const aliasPrefix = span._alias ? 's' + span._alias : null;
-		const useAlias = aliasPrefix && rowsLength > 0 && Object.prototype.hasOwnProperty.call(rows[0], aliasPrefix + '0');
 
 		const outRows = new Array(rowsLength);
 		const createRow = newCreateRow(span);
@@ -11106,9 +11095,8 @@ function requireGetManyDto$1 () {
 			let outRow = createRow();
 			let pkWithNullCount = 0;
 			for (let j = 0; j < columnsLength; j++) {
-				const key = useAlias ? (aliasPrefix + j) : keys[j];
 				if (j < primaryColumnsLength) {
-					if (row[key] === null)
+					if (row[keys[j]] === null)
 						pkWithNullCount++;
 					if (pkWithNullCount === primaryColumnsLength) {
 						outRow = null;
@@ -11116,14 +11104,13 @@ function requireGetManyDto$1 () {
 					}
 				}
 				const column = columns[j];
-				outRow[column.alias] = column.decode(context, row[key]);
+				outRow[column.alias] = column.decode(context, row[keys[j]]);
 			}
 
 			for (let j = 0; j < aggregateKeys.length; j++) {
 				const key = aggregateKeys[j];
 				const parse = span.aggregates[key].column?.decode || ((context, arg) => Number.parseFloat(arg));
-				const value = useAlias ? row[key] : row[keys[j + columnsLength]];
-				outRow[key] = parse(context, value);
+				outRow[key] = parse(context, row[keys[j + columnsLength]]);
 			}
 
 			outRows[i] = outRow;
@@ -11137,8 +11124,7 @@ function requireGetManyDto$1 () {
 		span._rowsMap = rowsMap;
 		span._ids = fkIds;
 
-		if (!useAlias)
-			keys.splice(0, columnsLength + aggregateKeys.length);
+		keys.splice(0, columnsLength + aggregateKeys.length);
 		if (span.legs.toArray().length === 0)
 			return outRows;
 

package/dist/index.mjs

@@ -10103,7 +10103,7 @@ function requireNewOneLeg () {
 		c.expand = relation.expand;
 
 		c.accept = function(visitor) {
-			visitor.visitOne(c);
+			return visitor.visitOne(c);
 		};
 
 		return c;
@@ -10995,8 +10995,6 @@ function requireGetManyDto$1 () {
 		}
 
 		let span = spanFromParent || strategyToSpan(table, strategy);
-		if (!spanFromParent)
-			assignAliases(span, table._dbName);
 		let alias = table._dbName;
 
 		const query = newQuery(context, table, filter, span, alias);
@@ -11004,13 +11002,6 @@ function requireGetManyDto$1 () {
 		return decode(context, strategy, span, await res[0], undefined, updateParent);
 	}
 
-	function assignAliases(span, alias) {
-		span._alias = alias;
-		span.legs.forEach((leg) => {
-			assignAliases(leg.span, alias + leg.name);
-		});
-	}
-
 	function newCreateRow(span) {
 		let columnsMap = span.columns;
 		const columns = span.table._columns.filter(column => !columnsMap || columnsMap.get(column));
@@ -11096,8 +11087,6 @@ function requireGetManyDto$1 () {
 		const fkIds = new Array(rows.length);
 		const getIds = createGetIds();
 		const aggregateKeys = Object.keys(span.aggregates);
-		const aliasPrefix = span._alias ? 's' + span._alias : null;
-		const useAlias = aliasPrefix && rowsLength > 0 && Object.prototype.hasOwnProperty.call(rows[0], aliasPrefix + '0');
 
 		const outRows = new Array(rowsLength);
 		const createRow = newCreateRow(span);
@@ -11107,9 +11096,8 @@ function requireGetManyDto$1 () {
 			let outRow = createRow();
 			let pkWithNullCount = 0;
 			for (let j = 0; j < columnsLength; j++) {
-				const key = useAlias ? (aliasPrefix + j) : keys[j];
 				if (j < primaryColumnsLength) {
-					if (row[key] === null)
+					if (row[keys[j]] === null)
 						pkWithNullCount++;
 					if (pkWithNullCount === primaryColumnsLength) {
 						outRow = null;
@@ -11117,14 +11105,13 @@ function requireGetManyDto$1 () {
 					}
 				}
 				const column = columns[j];
-				outRow[column.alias] = column.decode(context, row[key]);
+				outRow[column.alias] = column.decode(context, row[keys[j]]);
 			}
 
 			for (let j = 0; j < aggregateKeys.length; j++) {
 				const key = aggregateKeys[j];
 				const parse = span.aggregates[key].column?.decode || ((context, arg) => Number.parseFloat(arg));
-				const value = useAlias ? row[key] : row[keys[j + columnsLength]];
-				outRow[key] = parse(context, value);
+				outRow[key] = parse(context, row[keys[j + columnsLength]]);
 			}
 
 			outRows[i] = outRow;
@@ -11138,8 +11125,7 @@ function requireGetManyDto$1 () {
 		span._rowsMap = rowsMap;
 		span._ids = fkIds;
 
-		if (!useAlias)
-			keys.splice(0, columnsLength + aggregateKeys.length);
+		keys.splice(0, columnsLength + aggregateKeys.length);
 		if (span.legs.toArray().length === 0)
 			return outRows;
 

package/docs/changelog.md

@@ -1,9 +1,12 @@
 ## Changelog
 __5.0.0__  
 Breaking: `getAll` was removed. Use `getMany` instead (now with the same signature as the removed `getAll`).  
+Breaking: `getOne` no longer accepts a filter as the first argument. Move the filter to the strategy `where` clause (same pattern as `getMany`).  
 ExpressJS: Before/after hooks to facilitate row-level security [#135](https://github.com/alfateam/orange-orm/issues/135)  
 SQLite: Support for invoking user-defined functions [#145](https://github.com/alfateam/orange-orm/issues/145)  
 Support for enums [#100](https://github.com/alfateam/orange-orm/issues/100)  
+__4.9.2__  
+Bugfix: getManyDto/getMany with parallel hasOne + discriminator could return null columns. [#147](https://github.com/alfateam/orange-orm/issues/147)  
 __4.9.1__  
 Fix: Avoid double-quoting aliases in discriminator join SQL [#144](https://github.com/alfateam/orange-orm/issues/144)    
 __4.9.0__  

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "orange-orm",
-    "version": "5.0.0-beta.9",
+    "version": "5.0.0",
     "publishConfig": {
         "access": "public"
     },

package/src/getManyDto.js

@@ -13,8 +13,6 @@ async function getManyDto(context, table, filter, strategy, spanFromParent, upda
 	}
 
 	let span = spanFromParent || strategyToSpan(table, strategy);
-	if (!spanFromParent)
-		assignAliases(span, table._dbName);
 	let alias = table._dbName;
 
 	const query = newQuery(context, table, filter, span, alias);
@@ -22,13 +20,6 @@ async function getManyDto(context, table, filter, strategy, spanFromParent, upda
 	return decode(context, strategy, span, await res[0], undefined, updateParent);
 }
 
-function assignAliases(span, alias) {
-	span._alias = alias;
-	span.legs.forEach((leg) => {
-		assignAliases(leg.span, alias + leg.name);
-	});
-}
-
 function newCreateRow(span) {
 	let columnsMap = span.columns;
 	const columns = span.table._columns.filter(column => !columnsMap || columnsMap.get(column));
@@ -114,8 +105,6 @@ async function decode(context, strategy, span, rows, keys = rows.length > 0 ? Ob
 	const fkIds = new Array(rows.length);
 	const getIds = createGetIds();
 	const aggregateKeys = Object.keys(span.aggregates);
-	const aliasPrefix = span._alias ? 's' + span._alias : null;
-	const useAlias = aliasPrefix && rowsLength > 0 && Object.prototype.hasOwnProperty.call(rows[0], aliasPrefix + '0');
 
 	const outRows = new Array(rowsLength);
 	const createRow = newCreateRow(span);
@@ -125,9 +114,8 @@ async function decode(context, strategy, span, rows, keys = rows.length > 0 ? Ob
 		let outRow = createRow();
 		let pkWithNullCount = 0;
 		for (let j = 0; j < columnsLength; j++) {
-			const key = useAlias ? (aliasPrefix + j) : keys[j];
 			if (j < primaryColumnsLength) {
-				if (row[key] === null)
+				if (row[keys[j]] === null)
 					pkWithNullCount++;
 				if (pkWithNullCount === primaryColumnsLength) {
 					outRow = null;
@@ -135,14 +123,13 @@ async function decode(context, strategy, span, rows, keys = rows.length > 0 ? Ob
 				}
 			}
 			const column = columns[j];
-			outRow[column.alias] = column.decode(context, row[key]);
+			outRow[column.alias] = column.decode(context, row[keys[j]]);
 		}
 
 		for (let j = 0; j < aggregateKeys.length; j++) {
 			const key = aggregateKeys[j];
 			const parse = span.aggregates[key].column?.decode || ((context, arg) => Number.parseFloat(arg));
-			const value = useAlias ? row[key] : row[keys[j + columnsLength]];
-			outRow[key] = parse(context, value);
+			outRow[key] = parse(context, row[keys[j + columnsLength]]);
 		}
 
 		outRows[i] = outRow;
@@ -156,8 +143,7 @@ async function decode(context, strategy, span, rows, keys = rows.length > 0 ? Ob
 	span._rowsMap = rowsMap;
 	span._ids = fkIds;
 
-	if (!useAlias)
-		keys.splice(0, columnsLength + aggregateKeys.length);
+	keys.splice(0, columnsLength + aggregateKeys.length);
 	if (span.legs.toArray().length === 0)
 		return outRows;
 

package/src/table/relation/newOneLeg.js

@@ -16,7 +16,7 @@ function newLeg(relation) {
 	c.expand = relation.expand;
 
 	c.accept = function(visitor) {
-		visitor.visitOne(c);
+		return visitor.visitOne(c);
 	};
 
 	return c;