orchid-orm 1.73.1 → 1.75.0

package/dist/index.mjs

@@ -209,7 +209,7 @@ function joinHasThrough(q, baseQuery, joiningQuery, throughRelation, sourceRelat
 function joinHasRelation(baseQuery, joiningQuery, primaryKeys, foreignKeys, len) {
 	const baseAs = getQueryAs(baseQuery);
 	const q = joiningQuery.clone();
-	setQueryObjectValueImmutable(q, "joinedShapes", baseAs, baseQuery.q.shape);
+	setQueryObjectValueImmutable(q, "joinedShapes", baseAs, baseQuery.q.selectShape);
 	for (let i = 0; i < len; i++) pushQueryOnForOuter(q, baseQuery, joiningQuery, foreignKeys[i], `${baseAs}.${primaryKeys[i]}`);
 	return q;
 }
@@ -410,9 +410,10 @@ var BelongsToVirtualColumn = class extends VirtualColumn {
 		this.nestedUpdate(queryForUpdate, set, data);
 	}
 };
-const getBelongsToRequired = (tableConfig, relation) => {
+const getBelongsToRequired = (tableConfig, relatedTableConfig, relation) => {
 	const { required } = relation.options;
 	if (typeof required === "boolean") return required;
+	if (relatedTableConfig.softDelete) return false;
 	return relation.options.columns.every((key) => {
 		return !tableConfig.columns.shape[key].data.isNullable;
 	});
@@ -437,7 +438,7 @@ const makeBelongsToMethod = (tableConfig, table, relation, relationName, query)
 	const join = (baseQuery, joiningQuery, primaryKeys, foreignKeys) => {
 		const baseAs = getQueryAs(baseQuery);
 		const q = joiningQuery.clone();
-		setQueryObjectValueImmutable(q, "joinedShapes", baseAs, baseQuery.q.shape);
+		setQueryObjectValueImmutable(q, "joinedShapes", baseAs, baseQuery.q.selectShape);
 		for (let i = 0; i < len; i++) pushQueryOnForOuter(q, baseQuery, joiningQuery, primaryKeys[i], `${baseAs}.${foreignKeys[i]}`);
 		return q;
 	};
@@ -1129,7 +1130,7 @@ const makeHasAndBelongsToManyMethod = (tableConfig, table, qb, relation, relatio
 		const foreignAs = getQueryAs(joiningQuery);
 		return joinQuery(baseQuery, getQueryAs(baseQuery), foreignAs, {
 			...baseQuery.q.joinedShapes,
-			[foreignAs]: joiningQuery.q.shape
+			[foreignAs]: joiningQuery.q.selectShape
 		});
 	};
 	return {
@@ -1147,7 +1148,7 @@ const makeHasAndBelongsToManyMethod = (tableConfig, table, qb, relation, relatio
 		virtualColumn: new HasAndBelongsToManyVirtualColumn(subQuery, internalSchemaConfig, relationName, state),
 		joinQuery: joinQueryChainHOF(getPrimaryKeys(query), reverseJoin, (joiningQuery, baseQuery) => joinQuery(joiningQuery, getQueryAs(baseQuery), getQueryAs(joiningQuery), {
 			...joiningQuery.q.joinedShapes,
-			[baseQuery.q.as || baseQuery.table]: baseQuery.q.shape
+			[baseQuery.q.as || baseQuery.table]: baseQuery.q.selectShape
 		})),
 		reverseJoin,
 		modifyRelatedQuery(relationQuery) {
@@ -1359,6 +1360,7 @@ const applyRelations = (qb, tables, result, schema) => {
 			const data = {
 				relationName,
 				relation,
+				otherTable: otherTable[1],
 				dbTable,
 				otherDbTable
 			};
@@ -1402,7 +1404,7 @@ const delayRelation = (delayedRelations, table, relationName, data) => {
 	if (tableRelations[relationName]) tableRelations[relationName].push(data);
 	else tableRelations[relationName] = [data];
 };
-const applyRelation = (table, qb, { relationName, relation, dbTable, otherDbTable }, delayedRelations, schema) => {
+const applyRelation = (table, qb, { relationName, relation, otherTable, dbTable, otherDbTable }, delayedRelations, schema) => {
 	const baseQuery = Object.create(otherDbTable);
 	baseQuery.baseQuery = baseQuery;
 	const query = baseQuery.as(relationName);
@@ -1415,21 +1417,12 @@ const applyRelation = (table, qb, { relationName, relation, dbTable, otherDbTabl
 	else if (type === "hasAndBelongsToMany") data = makeHasAndBelongsToManyMethod(table, dbTable, qb, relation, relationName, query, schema);
 	else throw new Error(`Unknown relation type ${type}`);
 	if (data.returns === "one") {
-		if (type === "belongsTo" ? getBelongsToRequired(table, relation) : relation.options.required) _queryTake(query);
+		if (type === "belongsTo" ? getBelongsToRequired(table, otherTable, relation) : relation.options.required) _queryTake(query);
 		else _queryTakeOptional(query);
 		query.q.returnsOne = true;
 	}
-	if (data.virtualColumn) dbTable.shape[relationName] = dbTable.q.shape[relationName] = data.virtualColumn;
+	if (data.virtualColumn) dbTable.shape[relationName] = dbTable.q.selectShape[relationName] = data.virtualColumn;
 	baseQuery.joinQuery = data.joinQuery;
-	const { join: originalJoin } = baseQuery;
-	baseQuery.join = function(...args) {
-		if (args.length) return originalJoin.apply(this, args);
-		else {
-			const q = this.clone();
-			q.q.innerJoinLateral = true;
-			return q;
-		}
-	};
 	dbTable.relations[relationName] = {
 		table: otherDbTable,
 		query,