@vantreeseba/drizzle-graphql 15.1.2 → 15.1.4

package/dist/index.cjs

@@ -1802,6 +1802,11 @@ const warnUnresolvedJoin = (relEntry, tableName, relationName, omitted) => {
 * Returns the JS property name of the local column on the parent table and the
 * Column object for the foreign column on the target table, or undefined if the
 * relation internals are not accessible.
+*
+* Only the relation's *first* column pair is reported. A relation joined on several columns
+* (`from: [a, b], to: [x, y]`) is not described fully by it, so anything that reads rows by
+* this pair alone mixes up parents that share the first column. Read paths use
+* {@link extractRelationJoinColumnPairs}, which returns every pair.
 */
 const extractRelationJoinColumns = (relEntry, parentTable, targetTable) => {
 	const rel = relEntry.relation ?? relEntry;
@@ -1820,6 +1825,48 @@ const extractRelationJoinColumns = (relEntry, parentTable, targetTable) => {
 	};
 };
 /**
+* Every column pair the relation joins on, in declaration order — one for an ordinary relation,
+* several for one declared `from: [a, b], to: [x, y]`. A row of the target belongs to a parent
+* only when *all* pairs match, so a read path has to correlate on every one of them.
+*
+* `undefined` when the relation's columns cannot be matched to the two tables, or when its two
+* sides list a different number of columns.
+*/
+const extractRelationJoinColumnPairs = (relEntry, parentTable, targetTable) => {
+	const rel = relEntry.relation ?? relEntry;
+	const sourceCols = relationColumns(rel, "source");
+	const targetCols = relationColumns(rel, "target");
+	if (!sourceCols?.length || sourceCols.length !== targetCols?.length) return;
+	const parentEntries = Object.entries((0, drizzle_orm.getColumns)(parentTable));
+	const targetEntries = Object.entries((0, drizzle_orm.getColumns)(targetTable));
+	const pairs = [];
+	for (let i = 0; i < sourceCols.length; i++) {
+		const localCol = sourceCols[i];
+		const foreignCol = targetCols[i];
+		const localColPropName = parentEntries.find(([, c]) => c === localCol)?.[0];
+		const foreignColPropName = targetEntries.find(([, c]) => c === foreignCol)?.[0];
+		if (!localColPropName || !foreignColPropName) return;
+		pairs.push({
+			localColPropName,
+			localCol,
+			foreignColPropName,
+			foreignCol
+		});
+	}
+	return pairs;
+};
+/**
+* A string identifying one combination of join-column values, for grouping a batch's rows by
+* parent. Values are compared by their string form, as a single-column key always has been.
+*/
+const joinKeyOf = (values) => values.length === 1 ? String(values[0]) : JSON.stringify(values.map((value) => String(value)));
+/**
+* The rows whose `cols` hold one of `keys`: `col IN (…)` for a single join column, and an `OR`
+* of per-parent equalities for several — `(a = 1 AND b = 1) OR (a = 1 AND b = 2)` — which
+* every dialect accepts, unlike a row-value `IN` list.
+*/
+const parentKeyCondition = (cols, keys) => cols.length === 1 ? (0, drizzle_orm.inArray)(cols[0], keys.map((key) => key[0])) : (0, drizzle_orm.or)(...keys.map((key) => (0, drizzle_orm.and)(...cols.map((col, i) => (0, drizzle_orm.eq)(col, key[i])))));
+/**
 * The junction table and its two columns for a `.through()` (many-to-many) relation:
 * `sourceCol` holds the parent's key, `targetCol` the target's. `undefined` for a relation
 * with no junction; `null` for one whose junction cannot be used here — more than one column
@@ -1850,16 +1897,18 @@ const extractJunctionColumns = (relEntry) => {
 *
 * A reversed filter (inherited from the relation on the other side) is written against the
 * parent table, so it is applied as "the row's parent key belongs to a parent that passes it".
-* `parentKeyCol` is the parent's join column and `groupCol` the column in the query that holds
-* the parent key for each row — the target's foreign key, or the junction's source column.
+* `parentKeyCols` are the parent's join columns and `groupCols` the columns in the query that
+* hold the parent key for each row — the target's foreign key, or the junction's source
+* column — in the same order. A key of several columns is compared as a row value.
 */
-const relationOwnCondition = (relEntry, parentTable, targetTable, parentKeyCol, groupCol) => {
+const relationOwnCondition = (relEntry, parentTable, targetTable, parentKeyCols, groupCols) => {
 	const rel = relEntry.relation ?? relEntry;
 	const ownWhere = relationOwnWhere(rel);
 	if (!ownWhere) return;
 	if (!isRelationFilterReversed(rel)) return (0, drizzle_orm.relationsFilterToSQL)(targetTable, ownWhere);
 	const parentFilter = (0, drizzle_orm.relationsFilterToSQL)(parentTable, ownWhere);
-	return drizzle_orm.sql`${groupCol} in (select ${parentKeyCol} from ${parentTable} where ${parentFilter})`;
+	if (groupCols.length === 1) return drizzle_orm.sql`${groupCols[0]} in (select ${parentKeyCols[0]} from ${parentTable} where ${parentFilter})`;
+	return drizzle_orm.sql`(${drizzle_orm.sql.join([...groupCols], drizzle_orm.sql`, `)}) in (select ${drizzle_orm.sql.join([...parentKeyCols], drizzle_orm.sql`, `)} from ${parentTable} where ${parentFilter})`;
 };
 /**
 * Whether a to-one relation can back a relation orderBy hop. `.through()` (junction)
@@ -2007,6 +2056,13 @@ const extractUniqueKeyFilter = (table, tableName, fieldName, members, value) =>
 */
 const narrowedCtxCache = /* @__PURE__ */ new WeakMap();
 /**
+* One alias counter per build, shared by every table's narrowed context. A statement can
+* combine subqueries compiled from different contexts — a relation filter on one table whose
+* target's scope is a filter object reaching through another relation, say — and nested
+* subqueries that drew the same alias from two separate counters would shadow each other.
+*/
+const aliasCounters = /* @__PURE__ */ new WeakMap();
+/**
 * Narrows the build-scoped relation filter context to the table a resolver is filtering.
 *
 * Cached rather than rebuilt: the base carries the build's whole `tables` and `relationMap`,
@@ -2020,7 +2076,7 @@ const narrowedCtxCache = /* @__PURE__ */ new WeakMap();
 * aliases only ever have to be unique *within* one statement, which a number that never
 * repeats gives more surely than one that restarts.
 */
-const relationFilterCtx = (base, tableKey) => {
+const relationFilterCtx = (base, tableKey, scope) => {
 	if (!base) return;
 	let byTable = narrowedCtxCache.get(base);
 	if (!byTable) {
@@ -2029,13 +2085,33 @@ const relationFilterCtx = (base, tableKey) => {
 	}
 	let ctx = byTable.get(tableKey);
 	if (!ctx) {
+		let aliases = aliasCounters.get(base);
+		if (!aliases) {
+			aliases = { n: 0 };
+			aliasCounters.set(base, aliases);
+		}
 		ctx = {
 			...base,
-			tableKey
+			tableKey,
+			aliases
 		};
 		byTable.set(tableKey, ctx);
 	}
-	return ctx;
+	return scope ? {
+		...ctx,
+		scope
+	} : ctx;
+};
+/**
+* The row-policy predicate a subquery over a relation's target applies: the target's scope
+* and soft-delete condition, in the `deleted` mode the relation field defaults to — so a
+* relation filter or a relation ordering sees exactly the rows the relation field returns.
+*/
+const relationTargetPolicy = (ctx, relation, targetTableName, aliasedTarget) => {
+	const scope = ctx.scope;
+	if (!scope) return;
+	const mode = scope.relationDefault(targetTableName, (0, drizzle_orm.is)(relation, drizzle_orm.One) && relation.optional === false);
+	return scope.has(targetTableName, mode) ? scope.on(targetTableName, aliasedTarget, mode) : void 0;
 };
 /**
 * Correlates the parent row with the aliased target table using the relation's own join
@@ -2126,8 +2202,11 @@ const buildRelationExists = (parentTable, relationName, relEntry, innerFilters,
 	const throughTable = relation.throughTable;
 	let fromClause;
 	let joinCondition;
+	let junctionPolicy;
 	if (throughTable) {
 		const aliasedThrough = (0, drizzle_orm.aliasedTable)(throughTable, `dgql_rel_${aliases.n++}`);
+		const throughTableName = ctx.scope ? Object.keys(ctx.tables).find((name) => ctx.tables[name] === throughTable) : void 0;
+		if (throughTableName && ctx.scope.has(throughTableName)) junctionPolicy = ctx.scope.on(throughTableName, aliasedThrough);
 		const { correlation, junctionJoin } = buildThroughJoinConditions(parentTable, relation, aliasedThrough, aliasedTarget, relationName);
 		fromClause = drizzle_orm.sql`${(0, drizzle_orm.getTableAsAliasSQL)(aliasedTarget)} inner join ${(0, drizzle_orm.getTableAsAliasSQL)(aliasedThrough)} on ${junctionJoin}`;
 		joinCondition = correlation;
@@ -2137,6 +2216,7 @@ const buildRelationExists = (parentTable, relationName, relEntry, innerFilters,
 	}
 	const ownWhere = relationOwnWhere(relation);
 	const relationWhere = ownWhere ? (0, drizzle_orm.relationsFilterToSQL)(isRelationFilterReversed(relation) ? parentTable : aliasedTarget, ownWhere) : void 0;
+	const policy = (0, drizzle_orm.and)(relationTargetPolicy(ctx, relation, targetTableName, aliasedTarget), junctionPolicy);
 	const inner = innerFilters ? extractFilters(aliasedTarget, targetTableName, innerFilters, {
 		...ctx,
 		tableKey: targetTableName,
@@ -2144,9 +2224,9 @@ const buildRelationExists = (parentTable, relationName, relEntry, innerFilters,
 	}) : void 0;
 	if (mode === "every") {
 		if (!inner) return;
-		return drizzle_orm.sql`not exists (select 1 from ${fromClause} where ${(0, drizzle_orm.and)(joinCondition, relationWhere, (0, drizzle_orm.not)(inner))})`;
+		return drizzle_orm.sql`not exists (select 1 from ${fromClause} where ${(0, drizzle_orm.and)(joinCondition, relationWhere, policy, (0, drizzle_orm.not)(inner))})`;
 	}
-	const condition = (0, drizzle_orm.and)(joinCondition, relationWhere, inner);
+	const condition = (0, drizzle_orm.and)(joinCondition, relationWhere, policy, inner);
 	return mode === "none" ? drizzle_orm.sql`not exists (select 1 from ${fromClause} where ${condition})` : drizzle_orm.sql`exists (select 1 from ${fromClause} where ${condition})`;
 };
 /**
@@ -2672,12 +2752,14 @@ const extendRelationOrderChain = (parentTable, relationName, relEntry, ctx, chai
 	const joinCondition = buildRelationJoinCondition(parentTable, relation, aliasedTarget, relationName);
 	const ownWhere = relationOwnWhere(relation);
 	const relationWhere = ownWhere ? (0, drizzle_orm.relationsFilterToSQL)(isRelationFilterReversed(relation) ? parentTable : aliasedTarget, ownWhere) : void 0;
+	const policy = relationTargetPolicy(ctx, relation, relEntry.targetTableName, aliasedTarget);
 	return {
 		fromParts: [...chain?.fromParts ?? [], (0, drizzle_orm.getTableAsAliasSQL)(aliasedTarget)],
 		conditions: [
 			...chain?.conditions ?? [],
 			...joinCondition ? [joinCondition] : [],
-			...relationWhere ? [relationWhere] : []
+			...relationWhere ? [relationWhere] : [],
+			...policy ? [policy] : []
 		],
 		table: aliasedTarget
 	};
@@ -3812,8 +3894,7 @@ const relationJoinColumns = (tree, table, selectionCtx) => {
 		const relEntry = fieldData.name.endsWith(AGGREGATE_FIELD_SUFFIX) ? relations[fieldData.name.slice(0, -9)] : relations[fieldData.name];
 		const targetTable = relEntry ? selectionCtx.tables[relEntry.targetTableName] : void 0;
 		if (!relEntry || !targetTable) continue;
-		const joinCols = extractRelationJoinColumns(relEntry, table, targetTable);
-		if (joinCols) needed.push(joinCols.localColPropName);
+		for (const pair of extractRelationJoinColumnPairs(relEntry, table, targetTable) ?? []) needed.push(pair.localColPropName);
 	}
 	return needed;
 };
@@ -3907,10 +3988,10 @@ const extractRelationsParams = (relationMap, tables, tableName, info, typeName,
 		});
 		const relWhere = relationArgs?.where;
 		const relDeleted = relationArgs?.deleted ?? scope?.relationDefault(targetTableName, (0, drizzle_orm.is)(relEntry.relation, drizzle_orm.One) && relEntry.relation.optional === false);
-		thisRecord.where = relWhere || scope?.has(targetTableName, relDeleted) ? { RAW: (aliasedTable) => withScope(scope, targetTableName, aliasedTable, relWhere ? extractFilters(aliasedTable, relName, relWhere, relationFilterCtx(filterCtx, targetTableName)) : void 0, relDeleted) } : void 0;
+		thisRecord.where = relWhere || scope?.has(targetTableName, relDeleted) ? { RAW: (aliasedTable) => withScope(scope, targetTableName, aliasedTable, relWhere ? extractFilters(aliasedTable, relName, relWhere, relationFilterCtx(filterCtx, targetTableName, scope)) : void 0, relDeleted) } : void 0;
 		const hasPagination = offset != null || limit != null;
 		const pkNames = targetPkNames ?? [];
-		thisRecord.orderBy = relationArgs?.orderBy ? (aliasedTable) => extractOrderBy(aliasedTable, relationArgs.orderBy, relationFilterCtx(filterCtx, targetTableName), relWhere) : hasPagination && pkNames.length ? (aliasedTable) => primaryKeyOrderExprs(aliasedTable, pkNames) : void 0;
+		thisRecord.orderBy = relationArgs?.orderBy ? (aliasedTable) => extractOrderBy(aliasedTable, relationArgs.orderBy, relationFilterCtx(filterCtx, targetTableName, scope), relWhere) : hasPagination && pkNames.length ? (aliasedTable) => primaryKeyOrderExprs(aliasedTable, pkNames) : void 0;
 		thisRecord.offset = offset;
 		thisRecord.limit = limit;
 		thisRecord.with = extractRelationsParams(relationMap, tables, targetTableName, field, relTypeName, options);
@@ -3968,7 +4049,7 @@ const runRelationalSelect = async (opts) => {
 			tableName,
 			distinct,
 			pkNames: pkNames ?? [],
-			where: withScope(scope, tableName, table, where ? extractFilters(table, tableName, where, relationFilterCtx(filterCtx, tableName)) : void 0, deleted),
+			where: withScope(scope, tableName, table, where ? extractFilters(table, tableName, where, relationFilterCtx(filterCtx, tableName, scope)) : void 0, deleted),
 			orderBy,
 			limit: single ? 1 : opts.limit,
 			offset
@@ -3983,8 +4064,8 @@ const runRelationalSelect = async (opts) => {
 			allRelations: filterCtx?.relationMap
 		}),
 		offset: distinctKeys ? void 0 : offset,
-		orderBy: distinctKeys ? (aliasedTable) => [...orderBy ? extractOrderBy(aliasedTable, orderBy, relationFilterCtx(filterCtx, tableName), where) : [], ...primaryKeyOrderExprs(aliasedTable, pkNames)] : cursorEntries ? (aliasedTable) => cursorOrderExprs(aliasedTable, cursorEntries) : orderBy ? (aliasedTable) => extractOrderBy(aliasedTable, orderBy, relationFilterCtx(filterCtx, tableName), where) : needsDefaultOrder && pkNames?.length ? (aliasedTable) => primaryKeyOrderExprs(aliasedTable, pkNames) : void 0,
-		where: distinctKeys ? { RAW: (aliasedTable) => primaryKeyRestriction(aliasedTable, pkNames, distinctKeys) } : where || cursorValues || scope?.has(tableName, deleted) ? { RAW: (aliasedTable) => withScope(scope, tableName, aliasedTable, (0, drizzle_orm.and)(where ? extractFilters(aliasedTable, tableName, where, relationFilterCtx(filterCtx, tableName)) : void 0, cursorValues ? buildCursorCondition(aliasedTable, cursorEntries, cursorValues, opts.nullOrdering ?? "nulls-smallest") : void 0), deleted) } : void 0,
+		orderBy: distinctKeys ? (aliasedTable) => [...orderBy ? extractOrderBy(aliasedTable, orderBy, relationFilterCtx(filterCtx, tableName, scope), where) : [], ...primaryKeyOrderExprs(aliasedTable, pkNames)] : cursorEntries ? (aliasedTable) => cursorOrderExprs(aliasedTable, cursorEntries) : orderBy ? (aliasedTable) => extractOrderBy(aliasedTable, orderBy, relationFilterCtx(filterCtx, tableName, scope), where) : needsDefaultOrder && pkNames?.length ? (aliasedTable) => primaryKeyOrderExprs(aliasedTable, pkNames) : void 0,
+		where: distinctKeys ? { RAW: (aliasedTable) => primaryKeyRestriction(aliasedTable, pkNames, distinctKeys) } : where || cursorValues || scope?.has(tableName, deleted) ? { RAW: (aliasedTable) => withScope(scope, tableName, aliasedTable, (0, drizzle_orm.and)(where ? extractFilters(aliasedTable, tableName, where, relationFilterCtx(filterCtx, tableName, scope)) : void 0, cursorValues ? buildCursorCondition(aliasedTable, cursorEntries, cursorValues, opts.nullOrdering ?? "nulls-smallest") : void 0), deleted) } : void 0,
 		with: relationMap[tableName] ? extractRelationsParams(relationMap, tables, tableName, parsedInfo, typeName, {
 			typeNameMapper,
 			filterCtx,
@@ -4566,7 +4647,7 @@ const generateWriteCount = ({ db, tableName, table, kind, setArgs, filterArgs, f
 				tableName,
 				table,
 				where,
-				relationCtx: relationFilterCtx(filterCtx, tableName),
+				relationCtx: relationFilterCtx(filterCtx, tableName, scope),
 				required: requireWhere,
 				deleted: hard ? "INCLUDE" : void 0
 			});
@@ -4834,13 +4915,12 @@ const identifyRows = (field, args) => {
 * Window functions require PostgreSQL, MySQL >= 8.0, or SQLite >= 3.25.
 * Returns raw rows (NOT remapped); the caller groups + remaps them.
 */
-const batchedPaginatedRelationQuery = async (db, targetTable, foreignCol, whereCondition, orderByArg, limit, offset, pkNames, columns, orderCtx, whereArgs, junction) => {
+const batchedPaginatedRelationQuery = async (db, targetTable, foreignCol, partitionCols, whereCondition, orderByArg, limit, offset, pkNames, columns, orderCtx, whereArgs, junction) => {
 	const cols = columns ?? (0, drizzle_orm.getColumns)(targetTable);
 	const orderExprs = [...orderByArg ? extractOrderBy(targetTable, orderByArg, orderCtx, whereArgs) : [], ...primaryKeyOrderExprs(targetTable, pkNames)];
 	const orderClause = orderExprs.length ? drizzle_orm.sql` order by ${drizzle_orm.sql.join(orderExprs, drizzle_orm.sql`, `)}` : drizzle_orm.sql``;
 	const RN = "__drizzle_graphql_rn";
-	const partitionCol = junction ? junction.sourceCol : foreignCol;
-	const rowNumber = drizzle_orm.sql`row_number() over (partition by ${partitionCol}${orderClause})`.as(RN);
+	const rowNumber = drizzle_orm.sql`row_number() over (partition by ${drizzle_orm.sql.join([...partitionCols], drizzle_orm.sql`, `)}${orderClause})`.as(RN);
 	const sub = withJunction(db.select({
 		...cols,
 		[RN]: rowNumber
@@ -4879,13 +4959,14 @@ const createRelationResolverFactory = (db, tables, nullOrdering, filterCtx, limi
 	const targetTableName = relEntry.targetTableName;
 	const targetTable = tables[targetTableName];
 	if (!parentTable || !targetTable) return;
-	const joinCols = extractRelationJoinColumns(relEntry, parentTable, targetTable);
-	if (!joinCols) return;
-	const { localColPropName, foreignCol, foreignColPropName } = joinCols;
+	const joinPairs = extractRelationJoinColumnPairs(relEntry, parentTable, targetTable);
+	if (!joinPairs) return;
+	const localColPropNames = joinPairs.map((pair) => pair.localColPropName);
+	const foreignCol = joinPairs[0].foreignCol;
 	const junction = extractJunctionColumns(relEntry);
-	const groupCol = junction ? junction.sourceCol : foreignCol;
-	const groupKey = junction ? PARENT_KEY : foreignColPropName;
-	const ownCondition = relationOwnCondition(relEntry, parentTable, targetTable, (0, drizzle_orm.getColumns)(parentTable)[localColPropName], groupCol);
+	const groupCols = junction ? [junction.sourceCol] : joinPairs.map((pair) => pair.foreignCol);
+	const groupKeys = junction ? [PARENT_KEY] : joinPairs.map((pair) => pair.foreignColPropName);
+	const ownCondition = relationOwnCondition(relEntry, parentTable, targetTable, joinPairs.map((pair) => pair.localCol), groupCols);
 	const defaultDeleted = relationDeletedDefault(policies?.softDelete, targetTableName, isOne && relEntry.relation?.optional === false);
 	const limitPolicy = isOne ? void 0 : limits?.(targetTableName);
 	const targetPkNames = relEntry.targetPkNames ?? [];
@@ -4914,7 +4995,7 @@ const createRelationResolverFactory = (db, tables, nullOrdering, filterCtx, limi
 			allRelations: filterCtx?.relationMap
 		});
 		const targetColumns = (0, drizzle_orm.getColumns)(targetTable);
-		columns[foreignColPropName] = foreignCol;
+		for (const pair of joinPairs) columns[pair.foreignColPropName] = pair.foreignCol;
 		for (const [columnName] of cursorEntries ?? []) {
 			const column = targetColumns[columnName];
 			if (column) columns[columnName] = column;
@@ -4926,8 +5007,8 @@ const createRelationResolverFactory = (db, tables, nullOrdering, filterCtx, limi
 	};
 	const resolve = async (parent, args, context, info) => {
 		if (parent[relationName] !== void 0) return parent[relationName];
-		const localValue = parent[localColPropName];
-		if (localValue == null) return isOne ? null : [];
+		const localValues = localColPropNames.map((name) => parent[name]);
+		if (localValues.some((value) => value == null)) return isOne ? null : [];
 		const { where: whereArg, limit: requestedLimit, offset, after, deleted } = args ?? {};
 		const { orderByArg, limit, distinct, cursorEntries, cursorValues, columns, loaderKey } = getOrCreateRequestValue(context, info?.fieldNodes?.[0], `relation:${tableName}::${relationName}`, () => {
 			const orderByArg = isOne ? args?.orderBy : withDefaultOrderBy(args ?? {}, targetTableName, policies?.defaultOrderBy).orderBy;
@@ -4968,11 +5049,11 @@ const createRelationResolverFactory = (db, tables, nullOrdering, filterCtx, limi
 			};
 		});
 		if (junction === null) throw drizzleError(`Relation '${tableName}.${relationName}' goes through a junction with a composite key, which can only be loaded together with its parent. Leave it to eager loading (eagerLoadRelations).`, { code: "DRIZZLE_UNSUPPORTED_RELATION" });
-		return getOrCreateLoader(context, loaderKey, async (parentIds) => {
+		return getOrCreateLoader(context, loaderKey, async (parentKeys) => {
 			const executor = resolveExecutor(db, context);
-			const uniqueIds = [...new Set(parentIds)];
+			const uniqueKeys = [...new Map(parentKeys.map((key) => [joinKeyOf(key), key])).values()];
 			const scope = resolveScope(policies, context, filterCtx);
-			let whereCondition = withScope(scope, targetTableName, targetTable, (0, drizzle_orm.and)((0, drizzle_orm.inArray)(groupCol, uniqueIds), ownCondition, whereArg ? extractFilters(targetTable, targetTableName, whereArg, relationFilterCtx(filterCtx, targetTableName)) : void 0, cursorValues ? buildCursorCondition(targetTable, cursorEntries, cursorValues, nullOrdering) : void 0), deleted ?? defaultDeleted);
+			let whereCondition = withScope(scope, targetTableName, targetTable, (0, drizzle_orm.and)(parentKeyCondition(groupCols, uniqueKeys), ownCondition, whereArg ? extractFilters(targetTable, targetTableName, whereArg, relationFilterCtx(filterCtx, targetTableName, scope)) : void 0, cursorValues ? buildCursorCondition(targetTable, cursorEntries, cursorValues, nullOrdering) : void 0), deleted ?? defaultDeleted);
 			if (distinct) {
 				const keys = await selectDistinctKeys({
 					db: executor,
@@ -4982,44 +5063,44 @@ const createRelationResolverFactory = (db, tables, nullOrdering, filterCtx, limi
 					pkNames: targetPkNames,
 					where: whereCondition,
 					orderBy: orderByArg,
-					partitionBy: [groupCol],
+					partitionBy: groupCols,
 					junction: junction ? {
 						table: junction.table,
 						on: (0, drizzle_orm.eq)(junction.targetCol, foreignCol),
-						parentKey: groupCol
+						parentKey: junction.sourceCol
 					} : void 0
 				});
-				if (!keys.length) return parentIds.map(() => isOne ? null : []);
-				whereCondition = (0, drizzle_orm.and)(whereCondition, junction ? (0, drizzle_orm.or)(...keys.map((key) => (0, drizzle_orm.and)((0, drizzle_orm.eq)(groupCol, key[DISTINCT_PARENT]), primaryKeyRestriction(targetTable, targetPkNames, [key])))) : primaryKeyRestriction(targetTable, targetPkNames, keys));
+				if (!keys.length) return parentKeys.map(() => isOne ? null : []);
+				whereCondition = (0, drizzle_orm.and)(whereCondition, junction ? (0, drizzle_orm.or)(...keys.map((key) => (0, drizzle_orm.and)((0, drizzle_orm.eq)(junction.sourceCol, key[DISTINCT_PARENT]), primaryKeyRestriction(targetTable, targetPkNames, [key])))) : primaryKeyRestriction(targetTable, targetPkNames, keys));
 			}
 			const selection = junction ? {
 				...columns ?? (0, drizzle_orm.getColumns)(targetTable),
-				[PARENT_KEY]: groupCol
+				[PARENT_KEY]: junction.sourceCol
 			} : columns;
 			let rows;
-			if (limit != null || offset != null) rows = await batchedPaginatedRelationQuery(executor, targetTable, foreignCol, whereCondition, orderByArg, limit ?? null, offset ?? null, targetPkNames, selection, relationFilterCtx(filterCtx, targetTableName), whereArg, junction);
+			if (limit != null || offset != null) rows = await batchedPaginatedRelationQuery(executor, targetTable, foreignCol, groupCols, whereCondition, orderByArg, limit ?? null, offset ?? null, targetPkNames, selection, relationFilterCtx(filterCtx, targetTableName, scope), whereArg, junction);
 			else {
 				let q = withJunction((selection ? executor.select(selection) : executor.select()).from(targetTable), junction, foreignCol).where(whereCondition);
-				const orderExprs = cursorEntries ? cursorOrderExprs(targetTable, cursorEntries) : orderByArg ? extractOrderBy(targetTable, orderByArg, relationFilterCtx(filterCtx, targetTableName), whereArg) : [];
+				const orderExprs = cursorEntries ? cursorOrderExprs(targetTable, cursorEntries) : orderByArg ? extractOrderBy(targetTable, orderByArg, relationFilterCtx(filterCtx, targetTableName, scope), whereArg) : [];
 				if (orderExprs.length) q = q.orderBy(...orderExprs);
 				rows = await q;
 			}
 			if (cursorEntries) attachRowCursors(rows, cursorEntries);
 			const keyOf = (row) => {
-				const key = String(row[groupKey]);
+				const key = joinKeyOf(groupKeys.map((name) => row[name]));
 				if (junction) delete row[PARENT_KEY];
 				return key;
 			};
 			if (isOne) {
 				const byKey = new Map(rows.map((row) => [keyOf(row), row]));
 				remapToGraphQLArrayOutput(rows, targetTableName, targetTable);
-				return parentIds.map((id) => byKey.get(String(id)) ?? null);
+				return parentKeys.map((key) => byKey.get(joinKeyOf(key)) ?? null);
 			}
-			const grouped = new Map(uniqueIds.map((id) => [String(id), []]));
+			const grouped = new Map(uniqueKeys.map((key) => [joinKeyOf(key), []]));
 			for (const row of rows) grouped.get(keyOf(row))?.push(row);
 			remapToGraphQLArrayOutput(rows, targetTableName, targetTable);
-			return parentIds.map((id) => grouped.get(String(id)) ?? []);
-		}).load(localValue);
+			return parentKeys.map((key) => grouped.get(joinKeyOf(key)) ?? []);
+		}).load(localValues);
 	};
 	return async (parent, args, context, info) => {
 		try {
@@ -5680,6 +5761,7 @@ const resolveBuildConfig = (config, schema) => {
 			const normalized = {};
 			for (const [columnName, entry] of Object.entries(orderBy)) {
 				if (!columns[columnName]) throw new Error(`Drizzle-GraphQL Error: config.defaults.${tableName}.orderBy names '${columnName}', which is not a column of '${tableName}'.`);
+				if (config?.exclude?.columns?.[tableName]?.includes(columnName)) throw new Error(`Drizzle-GraphQL Error: config.defaults.${tableName}.orderBy names '${columnName}', which config.exclude.columns hides. A default ordering is encoded into every row's cursor, so it can only use columns the schema exposes.`);
 				const direction = typeof entry === "string" ? entry : entry?.direction;
 				if (direction !== "asc" && direction !== "desc") throw new Error(`Drizzle-GraphQL Error: config.defaults.${tableName}.orderBy.${columnName} must be 'asc', 'desc', or { direction, priority? }.`);
 				const priority = typeof entry === "string" ? void 0 : entry?.priority;
@@ -6060,7 +6142,8 @@ const generateAggregate = (db, tableName, table, typeName, fieldName, filterArgs
 				const request = parseAggregateRequest(info, target);
 				if (!Object.keys(request.selection).length) return {};
 				let query = resolveExecutor(db, context).select(request.selection).from(table);
-				const where = withScope(resolveScope(policies, context, filterCtx), tableName, table, args.where ? extractFilters(table, tableName, args.where, relationFilterCtx(filterCtx, tableName)) : void 0, args.deleted);
+				const scope = resolveScope(policies, context, filterCtx);
+				const where = withScope(scope, tableName, table, args.where ? extractFilters(table, tableName, args.where, relationFilterCtx(filterCtx, tableName, scope)) : void 0, args.deleted);
 				if (where) query = query.where(where);
 				const rows = await query;
 				return assembleAggregateRow(rows[0] ?? {}, request, target);
@@ -6093,8 +6176,8 @@ const createRelationAggregateFactory = (db, tables, cacheCtx, typeNameMapper, fi
 		const targetTableName = relEntry.targetTableName;
 		const targetTable = tables[targetTableName];
 		if (!parentTable || !targetTable) return;
-		const joinCols = extractRelationJoinColumns(relEntry, parentTable, targetTable);
-		if (!joinCols) {
+		const joinPairs = extractRelationJoinColumnPairs(relEntry, parentTable, targetTable);
+		if (!joinPairs) {
 			const key = `${tableName}.${relationName}`;
 			if (!warned.has(key)) {
 				warned.add(key);
@@ -6102,11 +6185,13 @@ const createRelationAggregateFactory = (db, tables, cacheCtx, typeNameMapper, fi
 			}
 			return;
 		}
-		const { localColPropName, foreignCol } = joinCols;
+		const localColPropNames = joinPairs.map((pair) => pair.localColPropName);
+		const foreignCol = joinPairs[0].foreignCol;
 		const junction = extractJunctionColumns(relEntry);
 		if (junction === null) return;
-		const groupCol = junction ? junction.sourceCol : foreignCol;
-		const ownCondition = relationOwnCondition(relEntry, parentTable, targetTable, (0, drizzle_orm.getColumns)(parentTable)[localColPropName], groupCol);
+		const groupCols = junction ? [junction.sourceCol] : joinPairs.map((pair) => pair.foreignCol);
+		const groupAliases = groupCols.map((_, i) => `${GROUP_KEY}${i}`);
+		const ownCondition = relationOwnCondition(relEntry, parentTable, targetTable, joinPairs.map((pair) => pair.localCol), groupCols);
 		const defaultDeleted = relationDeletedDefault(policies?.softDelete, targetTableName, false);
 		const targetTypeName = resolveTypeName(targetTableName, typeNameMapper);
 		const type = generateAggregateTypes(targetTable, targetTableName, targetTypeName, cacheCtx);
@@ -6130,23 +6215,25 @@ const createRelationAggregateFactory = (db, tables, cacheCtx, typeNameMapper, fi
 					};
 				});
 				if (!Object.keys(request.selection).length) return {};
-				const localValue = parent[localColPropName];
-				if (localValue == null) return assembleAggregateRow({}, request, target);
+				const localValues = localColPropNames.map((name) => parent[name]);
+				if (localValues.some((value) => value == null)) return assembleAggregateRow({}, request, target);
 				const whereArg = args?.where;
 				const deleted = args?.deleted;
-				const loader = getOrCreateLoader(context, loaderKey, async (parentIds) => {
+				const loader = getOrCreateLoader(context, loaderKey, async (parentKeys) => {
 					const executor = resolveExecutor(db, context);
-					const uniqueIds = [...new Set(parentIds)];
-					const whereCondition = withScope(resolveScope(policies, context, filterCtx), targetTableName, targetTable, (0, drizzle_orm.and)((0, drizzle_orm.inArray)(groupCol, uniqueIds), ownCondition, whereArg ? extractFilters(targetTable, targetTableName, whereArg, relationFilterCtx(filterCtx, targetTableName)) : void 0), deleted ?? defaultDeleted);
+					const uniqueKeys = [...new Map(parentKeys.map((key) => [joinKeyOf(key), key])).values()];
+					const scope = resolveScope(policies, context, filterCtx);
+					const whereCondition = withScope(scope, targetTableName, targetTable, (0, drizzle_orm.and)(parentKeyCondition(groupCols, uniqueKeys), ownCondition, whereArg ? extractFilters(targetTable, targetTableName, whereArg, relationFilterCtx(filterCtx, targetTableName, scope)) : void 0), deleted ?? defaultDeleted);
+					const groupSelection = Object.fromEntries(groupAliases.map((alias, i) => [alias, groupCols[i]]));
 					const selected = executor.select({
-						[GROUP_KEY]: groupCol,
+						...groupSelection,
 						...request.selection
 					}).from(targetTable);
-					const rows = await (junction ? selected.innerJoin(junction.table, (0, drizzle_orm.eq)(junction.targetCol, foreignCol)) : selected).where(whereCondition).groupBy(groupCol);
-					const byKey = new Map(rows.map((row) => [row[GROUP_KEY], row]));
-					return parentIds.map((id) => byKey.get(id) ?? {});
+					const rows = await (junction ? selected.innerJoin(junction.table, (0, drizzle_orm.eq)(junction.targetCol, foreignCol)) : selected).where(whereCondition).groupBy(...groupCols);
+					const byKey = new Map(rows.map((row) => [joinKeyOf(groupAliases.map((alias) => row[alias])), row]));
+					return parentKeys.map((key) => byKey.get(joinKeyOf(key)) ?? {});
 				});
-				return assembleAggregateRow(await loader.load(localValue), request, target);
+				return assembleAggregateRow(await loader.load(localValues), request, target);
 			} catch (e) {
 				throw withErrorContext(toGraphQLError(e), errorCtx);
 			}
@@ -6353,7 +6440,8 @@ const generateGroupBy = (db, tableName, table, typeName, fieldName, filterArgs,
 					...request.selection
 				};
 				let query = resolveExecutor(db, context).select(selection).from(table);
-				const where = withScope(resolveScope(policies, context, filterCtx), tableName, table, args.where ? extractFilters(table, tableName, args.where, relationFilterCtx(filterCtx, tableName)) : void 0, args.deleted);
+				const scope = resolveScope(policies, context, filterCtx);
+				const where = withScope(scope, tableName, table, args.where ? extractFilters(table, tableName, args.where, relationFilterCtx(filterCtx, tableName, scope)) : void 0, args.deleted);
 				if (where) query = query.where(where);
 				query = query.groupBy(...keyColumns.map(([, column]) => column));
 				const havingCondition = buildHavingCondition(args.having, columns);
@@ -6392,6 +6480,54 @@ const generateGroupBy = (db, tableName, table, typeName, fieldName, filterArgs,
 	};
 };
 //#endregion
+//#region src/util/builders/common/build-registry.ts
+/**
+* Keyed by the `extensions.drizzle` object of every object type the build generated, rather
+* than by the type: a schema composed from `entities.types` keeps the types, and one rebuilt
+* by a schema-transforming tool (`mapSchema`, stitching) keeps their extensions.
+*/
+const runtimeByTypeMeta = /* @__PURE__ */ new WeakMap();
+/**
+* What is known about the builds of one drizzle instance, for a caller with no resolve info to
+* look its build up by. Only a lone build is kept — with two or more there is no telling which
+* one a selection belongs to — so rebuilding a schema repeatedly holds on to nothing extra.
+*/
+const buildsByDb = /* @__PURE__ */ new WeakMap();
+/** Whether a build changes what a read returns at all: a row policy, a limit or a default ordering. */
+const hasPolicies = (runtime) => !!(runtime.policies?.scope || runtime.policies?.defaultOrderBy || runtime.limits);
+/** Records a finished build against the object types it generated and the instance it read. */
+const registerBuildRuntime = (runtime, types) => {
+	for (const type of types) {
+		const meta = drizzleExtension(type);
+		if (meta) runtimeByTypeMeta.set(meta, runtime);
+	}
+	const previous = buildsByDb.get(runtime.db);
+	buildsByDb.set(runtime.db, previous ? {
+		count: previous.count + 1,
+		anyPolicies: previous.anyPolicies || hasPolicies(runtime)
+	} : {
+		count: 1,
+		only: runtime,
+		anyPolicies: hasPolicies(runtime)
+	});
+};
+/** The build that generated `type`, when one did. */
+const runtimeForType = (type) => {
+	const meta = type && typeof type === "object" ? drizzleExtension(type) : void 0;
+	return meta ? runtimeByTypeMeta.get(meta) : void 0;
+};
+/**
+* The build of `db` to use when no generated type identifies one: the only build, or none
+* when no build applies any policy. Throws when several builds exist and one of them would
+* change the read, since picking either could apply the wrong policies — or none.
+*/
+const runtimeForDb = (db, helper) => {
+	const builds = buildsByDb.get(db);
+	if (!builds) return;
+	if (builds.count === 1) return builds.only;
+	if (builds.anyPolicies) throw new Error(`Drizzle-GraphQL Error: ${helper} cannot tell which of the ${builds.count} schemas built over this database the selection belongs to, and at least one applies row policies (scope, softDelete, limits or defaults). Pass the resolver's \`info\` rather than a parsed selection tree, from a field whose type the build generated.`);
+};
+//#endregion
 //#region src/util/builders/nested-writes.ts
 const ALL_OPS = [
 	"create",
@@ -6884,7 +7020,7 @@ const createNestedWriteRuntime = (params) => {
 	* nothing is rejected: `connect: {}` would otherwise attach every row in the table.
 	*/
 	const conditionOf = (plan, filter, operation, scope) => {
-		const condition = extractFilters(plan.targetTable, plan.targetTableName, filter, relationFilterCtx(filterCtx, plan.targetTableName));
+		const condition = extractFilters(plan.targetTable, plan.targetTableName, filter, relationFilterCtx(filterCtx, plan.targetTableName, scope));
 		if (!condition) throw drizzleError(`Drizzle-GraphQL Error: '${operation}' on '${plan.relationName}' needs a filter that selects rows — it was given one that matches everything.`, { code: "DRIZZLE_NESTED_WRITE_INVALID" });
 		return withScope(scope, plan.targetTableName, plan.targetTable, condition);
 	};
@@ -7495,6 +7631,14 @@ const createSchemaBuilder = (adapter) => {
 			}
 			if (Object.keys(relResolvers).length > 0) fieldResolvers[tableName] = relResolvers;
 		}
+		registerBuildRuntime({
+			db: ctx.db,
+			filterCtx: ctx.filterCtx,
+			policies: ctx.policies,
+			scoped: !!ctx.tablePolicies?.scope,
+			limits: ctx.limits,
+			nullOrdering: adapter.nullOrdering
+		}, Object.values(ctx.outputs));
 		return {
 			queries: ctx.queries,
 			mutations: ctx.mutations,
@@ -7617,7 +7761,7 @@ const generateUpdate = (db, tableName, table, setArgs, filterArgs, fieldName, si
 		const input = stripContextValues(remapUpdateInput(set, table, tableName), policies?.contextValues?.(tableName));
 		if (!Object.keys(input).length) throw drizzleError("Unable to update with no values specified!", { code: "DRIZZLE_NO_VALUES" });
 		await before();
-		const relationCtx = relationFilterCtx(filterCtx, tableName);
+		const relationCtx = relationFilterCtx(filterCtx, tableName, scope);
 		const filters = scopedWhere({
 			scope,
 			tableName,
@@ -7663,7 +7807,7 @@ const generateUpdateMany$2 = (db, tableName, table, updateManyInput, fieldName,
 			if (!Object.keys(input).length) throw drizzleError("Unable to update with no values specified!", { code: "DRIZZLE_NO_VALUES" });
 			return {
 				set: input,
-				filters: withScope(scope, tableName, table, where ? extractFilters(table, tableName, where, relationFilterCtx(filterCtx, tableName)) : void 0)
+				filters: withScope(scope, tableName, table, where ? extractFilters(table, tableName, where, relationFilterCtx(filterCtx, tableName, scope)) : void 0)
 			};
 		});
 		await executor.transaction(async (tx) => {
@@ -7706,7 +7850,7 @@ const generateDelete = (db, tableName, table, filterArgs, fieldName, single, req
 			const { where } = args;
 			const hard = canHardDelete && args.hard === true;
 			const scope = policies?.scope?.(context);
-			const relationCtx = relationFilterCtx(filterCtx, tableName);
+			const relationCtx = relationFilterCtx(filterCtx, tableName, scope);
 			const filters = scopedWhere({
 				scope,
 				tableName,
@@ -8048,7 +8192,7 @@ const buildWriteResolvers = (primaryKeyPropNames) => {
 						excludedRef: excludedColumnRef,
 						withTarget: true,
 						serverOwned: Object.keys(contextColumns ?? {}),
-						buildWhere: (where) => extractFilters(table, tableName, where, relationFilterCtx(filterCtx, tableName))
+						buildWhere: (where) => extractFilters(table, tableName, where, relationFilterCtx(filterCtx, tableName, scope))
 					});
 					const runBatch = async (executor, { values: rows, plan }) => {
 						let query = executor.insert(table).values(rows).returning(returning);
@@ -8130,7 +8274,7 @@ const buildWriteResolvers = (primaryKeyPropNames) => {
 				const nestedOps = entry && nested.hasOps(entry.ops) ? entry.ops : void 0;
 				const input = stripContextValues(remapUpdateInput(entry ? entry.columns : set, table, tableName), policies?.contextValues?.(tableName));
 				if (!Object.keys(input).length && !nestedOps) throw drizzleError("Unable to update with no values specified!", { code: "DRIZZLE_NO_VALUES" });
-				const relationCtx = relationFilterCtx(filterCtx, tableName);
+				const relationCtx = relationFilterCtx(filterCtx, tableName, scope);
 				const filters = scopedWhere({
 					scope,
 					tableName,
@@ -8209,7 +8353,7 @@ const buildWriteResolvers = (primaryKeyPropNames) => {
 				await before();
 				const parsedInfo = parseResolveInfo(info, { deep: true });
 				const columns = extractSelectedColumnsFromTreeSQLFormat(parsedInfo.fieldsByTypeName[applyObjectTypeName(typeName, tableName, resolveName)], table, selectionCtx);
-				const relationCtx = relationFilterCtx(filterCtx, tableName);
+				const relationCtx = relationFilterCtx(filterCtx, tableName, scope);
 				const filters = scopedWhere({
 					scope,
 					tableName,
@@ -8660,7 +8804,7 @@ const createUpdateManyGenerator = (primaryKeyPropNames, runBatch = runUpdateMany
 					return {
 						set: input,
 						ops,
-						filters: withScope(scope, tableName, table, where ? extractFilters(table, tableName, where, relationFilterCtx(filterCtx, tableName)) : void 0)
+						filters: withScope(scope, tableName, table, where ? extractFilters(table, tableName, where, relationFilterCtx(filterCtx, tableName, scope)) : void 0)
 					};
 				});
 				const anyNested = entries.some((entry) => entry.ops);
@@ -8830,6 +8974,36 @@ const namingRuleOf = (options) => resolveGeneratedTypeNames({
 	typeNameSuffix: options.typeNameSuffix
 });
 /**
+* The build whose policies the read applies. Looked up through the generated types the
+* resolve info reaches — the field's return type, the root table's type in the executing
+* schema, the parent type — so a resolver over a generated type finds its own build. Without
+* resolve info (a parsed tree was passed), the instance's only build is used.
+*/
+const runtimeFor = (info, db, typeName, helper) => {
+	if (!("fieldsByTypeName" in info)) {
+		const candidates = [
+			info.returnType ? (0, graphql.getNamedType)(info.returnType) : void 0,
+			info.schema?.getType(typeName),
+			info.parentType
+		];
+		for (const candidate of candidates) {
+			const runtime = runtimeForType(candidate);
+			if (runtime && runtime.db === db) return runtime;
+		}
+	}
+	return runtimeForDb(db, helper);
+};
+/**
+* The request's row policies under `runtime`, bound to the context the caller passed. A build
+* with `scope` hooks cannot be read without that context: the hooks would be called with
+* nothing, and running the read unscoped is the leak the option exists to prevent.
+*/
+const scopeFor = (runtime, options, helper) => {
+	if (!runtime?.policies?.scope) return;
+	if (runtime.scoped && !("context" in options)) throw new Error(`Drizzle-GraphQL Error: the schema this selection belongs to configures \`scope\`, so ${helper} needs the request context to apply it. Pass the resolver's context as the \`context\` option.`);
+	return runtime.policies.scope(options.context);
+};
+/**
 * Reads the parsed selection tree out of a resolver's `info`, resolving fragments and
 * inline fragments. Accepts an already-parsed tree so a caller that has one (or is chaining
 * these helpers) does not pay for the walk twice.
@@ -8856,6 +9030,10 @@ const parseInfo = (info) => {
 * const row = await tx.query.Users.findFirst({ where: { id: { eq } }, with: withTree });
 * ```
 *
+* Every nested entry carries the build's row policies — `scope`, `softDelete`, `limits` and
+* `defaults.orderBy` — exactly as the generated `with:` clause does. The build is found
+* through the resolve info; pass `context` when it configures `scope`.
+*
 * Returns `undefined` when the selection asks for no relations, which is the value the
 * query builder wants for "no `with` clause".
 */
@@ -8865,11 +9043,16 @@ const selectionToWith = (info, options) => {
 	const { tables, relationMap, filterCtx } = contextFor(db);
 	if (!tables[table]) throw new Error(`Drizzle-GraphQL Error: '${table}' is not a table in the Drizzle schema.`);
 	if (!relationMap[table]) return;
+	const typeName = resolveObjectTypeName(table, typeNameMapper, resolveName);
+	const runtime = runtimeFor(info, db, typeName, "selectionToWith");
 	const parsed = parseInfo(info);
-	const params = extractRelationsParams(relationMap, tables, table, parsed, resolveObjectTypeName(table, typeNameMapper, resolveName), {
+	const params = extractRelationsParams(relationMap, tables, table, parsed, typeName, {
 		typeNameMapper,
-		filterCtx,
-		resolveName
+		filterCtx: runtime?.filterCtx ?? filterCtx,
+		resolveName,
+		scope: scopeFor(runtime, options, "selectionToWith"),
+		limits: runtime?.limits,
+		defaultOrderBy: runtime?.policies?.defaultOrderBy
 	});
 	return params && Object.keys(params).length ? params : void 0;
 };
@@ -8881,14 +9064,16 @@ const selectionToWith = (info, options) => {
 * This is what an override usually wants after it has done its own work:
 *
 * ```ts
-* const rows = await resolveSelection(info, { db, table: 'Users', where, executor: tx });
+* const rows = await resolveSelection(info, { db, table: 'Users', context, where, executor: tx });
 * ```
 *
 * Relation arguments and aggregate fields keep behaving as they do in the generated schema,
-* because it is the generated schema's own code path.
+* because it is the generated schema's own code path. So do the build's row policies: the
+* root table and every nested relation are scoped and soft-delete-filtered, and the limit
+* policy and default ordering apply. Pass `context` when the build configures `scope`.
 */
 const resolveSelection = async (info, options) => {
-	const { db, table: tableName, typeNameMapper, executor, single = false, where, orderBy, limit, offset, after } = options;
+	const { db, table: tableName, typeNameMapper, executor, single = false, where, orderBy, limit, offset, after, deleted } = options;
 	const resolveName = namingRuleOf(options);
 	const { tables, relationMap, filterCtx, primaryKeyOf } = contextFor(db);
 	const table = tables[tableName];
@@ -8898,25 +9083,34 @@ const resolveSelection = async (info, options) => {
 	const source = executor ?? db;
 	const queryBase = source.query?.[tableName];
 	if (!queryBase) throw new Error(`Drizzle-GraphQL Error: the executor passed to resolveSelection has no relational query builder for '${tableName}'.`);
+	const typeName = resolveObjectTypeName(tableName, typeNameMapper, resolveName);
+	const runtime = runtimeFor(info, db, typeName, "resolveSelection");
+	const scope = scopeFor(runtime, options, "resolveSelection");
+	const defaultOrderBy = runtime?.policies?.defaultOrderBy;
 	return runRelationalSelect({
 		queryBase,
 		tables,
 		tableName,
 		table,
 		relationMap,
-		typeName: resolveObjectTypeName(tableName, typeNameMapper, resolveName),
+		typeName,
 		typeNameMapper,
 		resolveName,
 		parsedInfo,
 		single,
 		where,
-		orderBy,
-		limit,
+		orderBy: withDefaultOrderBy({ orderBy }, tableName, defaultOrderBy).orderBy,
+		limit: single ? limit : applyLimitPolicy(limit, runtime?.limits?.(tableName)),
 		offset,
 		after,
-		filterCtx,
+		filterCtx: runtime?.filterCtx ?? filterCtx,
 		pkNames: primaryKeyOf(tableName),
-		db: source
+		db: source,
+		scope,
+		deleted,
+		limits: runtime?.limits,
+		defaultOrderBy,
+		nullOrdering: runtime?.nullOrdering
 	});
 };
 //#endregion