orange-orm 4.1.0 → 4.1.2

package/docs/changelog.md

@@ -1,6 +1,10 @@
 ## Changelog
+__4.1.2__  
+Bugfix with composite primary key with hasMany relation. [#106](https://github.com/alfateam/orange-orm/issues/106)  
+__4.1.1__  
+Some fixes regarding NotNull mappings. [#104](https://github.com/alfateam/orange-orm/issues/91)    
 __4.1.0__  
-Escape table and column names.  [#91](https://github.com/alfateam/orange-orm/issues/91)  [#92](https://github.com/alfateam/orange-orm/issues/92)  
+Escape table and column names. [#91](https://github.com/alfateam/orange-orm/issues/91)  [#92](https://github.com/alfateam/orange-orm/issues/92)  
 NotNullable relations [#104](https://github.com/alfateam/orange-orm/issues/104)  
 __4.0.1__  
 Inhouse definitions of ajv to avoid trouble with nestjs.  

package/package.json

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

package/src/getManyDto.js

@@ -1,9 +1,8 @@
+const emptyFilter = require('./emptyFilter');
 const newQuery = require('./getManyDto/newQuery');
 const negotiateRawSqlFilter = require('./table/column/negotiateRawSqlFilter');
 const strategyToSpan = require('./table/strategyToSpan');
 const executeQueries = require('./table/executeQueries');
-const newPrimaryKeyFilter = require('./table/newPrimaryKeyFilter');
-const newForeignKeyFilter = require('./table/relation/newForeignKeyFilter');
 
 async function getManyDto(table, filter, strategy, spanFromParent) {
 	filter = negotiateRawSqlFilter(filter, table);
@@ -151,7 +150,7 @@ async function decode(strategy, span, rows, keys = rows.length > 0 ? Object.keys
 	function createGetIds() {
 		const primaryColumns = table._primaryColumns;
 		const length = primaryColumns.length;
-		if (length > 1) {
+		if (length === 1) {
 			const alias = table._primaryColumns[0].alias;
 			return (row) => row[alias];
 		}
@@ -186,7 +185,7 @@ async function decodeRelations(strategy, span, rawRows, resultRows, keys) {
 		const name = leg.name;
 		const table = span.table;
 		const relation = table._relations[name];
-		const filter = createOneFilter(relation, span._ids, resultRows, table);
+		const filter = createOneFilter(relation, span._ids);
 		const rowsMap = span._rowsMap;
 		const p = getManyDto(relation.childTable, filter, strategy[name], leg.span).then(subRows => {
 			for (let i = 0; i < subRows.length; i++) {
@@ -207,21 +206,26 @@ async function decodeRelations(strategy, span, rawRows, resultRows, keys) {
 	await Promise.all(promises);
 }
 
-function createOneFilter(relation, ids, parentRows, table) {
-	let parentTable = relation.joinRelation.childTable;
+function createOneFilter(relation, ids) {
+	const columns = relation.joinRelation.columns;
 
-	if (parentTable._primaryColumns.length === 1)
-		return relation.joinRelation.columns[0].in(ids);
+	if (columns.length === 1)
+		return columns[0].in(ids);
 
 	else
 		return createCompositeFilter();
 
 	function createCompositeFilter() {
-		var filter = newPrimaryKeyFilter.apply(null, parentRows[0]);
-
-		for (var i = 1; i < ids.length; i++) {
-			const args = [table].concat(parentRows[i]);
-			filter = filter.or(newForeignKeyFilter.apply(null, args));
+		let filter = emptyFilter;
+		for(let id of ids) {
+			let nextFilter;
+			for (let i = 0; i < columns.length; i++) {
+				if (nextFilter)
+					nextFilter = nextFilter.and(columns[i].eq(id[i]));
+				else
+					nextFilter = columns[i].eq(id[i]);
+			}
+			filter = filter.or(nextFilter);
 		}
 		return filter;
 	}

package/src/map.d.ts

@@ -837,7 +837,7 @@ type ReferenceMapperHelper<TFrom, TTo, TPrimaryCount> =
 			column4: C4,
 			column5: C5,
 			column6: C6
-		): MappedTableDef<TTo> & RelatedTable & NegotiateNotNullColumn<C1,TFrom>;
+		): MappedTableDef<TTo> & RelatedTable & NotNullRelationHelper<MappedTableDef<TTo> & RelatedTable>;
 	}
 	: 5 extends TPrimaryCount
 	? {
@@ -847,7 +847,7 @@ type ReferenceMapperHelper<TFrom, TTo, TPrimaryCount> =
 			column3: C3,
 			column4: C4,
 			column5: C5
-		): MappedTableDef<TTo> & RelatedTable & NegotiateNotNullColumn<C1,TFrom>;
+		): MappedTableDef<TTo> & RelatedTable & NotNullRelationHelper<MappedTableDef<TTo> & RelatedTable>;
 	}
 	: 4 extends TPrimaryCount
 	? {
@@ -856,7 +856,7 @@ type ReferenceMapperHelper<TFrom, TTo, TPrimaryCount> =
 			column2: C2,
 			column3: C3,
 			column4: C4
-		): MappedTableDef<TTo> & RelatedTable & NegotiateNotNullColumn<C1,TFrom>;
+		): MappedTableDef<TTo> & RelatedTable & NotNullRelationHelper<MappedTableDef<TTo> & RelatedTable>;
 	}
 	: 3 extends TPrimaryCount
 	? {
@@ -864,24 +864,23 @@ type ReferenceMapperHelper<TFrom, TTo, TPrimaryCount> =
 			column: C1,
 			column2: C2,
 			column3: C3
-		): MappedTableDef<TTo> & RelatedTable & NegotiateNotNullColumn<C1,TFrom>;
+		): MappedTableDef<TTo> & RelatedTable & NotNullRelationHelper<MappedTableDef<TTo> & RelatedTable>;
 	}
 	: 2 extends TPrimaryCount
 	? {
 		by<C1 extends keyof KeyCandidates1<TFrom, TTo>, C2 extends keyof KeyCandidates2<TFrom, TTo>>(
 			column: C1,
 			column2: C2
-		): MappedTableDef<TTo> & RelatedTable & NegotiateNotNullColumn<C1,TFrom>;
+		): MappedTableDef<TTo> & RelatedTable & NotNullRelationHelper<MappedTableDef<TTo> & RelatedTable>;
 	}
 	: 1 extends TPrimaryCount
 	? {
 		by<C1 extends keyof KeyCandidates1<TFrom, TTo>>(
 			column: C1
-		): MappedTableDef<TTo> & RelatedTable & NegotiateNotNullColumn<C1,TFrom>;
+		): MappedTableDef<TTo> & RelatedTable & NotNullRelationHelper<MappedTableDef<TTo> & RelatedTable>;
 	}
 	: {};
 
-type NegotiateNotNullColumn<C, TFrom> = C extends keyof TFrom ? TFrom[C] extends NotNullExceptInsert ? NotNullExceptInsert : TFrom[C] extends NotNull ? NotNull : {}: {};
 
 type HasMapperHelper<
 	TFrom,
@@ -897,7 +896,7 @@ type HasMapperHelper<
 			column4: keyof KeyCandidates4<TTo, TFrom>,
 			column5: keyof KeyCandidates5<TTo, TFrom>,
 			column6: keyof KeyCandidates6<TTo, TFrom>
-		): MappedTableDef<TTo> & RelatedTable & TExtra & HasMapperHelper2<MappedTableDef<TTo> & RelatedTable & TExtra>;
+		): MappedTableDef<TTo> & RelatedTable & TExtra & NotNullRelationHelper<MappedTableDef<TTo> & RelatedTable & TExtra>;
 	}
 	: 5 extends TPrimaryCount
 	? {
@@ -907,7 +906,7 @@ type HasMapperHelper<
 			column3: keyof KeyCandidates3<TTo, TFrom>,
 			column4: keyof KeyCandidates4<TTo, TFrom>,
 			column5: keyof KeyCandidates5<TTo, TFrom>
-		): MappedTableDef<TTo> & RelatedTable & TExtra & HasMapperHelper2<MappedTableDef<TTo> & RelatedTable & TExtra>;
+		): MappedTableDef<TTo> & RelatedTable & TExtra & NotNullRelationHelper<MappedTableDef<TTo> & RelatedTable & TExtra>;
 	}
 	: 4 extends TPrimaryCount
 	? {
@@ -916,7 +915,7 @@ type HasMapperHelper<
 			column2: keyof KeyCandidates2<TTo, TFrom>,
 			column3: keyof KeyCandidates3<TTo, TFrom>,
 			column4: keyof KeyCandidates4<TTo, TFrom>
-		): MappedTableDef<TTo> & RelatedTable & TExtra & HasMapperHelper2<MappedTableDef<TTo> & RelatedTable & TExtra>;
+		): MappedTableDef<TTo> & RelatedTable & TExtra & NotNullRelationHelper<MappedTableDef<TTo> & RelatedTable & TExtra>;
 	}
 	: 3 extends TPrimaryCount
 	? {
@@ -924,26 +923,25 @@ type HasMapperHelper<
 			column: keyof KeyCandidates1<TTo, TFrom>,
 			column2: keyof KeyCandidates2<TTo, TFrom>,
 			column3: keyof KeyCandidates3<TTo, TFrom>
-		): MappedTableDef<TTo> & RelatedTable & TExtra & HasMapperHelper2<MappedTableDef<TTo> & RelatedTable & TExtra>;
+		): MappedTableDef<TTo> & RelatedTable & TExtra & NotNullRelationHelper<MappedTableDef<TTo> & RelatedTable & TExtra>;
 	}
 	: 2 extends TPrimaryCount
 	? {
 		by(
 			column: keyof KeyCandidates1<TTo, TFrom>,
 			column2: keyof KeyCandidates2<TTo, TFrom>
-		): MappedTableDef<TTo> & RelatedTable & TExtra & HasMapperHelper2<MappedTableDef<TTo> & RelatedTable & TExtra>;
+		): MappedTableDef<TTo> & RelatedTable & TExtra & NotNullRelationHelper<MappedTableDef<TTo> & RelatedTable & TExtra>;
 	}
 	: 1 extends TPrimaryCount
 	? {
 		by(
 			column: keyof KeyCandidates1<TTo, TFrom>
-		): MappedTableDef<TTo> & RelatedTable & TExtra & HasMapperHelper2<MappedTableDef<TTo> & RelatedTable & TExtra>;
+		): MappedTableDef<TTo> & RelatedTable & TExtra & NotNullRelationHelper<MappedTableDef<TTo> & RelatedTable & TExtra>;
 	}
 	: {};
 
-type HasMapperHelper2<T> = {
+type NotNullRelationHelper<T> = {
 	notNull(): T & NotNull;
-	notNullExceptInsert(): T & NotNull & NotNullExceptInsert;
 }
 
 type ColumnMapperInit<T> = {
@@ -1207,7 +1205,7 @@ type StrategyToUpdateRowData<T> = Omit<{
 	: T[K] extends ManyRelation
 	? StrategyToInsertRowData<T[K]>[]
 	: StrategyToInsertRowData<T[K]>;
-	}, 'formulaDiscriminators' | 'columnDiscriminators' | 'map' | ' isManyRelation' | ' relatedTable' | ' isOneRelation'>
+	}, 'formulaDiscriminators' | 'columnDiscriminators' | ' notNull' | ' notNullExceptInsert' | 'map' | ' isManyRelation' | ' relatedTable' | ' isOneRelation'>
 	;
 
 type StrategyToInsertRowData<T> = Omit<{
@@ -1258,7 +1256,7 @@ type StrategyToInsertRowData<T> = Omit<{
 		: T[K] extends ManyRelation
 		? StrategyToInsertRowData<T[K]>[]
 		: StrategyToInsertRowData<T[K]>;
-	}, 'formulaDiscriminators' | 'columnDiscriminators' | 'map' | ' isManyRelation' | ' relatedTable' | ' isOneRelation'>
+	}, 'formulaDiscriminators' | 'columnDiscriminators' | ' notNull' | ' notNullExceptInsert' | 'map' | ' isManyRelation' | ' relatedTable' | ' isOneRelation'>
 	;
 
 type NegotiateDefaultStrategy<T> = T extends ColumnSymbols ? T : never;

package/src/table/hasOne.js

@@ -23,6 +23,7 @@ function newOne(joinRelation) {
 	};
 
 	c.notNull = function() {
+
 		return c;
 	};
 

package/src/table/join.js

@@ -36,6 +36,15 @@ function newJoin(parentTable, childTable) {
 
 		return relation;
 	};
+
+	c.notNullExceptInsert = function() {
+		return c;
+	};
+
+	c.notNull = function() {
+		return c;
+	};
+
 	return c;
 }
 

package/src/tedious/outputInsertedSql.js

@@ -2,7 +2,7 @@ function outputInsertedSql(table) {
 	let separator = '';
 	let result = 'OUTPUT ';
 	for (let i = 0; i < table._columns.length; i++) {
-		result += separator + 'INSERTED.' + table._columns[i]._dbName;
+		result += separator + 'INSERTED.[' + table._columns[i]._dbName + ']';
 		separator = ',';
 	}
 	return result;