@prisma/orm-family-sql 0.16.0-dev.40 → 0.17.0-dev.1

package/dist/orm-client.mjs

@@ -1482,31 +1482,42 @@ function buildDistinctNonLeafChildRowsSelect(options) {
 * change which rows are aggregated.
 */
 function buildIncludeChildScalarSelect(contract, parentSource, include, scalar) {
-	const parentLocalRefs = resolveParentLocalRefs(parentSource, include, [include.localColumn]);
-	const parentLocalRef = parentLocalRefs[0];
-	assertDefined(parentLocalRef, `Include '${include.relationName}' has no parent-local column ref`);
+	const parentLocalRefs = resolveParentLocalRefs(parentSource, include, localColumnsForRowInclude(include));
 	const childSource = resolveChildTableSource(include, parentLocalRefs);
 	const childTableAlias = childSource.alias;
 	const childTableRef = childSource.tableRef;
 	const state = scalar.state;
-	const joinExpr = BinaryExpr.eq(ColumnRef.of(childTableRef, include.targetColumn), parentLocalRef);
 	const childWhere = buildStateWhere(contract, childTableRef, state, {
 		filterTableName: include.relatedTableName,
 		namespaceId: include.relatedNamespaceId
 	});
-	const whereExpr = childWhere ? AndExpr.of([joinExpr, childWhere]) : joinExpr;
+	let whereExpr;
+	let junctionJoins = [];
+	if (include.through !== void 0) {
+		const artifacts = buildManyToManyJunctionArtifacts(parentLocalRefs, childTableRef, include.through);
+		whereExpr = childWhere ? AndExpr.of([artifacts.whereExpr, childWhere]) : artifacts.whereExpr;
+		junctionJoins = [artifacts.junctionJoin];
+	} else {
+		const parentLocalRef = parentLocalRefs[0];
+		assertDefined(parentLocalRef, `Include '${include.relationName}' has no parent-local column ref`);
+		const joinExpr = BinaryExpr.eq(ColumnRef.of(childTableRef, include.targetColumn), parentLocalRef);
+		whereExpr = childWhere ? AndExpr.of([joinExpr, childWhere]) : joinExpr;
+	}
 	const remappedOrderBy = childTableAlias && state.orderBy ? state.orderBy.map((item) => item.rewrite(createTableRefRemapper(include.relatedTableName, childTableRef))) : state.orderBy;
 	const hasPagination = state.limit !== void 0 || state.offset !== void 0;
 	const hasDistinct = state.distinct !== void 0 && state.distinct.length > 0 || state.distinctOn !== void 0 && state.distinctOn.length > 0;
 	if (!(hasPagination || hasDistinct)) {
 		const aggregateExpr = buildIncludeAggregateExpr(scalar, childTableRef);
 		const jsonObjectExpr = JsonObjectExpr.fromEntries([JsonObjectExpr.entry("value", jsonEntryProjection(aggregateExpr, {}))]);
-		return SelectAst.from(tableSourceForContract(contract, include.relatedNamespaceId, include.relatedTableName, childTableAlias)).withProjection([ProjectionItem.of(include.relationName, jsonObjectExpr)]).withWhere(whereExpr);
+		let select = SelectAst.from(tableSourceForContract(contract, include.relatedNamespaceId, include.relatedTableName, childTableAlias)).withProjection([ProjectionItem.of(include.relationName, jsonObjectExpr)]).withWhere(whereExpr);
+		if (junctionJoins.length > 0) select = select.withJoins(junctionJoins);
+		return select;
 	}
 	const innerAlias = `${include.relationName}__scalar`;
 	const hiddenOrderProjection = state.distinct !== void 0 && state.distinct.length > 0 && remappedOrderBy !== void 0 && remappedOrderBy.length > 0 ? remappedOrderBy.map((item, index) => ProjectionItem.of(`${include.relationName}__order_${index}`, item.expr)) : [];
 	const innerProjection = [...scalar.column !== void 0 ? [ProjectionItem.of(scalar.column, ColumnRef.of(childTableRef, scalar.column))] : [ProjectionItem.of("__row", LiteralExpr.of(1))], ...hiddenOrderProjection];
 	let inner = SelectAst.from(tableSourceForContract(contract, include.relatedNamespaceId, include.relatedTableName, childTableAlias)).withProjection(innerProjection).withWhere(whereExpr);
+	if (junctionJoins.length > 0) inner = inner.withJoins(junctionJoins);
 	if (state.distinctOn !== void 0 && state.distinctOn.length > 0) {
 		inner = inner.withDistinctOn(state.distinctOn.map((column) => ColumnRef.of(childTableRef, column)));
 		if (remappedOrderBy !== void 0 && remappedOrderBy.length > 0) inner = inner.withOrderBy(remappedOrderBy);