prisma-sql 1.75.12 → 1.76.1

package/dist/index.cjs

@@ -388,9 +388,6 @@ var SQL_KEYWORDS = /* @__PURE__ */ new Set([
 ]);
 var SQL_RESERVED_WORDS = SQL_KEYWORDS;
 var DEFAULT_WHERE_CLAUSE = "1=1";
-var SPECIAL_FIELDS = Object.freeze({
-  ID: "id"
-});
 var SQL_TEMPLATES = Object.freeze({
   PUBLIC_SCHEMA: "public",
   WHERE: "WHERE",
@@ -526,29 +523,6 @@ function hasRequiredKeywords(sql) {
   return hasSelect && hasFrom && upper.indexOf("SELECT") < upper.indexOf("FROM");
 }
 
-// src/builder/shared/errors.ts
-var SqlBuilderError = class extends Error {
-  constructor(message, code, context) {
-    super(message);
-    this.name = "SqlBuilderError";
-    this.code = code;
-    this.context = context;
-  }
-};
-function createError(message, ctx, code = "VALIDATION_ERROR") {
-  const parts = [message];
-  if (isNonEmptyArray(ctx.path)) {
-    parts.push(`Path: ${ctx.path.join(".")}`);
-  }
-  if (isNotNullish(ctx.modelName)) {
-    parts.push(`Model: ${ctx.modelName}`);
-  }
-  if (isNonEmptyArray(ctx.availableFields)) {
-    parts.push(`Available fields: ${ctx.availableFields.join(", ")}`);
-  }
-  return new SqlBuilderError(parts.join("\n"), code, ctx);
-}
-
 // src/builder/shared/validators/sql-validators.ts
 function isValidWhereClause(clause) {
   return isNotNullish(clause) && clause.trim().length > 0 && clause !== DEFAULT_WHERE_CLAUSE;
@@ -691,8 +665,11 @@ function needsQuoting(identifier) {
 }
 
 // src/builder/shared/sql-utils.ts
+var _a2;
+var IS_PRODUCTION2 = typeof process !== "undefined" && ((_a2 = process.env) == null ? void 0 : _a2.NODE_ENV) === "production";
 var COL_EXPR_CACHE = /* @__PURE__ */ new WeakMap();
 var COL_WITH_ALIAS_CACHE = /* @__PURE__ */ new WeakMap();
+var TABLE_REF_CACHE = /* @__PURE__ */ new Map();
 function containsControlChars(s) {
   for (let i = 0; i < s.length; i++) {
     const code = s.charCodeAt(i);
@@ -927,20 +904,33 @@ function buildTableReference(schemaName, tableName, dialect) {
       "buildTableReference: tableName is required and cannot be empty"
     );
   }
-  if (containsControlChars(tableName)) {
-    throw new Error(
-      "buildTableReference: tableName contains invalid characters"
-    );
-  }
   const d = dialect != null ? dialect : "postgres";
   if (d === "sqlite") {
-    return quote(tableName);
+    const cacheKey2 = `\0${tableName}\0sqlite`;
+    let cached2 = TABLE_REF_CACHE.get(cacheKey2);
+    if (cached2) return cached2;
+    if (containsControlChars(tableName)) {
+      throw new Error(
+        "buildTableReference: tableName contains invalid characters"
+      );
+    }
+    cached2 = quote(tableName);
+    TABLE_REF_CACHE.set(cacheKey2, cached2);
+    return cached2;
   }
   if (isEmptyString(schemaName)) {
     throw new Error(
       "buildTableReference: schemaName is required and cannot be empty"
     );
   }
+  const cacheKey = `${schemaName}\0${tableName}\0${d}`;
+  let cached = TABLE_REF_CACHE.get(cacheKey);
+  if (cached) return cached;
+  if (containsControlChars(tableName)) {
+    throw new Error(
+      "buildTableReference: tableName contains invalid characters"
+    );
+  }
   if (containsControlChars(schemaName)) {
     throw new Error(
       "buildTableReference: schemaName contains invalid characters"
@@ -948,9 +938,12 @@ function buildTableReference(schemaName, tableName, dialect) {
   }
   const safeSchema = schemaName.replace(/"/g, '""');
   const safeTable = tableName.replace(/"/g, '""');
-  return `"${safeSchema}"."${safeTable}"`;
+  cached = `"${safeSchema}"."${safeTable}"`;
+  TABLE_REF_CACHE.set(cacheKey, cached);
+  return cached;
 }
 function assertSafeAlias(alias) {
+  if (IS_PRODUCTION2) return;
   if (typeof alias !== "string") {
     throw new Error(`Invalid alias: expected string, got ${typeof alias}`);
   }
@@ -995,6 +988,7 @@ function assertSafeAlias(alias) {
   }
 }
 function assertSafeTableRef(tableRef) {
+  if (IS_PRODUCTION2) return;
   assertSafeQualifiedName(tableRef);
 }
 function normalizeKeyList(input) {
@@ -1025,7 +1019,7 @@ function normalizeField(field) {
   return field;
 }
 function getFieldIndices(model) {
-  var _a3;
+  var _a4;
   let cached = FIELD_INDICES_CACHE.get(model);
   if (cached) return cached;
   const scalarFields = /* @__PURE__ */ new Map();
@@ -1046,7 +1040,7 @@ function getFieldIndices(model) {
     } else {
       scalarFields.set(field.name, field);
       scalarNames.push(field.name);
-      const fieldType = String((_a3 = field.type) != null ? _a3 : "").toLowerCase();
+      const fieldType = String((_a4 = field.type) != null ? _a4 : "").toLowerCase();
       if (fieldType === "json") {
         jsonFields.add(field.name);
       }
@@ -1060,12 +1054,16 @@ function getFieldIndices(model) {
       quotedColumns.set(field.name, quote(columnName));
     }
   }
+  const scalarFieldSet = new Set(scalarNames);
+  const relationFieldSet = new Set(relationNames);
   cached = Object.freeze({
     scalarFields,
     relationFields,
     allFieldsByName,
     scalarNames,
     relationNames,
+    scalarFieldSet,
+    relationFieldSet,
     jsonFields,
     pkFields,
     columnMap,
@@ -1075,10 +1073,10 @@ function getFieldIndices(model) {
   return cached;
 }
 function getRelationFieldSet(model) {
-  return new Set(getFieldIndices(model).relationNames);
+  return getFieldIndices(model).relationFieldSet;
 }
 function getScalarFieldSet(model) {
-  return new Set(getFieldIndices(model).scalarNames);
+  return getFieldIndices(model).scalarFieldSet;
 }
 function getColumnMap(model) {
   return getFieldIndices(model).columnMap;
@@ -1113,6 +1111,34 @@ function maybeParseJson(value, jsonSet, fieldName) {
   }
 }
 
+// src/builder/shared/relation-key-utils.ts
+var RELATION_KEYS_CACHE = /* @__PURE__ */ new WeakMap();
+function computeRelationKeys(field, context) {
+  const fkFields = normalizeKeyList(field.foreignKey);
+  if (fkFields.length === 0) {
+    throw new Error(
+      `Relation '${field.name}' is missing foreignKey for ${context}`
+    );
+  }
+  const refs = normalizeKeyList(field.references);
+  const refFields = refs.length > 0 ? refs : fkFields.length === 1 ? ["id"] : [];
+  if (refFields.length !== fkFields.length) {
+    throw new Error(
+      `Relation '${field.name}' references count (${refFields.length}) doesn't match foreignKey count (${fkFields.length}) (context: ${context})`
+    );
+  }
+  const childKeys = field.isForeignKeyLocal ? refFields : fkFields;
+  const parentKeys = field.isForeignKeyLocal ? fkFields : refFields;
+  return { childKeys, parentKeys };
+}
+function resolveRelationKeys(field, context = "include") {
+  let cached = RELATION_KEYS_CACHE.get(field);
+  if (cached) return cached;
+  cached = computeRelationKeys(field, context);
+  RELATION_KEYS_CACHE.set(field, cached);
+  return cached;
+}
+
 // src/builder/joins.ts
 function isRelationField(fieldName, model) {
   return getRelationFieldSet(model).has(fieldName);
@@ -1131,38 +1157,14 @@ function isValidRelationField(field) {
   if (refs.length !== fk.length) return false;
   return true;
 }
-function getReferenceFieldNames(field, foreignKeyCount) {
-  const refs = normalizeKeyList(field.references);
-  if (refs.length === 0) {
-    if (foreignKeyCount === 1) return [SPECIAL_FIELDS.ID];
-    return [];
-  }
-  if (refs.length !== foreignKeyCount) return [];
-  return refs;
-}
 function joinCondition(field, parentModel, childModel, parentAlias, childAlias) {
   assertSafeAlias(parentAlias);
   assertSafeAlias(childAlias);
-  const fkFields = normalizeKeyList(field.foreignKey);
-  if (fkFields.length === 0) {
-    throw createError(
-      `Relation '${field.name}' is missing foreignKey. This indicates a schema parsing error. Relations must specify fields/references.`,
-      { field: field.name }
-    );
-  }
-  const refFields = getReferenceFieldNames(field, fkFields.length);
-  if (refFields.length !== fkFields.length) {
-    throw createError(
-      `Relation '${field.name}' is missing references (or references count does not match foreignKey count). This is required to support non-id and composite keys.`,
-      { field: field.name }
-    );
-  }
+  const { childKeys, parentKeys } = resolveRelationKeys(field, "include");
   const parts = [];
-  for (let i = 0; i < fkFields.length; i++) {
-    const fk = fkFields[i];
-    const ref = refFields[i];
-    const left = field.isForeignKeyLocal ? `${childAlias}.${quoteColumn(childModel, ref)}` : `${childAlias}.${quoteColumn(childModel, fk)}`;
-    const right = field.isForeignKeyLocal ? `${parentAlias}.${quoteColumn(parentModel, fk)}` : `${parentAlias}.${quoteColumn(parentModel, ref)}`;
+  for (let i = 0; i < parentKeys.length; i++) {
+    const left = field.isForeignKeyLocal ? `${childAlias}.${quoteColumn(childModel, childKeys[i])}` : `${childAlias}.${quoteColumn(childModel, childKeys[i])}`;
+    const right = field.isForeignKeyLocal ? `${parentAlias}.${quoteColumn(parentModel, parentKeys[i])}` : `${parentAlias}.${quoteColumn(parentModel, parentKeys[i])}`;
     parts.push(`${left} = ${right}`);
   }
   return parts.length === 1 ? parts[0] : `(${parts.join(" AND ")})`;
@@ -1171,13 +1173,13 @@ function getModelByName(schemas, name) {
   return schemas.find((m) => m.name === name);
 }
 function normalizeIntLike(name, v, opts = {}) {
-  var _a3, _b;
+  var _a4, _b;
   if (!isNotNullish(v)) return void 0;
   if (schemaParser.isDynamicParameter(v)) return v;
   if (typeof v !== "number" || !Number.isFinite(v) || !Number.isInteger(v)) {
     throw new Error(`${name} must be an integer`);
   }
-  const min = (_a3 = opts.min) != null ? _a3 : 0;
+  const min = (_a4 = opts.min) != null ? _a4 : 0;
   const allowZero = (_b = opts.allowZero) != null ? _b : true;
   if (!allowZero && v === 0) {
     throw new Error(`${name} must be > 0`);
@@ -1323,6 +1325,14 @@ function reverseOrderByInput(orderBy) {
 var normalizePairs = (pairs, parseValue) => {
   const result = [];
   for (const [field, rawValue] of pairs) {
+    if (typeof rawValue === "string") {
+      const lower = rawValue.toLowerCase();
+      if (lower !== "asc" && lower !== "desc") {
+        throw new Error(
+          `Invalid orderBy direction '${rawValue}' for field '${field}'. Must be 'asc' or 'desc'`
+        );
+      }
+    }
     if (!isScalarOrderByValue(rawValue)) continue;
     const parsed = parseValue(rawValue, field);
     result.push({
@@ -1404,6 +1414,29 @@ function ensureDeterministicOrderByInput(args) {
   return addTiebreaker(orderBy, tiebreaker);
 }
 
+// src/builder/shared/errors.ts
+var SqlBuilderError = class extends Error {
+  constructor(message, code, context) {
+    super(message);
+    this.name = "SqlBuilderError";
+    this.code = code;
+    this.context = context;
+  }
+};
+function createError(message, ctx, code = "VALIDATION_ERROR") {
+  const parts = [message];
+  if (isNonEmptyArray(ctx.path)) {
+    parts.push(`Path: ${ctx.path.join(".")}`);
+  }
+  if (isNotNullish(ctx.modelName)) {
+    parts.push(`Model: ${ctx.modelName}`);
+  }
+  if (isNonEmptyArray(ctx.availableFields)) {
+    parts.push(`Available fields: ${ctx.availableFields.join(", ")}`);
+  }
+  return new SqlBuilderError(parts.join("\n"), code, ctx);
+}
+
 // src/builder/shared/primary-key-utils.ts
 var FIELD_BY_NAME_CACHE = /* @__PURE__ */ new WeakMap();
 function normalizeField2(field) {
@@ -1688,7 +1721,7 @@ function assertCursorAndOrderFieldsScalar(model, cursor, orderEntries) {
   }
 }
 function buildCursorCondition(cursor, orderBy, tableName, alias, params, dialect, model) {
-  var _a3;
+  var _a4;
   assertSafeTableRef(tableName);
   assertSafeAlias(alias);
   const d = dialect != null ? dialect : getGlobalDialect();
@@ -1783,7 +1816,7 @@ function buildCursorCondition(cursor, orderBy, tableName, alias, params, dialect
     const e = finalOrderEntries[level];
     const c = col(alias, e.field, model);
     const cursorField = cteName + "." + quoteColumn(model, e.field);
-    const nulls = (_a3 = e.nulls) != null ? _a3 : defaultNullsFor(d, e.direction);
+    const nulls = (_a4 = e.nulls) != null ? _a4 : defaultNullsFor(d, e.direction);
     andParts.push(buildCursorInequalityExpr(c, e.direction, nulls, cursorField));
     orClauses.push("(" + andParts.join(SQL_SEPARATORS.CONDITION_AND) + ")");
   }
@@ -1903,34 +1936,6 @@ function createAliasGenerator(maxAliases = 1e4) {
   };
 }
 
-// src/builder/shared/relation-key-utils.ts
-var RELATION_KEYS_CACHE = /* @__PURE__ */ new WeakMap();
-function computeRelationKeys(field, context) {
-  const fkFields = normalizeKeyList(field.foreignKey);
-  if (fkFields.length === 0) {
-    throw new Error(
-      `Relation '${field.name}' is missing foreignKey for ${context}`
-    );
-  }
-  const refs = normalizeKeyList(field.references);
-  const refFields = refs.length > 0 ? refs : fkFields.length === 1 ? ["id"] : [];
-  if (refFields.length !== fkFields.length) {
-    throw new Error(
-      `Relation '${field.name}' references count (${refFields.length}) doesn't match foreignKey count (${fkFields.length}) (context: ${context})`
-    );
-  }
-  const childKeys = field.isForeignKeyLocal ? refFields : fkFields;
-  const parentKeys = field.isForeignKeyLocal ? fkFields : refFields;
-  return { childKeys, parentKeys };
-}
-function resolveRelationKeys(field, context = "include") {
-  let cached = RELATION_KEYS_CACHE.get(field);
-  if (cached) return cached;
-  cached = computeRelationKeys(field, context);
-  RELATION_KEYS_CACHE.set(field, cached);
-  return cached;
-}
-
 // src/builder/shared/fk-join-utils.ts
 var FK_COLUMN_PREFIX = "__fk";
 function fkColumnName(index) {
@@ -2116,7 +2121,7 @@ function resolveCountRelationOrThrow(relName, model, schemaByName) {
       `_count.${relName} references unknown relation on model ${model.name}`
     );
   }
-  const field = model.fields.find((f) => f.name === relName);
+  const field = getFieldIndices(model).allFieldsByName.get(relName);
   if (!field) {
     throw new Error(
       `_count.${relName} references unknown relation on model ${model.name}`
@@ -2193,12 +2198,11 @@ function buildCountJoinAndPair(args) {
     pairSql: `${sqlStringLiteral(args.relName)}, COALESCE(${joinAlias}.${COUNT_COLUMN}, 0)`
   };
 }
-function buildRelationCountSql(countSelect, model, schemas, parentAlias, _params, dialect) {
+function buildRelationCountSql(countSelect, model, schemas, parentAlias, _params, dialect, modelMap) {
   const joins = [];
   const pairs = [];
   const aliasGen = createAliasGenerator();
-  const schemaByName = /* @__PURE__ */ new Map();
-  for (const m of schemas) schemaByName.set(m.name, m);
+  const schemaByName = modelMap != null ? modelMap : new Map(schemas.map((m) => [m.name, m]));
   for (const [relName, shouldCount] of Object.entries(countSelect)) {
     if (!shouldCount) continue;
     const resolved = resolveCountRelationOrThrow(relName, model, schemaByName);
@@ -2272,14 +2276,23 @@ function extractNestedIncludeSpec(relArgs, relModel) {
 }
 
 // src/builder/shared/include-tree-walker.ts
-function resolveIncludeRelations(includeSpec, model, schemas) {
-  const modelMap = new Map(schemas.map((m) => [m.name, m]));
+var MODEL_MAP_CACHE = /* @__PURE__ */ new WeakMap();
+function getOrCreateModelMap(schemas) {
+  let map = MODEL_MAP_CACHE.get(schemas);
+  if (map) return map;
+  map = /* @__PURE__ */ new Map();
+  for (const m of schemas) map.set(m.name, m);
+  MODEL_MAP_CACHE.set(schemas, map);
+  return map;
+}
+function resolveIncludeRelations(includeSpec, model, schemas, modelMap) {
+  const map = modelMap != null ? modelMap : getOrCreateModelMap(schemas);
   const results = [];
   for (const [relName, value] of Object.entries(includeSpec)) {
     if (value === false) continue;
-    const field = model.fields.find((f) => f.name === relName);
+    const field = getFieldIndices(model).allFieldsByName.get(relName);
     if (!(field == null ? void 0 : field.isRelation) || !field.relatedModel) continue;
-    const relModel = modelMap.get(field.relatedModel);
+    const relModel = map.get(field.relatedModel);
     if (!relModel) continue;
     const isList = typeof field.type === "string" && field.type.endsWith("[]");
     const nestedSpec = isPlainObject(value) ? extractNestedIncludeSpec(value, relModel) : {};
@@ -2294,8 +2307,6 @@ function resolveIncludeRelations(includeSpec, model, schemas) {
   }
   return results;
 }
-
-// src/builder/select/strategy-estimator.ts
 var globalRelationStats;
 var globalRoundtripRowEquivalent = 73;
 var CORRELATED_S_BOUNDED = 0.5;
@@ -2304,7 +2315,7 @@ var CORRELATED_WHERE_PENALTY = 3;
 var DEFAULT_FAN = 10;
 var DEFAULT_PARENT_COUNT = 50;
 var MIN_STATS_COVERAGE = 0.1;
-var SINGLE_PARENT_MAX_FLAT_JOIN_DEPTH = 1;
+var SINGLE_PARENT_MAX_FLAT_JOIN_DEPTH = 2;
 function setRoundtripRowEquivalent(value) {
   globalRoundtripRowEquivalent = value;
 }
@@ -2324,11 +2335,14 @@ function getFanOut(modelName, relName) {
   if (!relStat || relStat.coverage < MIN_STATS_COVERAGE) return DEFAULT_FAN;
   return relStat.avg;
 }
+var DYNAMIC_TAKE_ESTIMATE = 10;
 function readTake(relArgs) {
   if (!isPlainObject(relArgs)) return Infinity;
   const obj = relArgs;
   if ("take" in obj && typeof obj.take === "number" && obj.take > 0)
     return obj.take;
+  if ("take" in obj && obj.take != null && schemaParser.isDynamicParameter(obj.take))
+    return DYNAMIC_TAKE_ESTIMATE;
   return Infinity;
 }
 function hasWhereClause(relArgs) {
@@ -2342,17 +2356,28 @@ function isListField(field) {
 function hasPaginationArgs(value) {
   if (!isPlainObject(value)) return false;
   const obj = value;
-  return "take" in obj && obj.take != null || "skip" in obj && typeof obj.skip === "number" && obj.skip > 0;
+  return "take" in obj && obj.take != null || "skip" in obj && obj.skip != null && (typeof obj.skip === "number" && obj.skip > 0 || schemaParser.isDynamicParameter(obj.skip));
 }
-function buildCostTree(includeSpec, model, schemas, depth = 0) {
+function buildCostTree(includeSpec, model, schemas, depth = 0, modelMap) {
   if (depth > LIMITS.MAX_INCLUDE_DEPTH) return [];
-  const relations = resolveIncludeRelations(includeSpec, model, schemas);
+  const relations = resolveIncludeRelations(
+    includeSpec,
+    model,
+    schemas,
+    modelMap
+  );
   const nodes = [];
   for (const rel of relations) {
     const fan = rel.isList ? getFanOut(model.name, rel.relName) : 1;
     const take = rel.isList ? readTake(rel.value) : 1;
     const eff = Math.min(fan, take);
-    const children = Object.keys(rel.nestedSpec).length > 0 ? buildCostTree(rel.nestedSpec, rel.relModel, schemas, depth + 1) : [];
+    const children = Object.keys(rel.nestedSpec).length > 0 ? buildCostTree(
+      rel.nestedSpec,
+      rel.relModel,
+      schemas,
+      depth + 1,
+      modelMap
+    ) : [];
     nodes.push({
       name: rel.relName,
       fan,
@@ -2416,17 +2441,23 @@ function computeCorrelatedCost(nodes, parentCount) {
   return R + parentCount * subqueryCost(nodes);
 }
 function hasOnlyToOneRelations(includeSpec, model) {
+  const indices = getFieldIndices(model);
   for (const [relName, value] of Object.entries(includeSpec)) {
     if (value === false) continue;
-    const field = model.fields.find((f) => f.name === relName);
+    const field = indices.allFieldsByName.get(relName);
     if (!(field == null ? void 0 : field.isRelation)) continue;
     if (isListField(field)) return false;
   }
   return true;
 }
-function countIncludeDepth(includeSpec, model, schemas, depth = 0) {
+function countIncludeDepth(includeSpec, model, schemas, depth = 0, modelMap) {
   if (depth > LIMITS.MAX_INCLUDE_DEPTH) return 0;
-  const relations = resolveIncludeRelations(includeSpec, model, schemas);
+  const relations = resolveIncludeRelations(
+    includeSpec,
+    model,
+    schemas,
+    modelMap
+  );
   let maxDepth = 0;
   for (const rel of relations) {
     let childDepth = 1;
@@ -2435,27 +2466,34 @@ function countIncludeDepth(includeSpec, model, schemas, depth = 0) {
         rel.nestedSpec,
         rel.relModel,
         schemas,
-        depth + 1
+        depth + 1,
+        modelMap
       );
     }
     if (childDepth > maxDepth) maxDepth = childDepth;
   }
   return maxDepth;
 }
-function hasChildPaginationAnywhere(includeSpec, model, schemas, depth = 0) {
+function hasChildPaginationAnywhere(includeSpec, model, schemas, depth = 0, modelMap) {
   if (depth > LIMITS.MAX_INCLUDE_DEPTH) return false;
   for (const [, value] of Object.entries(includeSpec)) {
     if (value === false) continue;
     if (hasPaginationArgs(value)) return true;
   }
-  const relations = resolveIncludeRelations(includeSpec, model, schemas);
+  const relations = resolveIncludeRelations(
+    includeSpec,
+    model,
+    schemas,
+    modelMap
+  );
   for (const rel of relations) {
     if (Object.keys(rel.nestedSpec).length > 0) {
       if (hasChildPaginationAnywhere(
         rel.nestedSpec,
         rel.relModel,
         schemas,
-        depth + 1
+        depth + 1,
+        modelMap
       )) {
         return true;
       }
@@ -2464,7 +2502,17 @@ function hasChildPaginationAnywhere(includeSpec, model, schemas, depth = 0) {
   return false;
 }
 function pickIncludeStrategy(params) {
-  const { includeSpec, model, schemas, method, takeValue, canFlatJoin, debug } = params;
+  const {
+    includeSpec,
+    model,
+    schemas,
+    method,
+    takeValue,
+    canFlatJoin,
+    hasChildPagination,
+    debug,
+    modelMap
+  } = params;
   if (Object.keys(includeSpec).length === 0) return "where-in";
   if (canFlatJoin && hasOnlyToOneRelations(includeSpec, model)) {
     if (debug)
@@ -2473,7 +2521,7 @@ function pickIncludeStrategy(params) {
   }
   const isSingleParent = method === "findFirst" || method === "findUnique";
   if (isSingleParent && canFlatJoin) {
-    const depth = countIncludeDepth(includeSpec, model, schemas);
+    const depth = countIncludeDepth(includeSpec, model, schemas, 0, modelMap);
     if (depth <= SINGLE_PARENT_MAX_FLAT_JOIN_DEPTH) {
       if (debug)
         console.log(
@@ -2482,8 +2530,37 @@ function pickIncludeStrategy(params) {
       return "flat-join";
     }
   }
-  const costTree = buildCostTree(includeSpec, model, schemas);
+  const costTree = buildCostTree(includeSpec, model, schemas, 0, modelMap);
   const treeDepth = maxDepthFromTree(costTree);
+  if (hasChildPagination && treeDepth >= 2) {
+    if (debug)
+      console.log(
+        `  [strategy] ${model.name}: childPagination + depth=${treeDepth} \u2265 2 \u2192 fallback`
+      );
+    return "fallback";
+  }
+  if (hasChildPagination && treeDepth === 1) {
+    if (anyChildHasWhere(costTree)) {
+      if (debug)
+        console.log(
+          `  [strategy] ${model.name}: childPagination + depth=1 + childWhere \u2192 where-in`
+        );
+      return "where-in";
+    }
+    const hasSelectNarrowing = isPlainObject(params.args) && isPlainObject(params.args.select);
+    if (hasSelectNarrowing) {
+      if (debug)
+        console.log(
+          `  [strategy] ${model.name}: childPagination + depth=1 + selectNarrowing \u2192 fallback`
+        );
+      return "fallback";
+    }
+    if (debug)
+      console.log(
+        `  [strategy] ${model.name}: childPagination + depth=1 \u2192 where-in`
+      );
+    return "where-in";
+  }
   if (treeDepth === 1 && anyChildHasWhere(costTree)) {
     if (debug)
       console.log(`  [strategy] ${model.name}: depth-1 + childWhere \u2192 where-in`);
@@ -2561,13 +2638,13 @@ function createAliasCounter() {
     }
   };
 }
-function getRelationModel(parentModel, relationName, schemas) {
+function getRelationModel(parentModel, relationName, schemas, modelMap) {
   const indices = getFieldIndices(parentModel);
   const field = indices.allFieldsByName.get(relationName);
   if (!(field == null ? void 0 : field.isRelation) || !field.relatedModel) {
     throw new Error(`Invalid relation ${relationName} on ${parentModel.name}`);
   }
-  const relModel = schemas.find((m) => m.name === field.relatedModel);
+  const relModel = modelMap ? modelMap.get(field.relatedModel) : schemas.find((m) => m.name === field.relatedModel);
   if (!relModel) {
     throw new Error(`Related model ${field.relatedModel} not found`);
   }
@@ -2604,8 +2681,13 @@ function countActiveEntries(spec) {
   }
   return count;
 }
-function canUseFlatJoinForAll(includeSpec, model, schemas, debug) {
-  const relations = resolveIncludeRelations(includeSpec, model, schemas);
+function canUseFlatJoinForAll(includeSpec, model, schemas, debug, modelMap) {
+  const relations = resolveIncludeRelations(
+    includeSpec,
+    model,
+    schemas,
+    modelMap
+  );
   if (relations.length < countActiveEntries(includeSpec)) {
     return false;
   }
@@ -2627,14 +2709,20 @@ function canUseFlatJoinForAll(includeSpec, model, schemas, debug) {
       return false;
     }
     if (Object.keys(rel.nestedSpec).length > 0) {
-      if (!canUseFlatJoinForAll(rel.nestedSpec, rel.relModel, schemas)) {
+      if (!canUseFlatJoinForAll(
+        rel.nestedSpec,
+        rel.relModel,
+        schemas,
+        debug,
+        modelMap
+      )) {
         return false;
       }
     }
   }
   return true;
 }
-function buildNestedJoins(parentModel, parentAlias, includeSpec, schemas, dialect, prefix, aliasCounter, depth = 0) {
+function buildNestedJoins(parentModel, parentAlias, includeSpec, schemas, dialect, prefix, aliasCounter, depth = 0, modelMap) {
   if (depth > LIMITS.MAX_NESTED_JOIN_DEPTH) {
     throw new Error(
       `Nested joins exceeded maximum depth of ${LIMITS.MAX_NESTED_JOIN_DEPTH} at prefix '${prefix}'`
@@ -2648,7 +2736,7 @@ function buildNestedJoins(parentModel, parentAlias, includeSpec, schemas, dialec
     const indices = getFieldIndices(parentModel);
     const field = indices.allFieldsByName.get(relName);
     if (!isValidRelationField(field)) continue;
-    const relModel = getRelationModel(parentModel, relName, schemas);
+    const relModel = getRelationModel(parentModel, relName, schemas, modelMap);
     const relTable = buildTableReference(
       SQL_TEMPLATES.PUBLIC_SCHEMA,
       relModel.tableName,
@@ -2689,7 +2777,8 @@ function buildNestedJoins(parentModel, parentAlias, includeSpec, schemas, dialec
         dialect,
         nestedPrefix,
         aliasCounter,
-        depth + 1
+        depth + 1,
+        modelMap
       );
       joins.push(...deeper.joins);
       selects.push(...deeper.selects);
@@ -2745,6 +2834,8 @@ function buildFlatJoinSql(spec) {
     requiresReduction: false,
     includeSpec: {}
   };
+  const modelMap = /* @__PURE__ */ new Map();
+  for (const m of schemas) modelMap.set(m.name, m);
   const includeSpec = extractRelationEntries(args, model).reduce(
     (acc, { name, value }) => {
       acc[name] = value;
@@ -2755,7 +2846,7 @@ function buildFlatJoinSql(spec) {
   if (Object.keys(includeSpec).length === 0) {
     return emptyResult;
   }
-  if (!canUseFlatJoinForAll(includeSpec, model, schemas)) {
+  if (!canUseFlatJoinForAll(includeSpec, model, schemas, false, modelMap)) {
     return emptyResult;
   }
   const { cleanWhere, params } = extractReferencedParams(
@@ -2791,7 +2882,8 @@ function buildFlatJoinSql(spec) {
     dialect,
     "",
     aliasCounter,
-    0
+    0,
+    modelMap
   );
   if (built.joins.length === 0) {
     return emptyResult;
@@ -3795,8 +3887,8 @@ function buildOperator(expr, op, val, ctx, mode, fieldType) {
   });
 }
 var MAX_PARAM_INDEX = Number.MAX_SAFE_INTEGER - 1e3;
-var _a2;
-var IS_PRODUCTION2 = typeof process !== "undefined" && ((_a2 = process.env) == null ? void 0 : _a2.NODE_ENV) === "production";
+var _a3;
+var IS_PRODUCTION3 = typeof process !== "undefined" && ((_a3 = process.env) == null ? void 0 : _a3.NODE_ENV) === "production";
 function assertSameLength(params, mappings) {
   if (params.length !== mappings.length) {
     throw new Error(
@@ -3856,7 +3948,7 @@ function validateMappings(mappings) {
   }
 }
 function validateState(params, mappings, index) {
-  if (IS_PRODUCTION2) {
+  if (IS_PRODUCTION3) {
     assertSameLength(params, mappings);
     assertValidNextIndex(index);
     return;
@@ -3914,6 +4006,7 @@ function createStoreInternal(startIndex, dialect, initialParams = [], initialMap
     if (frozen) {
       params = params.slice();
       mappings = mappings.slice();
+      dynamicNameToIndex = new Map(dynamicNameToIndex);
       frozen = false;
     }
   }
@@ -3930,6 +4023,7 @@ function createStoreInternal(startIndex, dialect, initialParams = [], initialMap
     const dn = validateDynamicName(dynamicName);
     const existing = dynamicNameToIndex.get(dn);
     if (existing !== void 0) return formatPosition(existing);
+    ensureMutable();
     const position = index;
     dynamicNameToIndex.set(dn, position);
     return registerParam(void 0, { index: position, dynamicName: dn });
@@ -3960,7 +4054,7 @@ function createStoreInternal(startIndex, dialect, initialParams = [], initialMap
       index,
       params,
       mappings,
-      dynamicNameIndex: new Map(dynamicNameToIndex)
+      dynamicNameIndex: dynamicNameToIndex
     };
     cachedSnapshot = snap;
     dirty = false;
@@ -4015,10 +4109,10 @@ function toPublicResult(clause, joins, params) {
 
 // src/builder/where.ts
 function buildWhereClause(where, options) {
-  var _a3, _b, _c, _d, _e;
+  var _a4, _b, _c, _d, _e;
   assertSafeAlias(options.alias);
   const dialect = options.dialect || getGlobalDialect();
-  const params = (_a3 = options.params) != null ? _a3 : createParamStore(1, dialect);
+  const params = (_a4 = options.params) != null ? _a4 : createParamStore(1, dialect);
   const ctx = {
     alias: options.alias,
     model: options.model,
@@ -4101,12 +4195,13 @@ function reindexWhereParams(whereClause, specParams, collector) {
   }
   return clean;
 }
-function getRelationModel2(parentModel, relationName, schemas) {
-  var _a3;
+function getRelationModel2(parentModel, relationName, schemas, modelMap) {
+  var _a4, _b;
   const indices = getFieldIndices(parentModel);
   const field = indices.allFieldsByName.get(relationName);
   if (!(field == null ? void 0 : field.isRelation) || !field.relatedModel) return null;
-  return (_a3 = schemas.find((m) => m.name === field.relatedModel)) != null ? _a3 : null;
+  if (modelMap) return (_a4 = modelMap.get(field.relatedModel)) != null ? _a4 : null;
+  return (_b = schemas.find((m) => m.name === field.relatedModel)) != null ? _b : null;
 }
 function extractOrderByInput(relArgs) {
   if (!isPlainObject(relArgs)) return void 0;
@@ -4151,7 +4246,12 @@ function buildLateralForRelation(relationName, relArgs, field, relModel, parentM
     const nestedIndices = getFieldIndices(relModel);
     const nestedField = nestedIndices.allFieldsByName.get(nestedName);
     if (!nestedField || !isValidRelationField(nestedField)) continue;
-    const nestedModel = getRelationModel2(relModel, nestedName, ctx.schemas);
+    const nestedModel = getRelationModel2(
+      relModel,
+      nestedName,
+      ctx.schemas,
+      ctx.modelMap
+    );
     if (!nestedModel) continue;
     const nested = buildLateralForRelation(
       nestedName,
@@ -4254,12 +4354,12 @@ function buildLateralForRelation(relationName, relArgs, field, relModel, parentM
   }
   const joinSql = `LEFT JOIN LATERAL (${outerSql}) ${latAlias} ON true`;
   const fieldTypes = selectedFields.map((fieldName) => {
-    var _a3;
+    var _a4;
     const f = indices.scalarFields.get(fieldName);
     if (!f) return null;
     return {
       fieldName: f.name,
-      type: String((_a3 = f.type) != null ? _a3 : "").toLowerCase()
+      type: String((_a4 = f.type) != null ? _a4 : "").toLowerCase()
     };
   }).filter(Boolean);
   const meta = {
@@ -4277,8 +4377,13 @@ function countActiveEntries2(spec) {
   }
   return count;
 }
-function canUseLateralJoin(includeSpec, parentModel, schemas) {
-  const relations = resolveIncludeRelations(includeSpec, parentModel, schemas);
+function canUseLateralJoin(includeSpec, parentModel, schemas, modelMap) {
+  const relations = resolveIncludeRelations(
+    includeSpec,
+    parentModel,
+    schemas,
+    modelMap
+  );
   if (relations.length < countActiveEntries2(includeSpec)) {
     return false;
   }
@@ -4287,14 +4392,14 @@ function canUseLateralJoin(includeSpec, parentModel, schemas) {
     if (!keys || keys.childKeys.length === 0 || keys.parentKeys.length === 0)
       return false;
     if (Object.keys(rel.nestedSpec).length > 0) {
-      if (!canUseLateralJoin(rel.nestedSpec, rel.relModel, schemas))
+      if (!canUseLateralJoin(rel.nestedSpec, rel.relModel, schemas, modelMap))
         return false;
     }
   }
   return true;
 }
 function buildLateralJoinSql(spec) {
-  var _a3;
+  var _a4;
   const {
     from,
     whereClause,
@@ -4314,6 +4419,8 @@ function buildLateralJoinSql(spec) {
     isLateral: false,
     lateralMeta: []
   };
+  const modelMap = /* @__PURE__ */ new Map();
+  for (const m of schemas) modelMap.set(m.name, m);
   const entries = extractRelationEntries(args, model);
   const includeSpec = {};
   for (const e of entries) {
@@ -4340,7 +4447,8 @@ function buildLateralJoinSql(spec) {
     schemas,
     dialect,
     aliasCounter,
-    collector
+    collector,
+    modelMap
   };
   const lateralJoins = [];
   const lateralSelects = [];
@@ -4350,7 +4458,7 @@ function buildLateralJoinSql(spec) {
     const indices = getFieldIndices(model);
     const field = indices.allFieldsByName.get(relName);
     if (!field || !isValidRelationField(field)) continue;
-    const relModel = getRelationModel2(model, relName, schemas);
+    const relModel = getRelationModel2(model, relName, schemas, modelMap);
     if (!relModel) continue;
     const result = buildLateralForRelation(
       relName,
@@ -4368,7 +4476,7 @@ function buildLateralJoinSql(spec) {
     lateralMeta.push(result.meta);
   }
   if (lateralJoins.length === 0) return emptyResult;
-  const baseSelect = ((_a3 = spec.select) != null ? _a3 : "").trim();
+  const baseSelect = ((_a4 = spec.select) != null ? _a4 : "").trim();
   const allSelects = [baseSelect, ...lateralSelects].filter((s) => s && s.trim().length > 0).join(", ");
   if (!allSelects) {
     return emptyResult;
@@ -4488,9 +4596,9 @@ function renderOrderBySimple(entries, alias) {
   return out.join(SQL_SEPARATORS.ORDER_BY);
 }
 function ensureIdTiebreakerEntries(entries, model) {
-  var _a3, _b;
-  const idField = (_b = (_a3 = model == null ? void 0 : model.fields) == null ? void 0 : _a3.find) == null ? void 0 : _b.call(
-    _a3,
+  var _a4, _b;
+  const idField = (_b = (_a4 = model == null ? void 0 : model.fields) == null ? void 0 : _a4.find) == null ? void 0 : _b.call(
+    _a4,
     (f) => f.name === DEFAULT_PRIMARY_KEY2 && !f.isRelation
   );
   if (!idField) return entries;
@@ -4532,14 +4640,14 @@ function buildJoinsSql(...joinGroups) {
   return all.length > 0 ? " " + all.join(" ") : "";
 }
 function buildSqliteDistinctQuery(spec, selectWithIncludes, countJoins) {
-  var _a3, _b;
+  var _a4, _b;
   const { includes, from, whereClause, whereJoins, distinct, model } = spec;
   if (!isNotNullish(distinct) || !isNonEmptyArray(distinct)) {
     throw new Error("buildSqliteDistinctQuery requires distinct fields");
   }
   const scalarNames = parseSimpleScalarSelect(spec.select, from.alias);
   const includeNames = includes.map((i) => i.name);
-  const hasCount = Boolean((_b = (_a3 = spec.args) == null ? void 0 : _a3.select) == null ? void 0 : _b[COUNT_SELECT_KEY]);
+  const hasCount = Boolean((_b = (_a4 = spec.args) == null ? void 0 : _a4.select) == null ? void 0 : _b[COUNT_SELECT_KEY]);
   const outerSelectCols = buildOutputColumns(
     scalarNames,
     includeNames,
@@ -4639,12 +4747,12 @@ function resolveCountSelect(countSelectRaw, model) {
   return null;
 }
 function buildIncludeColumns(spec) {
-  var _a3, _b, _c, _d, _e;
+  var _a4, _b, _c, _d, _e;
   const { select, includes, dialect, model, schemas, from, params } = spec;
   const baseSelect = (select != null ? select : "").trim();
   let countCols = "";
   let countJoins = [];
-  const countSelectRaw = (_e = (_b = (_a3 = spec.args) == null ? void 0 : _a3.select) == null ? void 0 : _b[COUNT_SELECT_KEY]) != null ? _e : (_d = (_c = spec.args) == null ? void 0 : _c.include) == null ? void 0 : _d[COUNT_SELECT_KEY];
+  const countSelectRaw = (_e = (_b = (_a4 = spec.args) == null ? void 0 : _a4.select) == null ? void 0 : _b[COUNT_SELECT_KEY]) != null ? _e : (_d = (_c = spec.args) == null ? void 0 : _c.include) == null ? void 0 : _d[COUNT_SELECT_KEY];
   if (countSelectRaw) {
     const resolvedCountSelect = resolveCountSelect(countSelectRaw, model);
     if (resolvedCountSelect && Object.keys(resolvedCountSelect).length > 0) {
@@ -4826,16 +4934,33 @@ function constructFinalSql(spec) {
   isNotNullish(pagination.take);
   const takeValue = typeof pagination.take === "number" ? pagination.take : null;
   if (dialect === "postgres" && hasIncludes) {
-    const canFlatJoin = canUseFlatJoinForAll(includeSpec, model, schemas);
-    canUseLateralJoin(includeSpec, model, schemas);
-    hasChildPaginationAnywhere(includeSpec, model, schemas);
+    const modelMap = getOrCreateModelMap(schemas);
+    const canFlatJoin = canUseFlatJoinForAll(
+      includeSpec,
+      model,
+      schemas,
+      false,
+      modelMap
+    );
+    canUseLateralJoin(includeSpec, model, schemas, modelMap);
+    const hasChildPag = hasChildPaginationAnywhere(
+      includeSpec,
+      model,
+      schemas,
+      0,
+      modelMap
+    );
     const strategy = pickIncludeStrategy({
       includeSpec,
       model,
       schemas,
       method,
+      args,
       takeValue,
-      canFlatJoin});
+      canFlatJoin,
+      hasChildPagination: hasChildPag,
+      modelMap
+    });
     if (strategy === "flat-join") {
       const flatResult = buildFlatJoinSql(spec);
       if (flatResult.sql) {
@@ -4958,8 +5083,8 @@ function buildDefaultScalarFields(model, alias) {
   return out;
 }
 function getDefaultSelectCached(model, alias) {
-  var _a3;
-  return (_a3 = DEFAULT_SELECT_CACHE.get(model)) == null ? void 0 : _a3.get(alias);
+  var _a4;
+  return (_a4 = DEFAULT_SELECT_CACHE.get(model)) == null ? void 0 : _a4.get(alias);
 }
 function cacheDefaultSelect(model, alias, sql) {
   let cache = DEFAULT_SELECT_CACHE.get(model);
@@ -5241,7 +5366,8 @@ function buildSelectWithNestedIncludes(relArgs, relModel, relAlias, ctx) {
       ctx.schemas,
       relAlias,
       ctx.params,
-      ctx.dialect
+      ctx.dialect,
+      ctx.schemaByName
     );
     if (!countBuild.jsonPairs) return baseSelect2;
     countJoins.push(...countBuild.joins);
@@ -5629,7 +5755,9 @@ function resolveTableRef(model, dialect) {
   return buildTableReference(schema, tableName, dialect);
 }
 function findRelationField(model, fieldName) {
-  return model.fields.find((f) => f.name === fieldName && f.isRelation);
+  const field = getFieldIndices(model).allFieldsByName.get(fieldName);
+  if (!field || !field.isRelation) return void 0;
+  return field;
 }
 function nextJoinAlias(ctx) {
   let alias;
@@ -5656,7 +5784,7 @@ function resolveRelationOrderByChain(relationFieldName, value, currentModel, cur
       `Relation field '${relationFieldName}' not found on model ${currentModel.name}`
     );
   }
-  const relatedModel = getModelByName(ctx.schemas, field.relatedModel);
+  const relatedModel = ctx.modelMap.get(field.relatedModel);
   if (!relatedModel) {
     throw new Error(
       `Related model '${field.relatedModel}' not found for relation '${relationFieldName}'`
@@ -5722,12 +5850,14 @@ function buildOrderByWithRelations(orderBy, alias, dialect, model, schemas) {
   const relationSet = getRelationFieldSet(model);
   const scalarSet = getScalarFieldSet(model);
   const orderFragments = [];
+  const modelMap = /* @__PURE__ */ new Map();
+  for (const m of schemas) modelMap.set(m.name, m);
   const ctx = {
-    schemas,
     dialect,
     joins: [],
     usedAliases: /* @__PURE__ */ new Set(),
-    aliasCounter: { value: 0 }
+    aliasCounter: { value: 0 },
+    modelMap
   };
   for (const [fieldName, value] of expanded) {
     if (scalarSet.has(fieldName)) {
@@ -5782,11 +5912,11 @@ function mapFirstOrderByByField(existing) {
   return m;
 }
 function buildPostgresDistinctOrderBy(distinctFields, existing) {
-  var _a3;
+  var _a4;
   const firstByField = mapFirstOrderByByField(existing);
   const next = [];
   for (const f of distinctFields) {
-    next.push((_a3 = firstByField.get(f)) != null ? _a3 : { [f]: "asc" });
+    next.push((_a4 = firstByField.get(f)) != null ? _a4 : { [f]: "asc" });
   }
   const distinctSet = new Set(distinctFields);
   for (const obj of existing) {
@@ -6826,10 +6956,10 @@ function isPrismaMethod(v) {
   return v === "findMany" || v === "findFirst" || v === "findUnique" || v === "aggregate" || v === "groupBy" || v === "count";
 }
 function resolveMethod(directive) {
-  var _a3, _b;
+  var _a4, _b;
   const m = directive == null ? void 0 : directive.method;
   if (isPrismaMethod(m)) return m;
-  const pm = (_b = (_a3 = directive == null ? void 0 : directive.query) == null ? void 0 : _a3.processed) == null ? void 0 : _b.method;
+  const pm = (_b = (_a4 = directive == null ? void 0 : directive.query) == null ? void 0 : _a4.processed) == null ? void 0 : _b.method;
   if (isPrismaMethod(pm)) return pm;
   return "findMany";
 }
@@ -6994,7 +7124,7 @@ function extractIncludeSpec2(processed, modelDef) {
   return includeSpec;
 }
 function buildAndNormalizeSql(args) {
-  var _a3;
+  var _a4;
   const {
     method,
     processed,
@@ -7020,7 +7150,7 @@ function buildAndNormalizeSql(args) {
     sqlResult.paramMappings,
     dialect
   );
-  const includeSpec = (_a3 = sqlResult.includeSpec && isPlainObject(sqlResult.includeSpec) ? sqlResult.includeSpec : null) != null ? _a3 : extractIncludeSpec2(processed, modelDef);
+  const includeSpec = (_a4 = sqlResult.includeSpec && isPlainObject(sqlResult.includeSpec) ? sqlResult.includeSpec : null) != null ? _a4 : extractIncludeSpec2(processed, modelDef);
   return {
     sql: normalized.sql,
     paramMappings: normalized.paramMappings,
@@ -7045,8 +7175,8 @@ function finalizeDirective(args) {
     skipWhereIn
   } = args;
   const params = normalizedMappings.map((m) => {
-    var _a3;
-    return (_a3 = m.value) != null ? _a3 : void 0;
+    var _a4;
+    return (_a4 = m.value) != null ? _a4 : void 0;
   });
   validateParamConsistencyByDialect(normalizedSql, params, dialect);
   const { staticParams, dynamicKeys, paramOrder } = buildParamsFromMappings(normalizedMappings);
@@ -7516,21 +7646,13 @@ function makeAlias(name) {
   const safe = /^[a-z_]/.test(base) ? base : `_${base}`;
   return SQL_RESERVED_WORDS.has(safe) ? `${safe}_t` : safe;
 }
-function canonicalizeReplacer(key, value) {
+function bigintReplacer(_key, value) {
   if (typeof value === "bigint") return `__bigint__${value.toString()}`;
-  if (value && typeof value === "object" && !Array.isArray(value)) {
-    const obj = value;
-    const sorted = {};
-    for (const k of Object.keys(obj).sort()) {
-      sorted[k] = obj[k];
-    }
-    return sorted;
-  }
   return value;
 }
 function canonicalizeQuery(modelName, method, args, dialect) {
   if (!args) return `${dialect}:${modelName}:${method}:{}`;
-  return `${dialect}:${modelName}:${method}:${JSON.stringify(args, canonicalizeReplacer)}`;
+  return `${dialect}:${modelName}:${method}:${JSON.stringify(args, bigintReplacer)}`;
 }
 function buildSQLFull(model, models, method, args, dialect) {
   const tableName = buildTableReference(
@@ -7714,10 +7836,10 @@ function getRowTransformer(method) {
 
 // src/result-transformers.ts
 function transformQueryResults(method, results) {
-  var _a3, _b;
+  var _a4, _b;
   if (method === "findFirst" || method === "findUnique") {
     if (Array.isArray(results)) {
-      return (_a3 = results[0]) != null ? _a3 : null;
+      return (_a4 = results[0]) != null ? _a4 : null;
     }
   }
   if (method === "aggregate") {
@@ -7826,10 +7948,10 @@ function createTransactionExecutor(deps) {
 function isListField2(field) {
   return typeof field.type === "string" && field.type.endsWith("[]");
 }
-function resolveRelation(model, relName, allModels) {
+function resolveRelation(model, relName, allModels, modelMap) {
   const field = model.fields.find((f) => f.name === relName);
   if (!field || !field.isRelation || !field.relatedModel) return null;
-  const relModel = allModels.find((m) => m.name === field.relatedModel);
+  const relModel = modelMap ? modelMap.get(field.relatedModel) : allModels.find((m) => m.name === field.relatedModel);
   if (!relModel) return null;
   return { field, relModel };
 }
@@ -7861,23 +7983,11 @@ function buildWhereInSegment(name, relArgs, field, relModel) {
     perParentSkip: pagination.skip
   };
 }
-function deepClone(obj) {
-  if (obj === null || typeof obj !== "object") return obj;
-  if (obj instanceof Date) return new Date(obj.getTime());
-  if (obj instanceof RegExp) return new RegExp(obj.source, obj.flags);
-  if (Array.isArray(obj)) return obj.map((item) => deepClone(item));
-  const cloned = {};
-  for (const key in obj) {
-    if (Object.prototype.hasOwnProperty.call(obj, key)) {
-      cloned[key] = deepClone(obj[key]);
-    }
-  }
-  return cloned;
-}
 function removeRelationsFromArgs(args, names) {
   if (!args) return args;
-  const filtered = deepClone(args);
+  const filtered = __spreadValues({}, args);
   if (filtered.include && isPlainObject(filtered.include)) {
+    filtered.include = __spreadValues({}, filtered.include);
     for (const name of names) {
       delete filtered.include[name];
     }
@@ -7886,6 +7996,7 @@ function removeRelationsFromArgs(args, names) {
     }
   }
   if (filtered.select && isPlainObject(filtered.select)) {
+    filtered.select = __spreadValues({}, filtered.select);
     for (const name of names) {
       delete filtered.select[name];
     }
@@ -7930,23 +8041,40 @@ function planQueryStrategy(params) {
   if (dialect === "postgres") {
     const includeSpec = extractIncludeSpec3(args, model);
     if (Object.keys(includeSpec).length > 0) {
+      const modelMap2 = getOrCreateModelMap(allModels);
       isPlainObject(args) && "take" in args && args.take != null;
       const takeValue = isPlainObject(args) && typeof args.take === "number" ? args.take : null;
-      const canFlatJoin = canUseFlatJoinForAll(includeSpec, model, allModels);
-      canUseLateralJoin(includeSpec, model, allModels);
-      hasChildPaginationAnywhere(
+      const canFlatJoin = canUseFlatJoinForAll(
+        includeSpec,
+        model,
+        allModels,
+        false,
+        modelMap2
+      );
+      canUseLateralJoin(
         includeSpec,
         model,
-        allModels
+        allModels,
+        modelMap2
+      );
+      const hasChildPag = hasChildPaginationAnywhere(
+        includeSpec,
+        model,
+        allModels,
+        0,
+        modelMap2
       );
       const strategy = pickIncludeStrategy({
         includeSpec,
         model,
         schemas: allModels,
         method: params.method,
+        args,
         takeValue,
         canFlatJoin,
-        debug
+        hasChildPagination: hasChildPag,
+        debug,
+        modelMap: modelMap2
       });
       if (debug) {
         console.log(`  [planner] ${model.name}: strategy=${strategy}`);
@@ -7956,10 +8084,11 @@ function planQueryStrategy(params) {
       }
     }
   }
+  const modelMap = getOrCreateModelMap(allModels);
   const whereInSegments = [];
   const toRemove = /* @__PURE__ */ new Set();
   for (const entry of entries) {
-    const resolved = resolveRelation(model, entry.name, allModels);
+    const resolved = resolveRelation(model, entry.name, allModels, modelMap);
     if (!resolved) continue;
     const segment = buildWhereInSegment(
       entry.name,
@@ -8222,7 +8351,7 @@ function needsPerParentPagination(segment) {
   return segment.isList && (segment.perParentSkip != null && segment.perParentSkip > 0 || segment.perParentTake != null);
 }
 function stitchChildrenToParents(children, segment, parentKeyIndex) {
-  var _a3;
+  var _a4;
   const grouped = /* @__PURE__ */ new Map();
   for (const child of children) {
     const childKey = child[segment.fkFieldName];
@@ -8253,20 +8382,28 @@ function stitchChildrenToParents(children, segment, parentKeyIndex) {
           parent[segment.relationName].push(child);
         }
       } else {
-        parent[segment.relationName] = (_a3 = sliced[0]) != null ? _a3 : null;
+        parent[segment.relationName] = (_a4 = sliced[0]) != null ? _a4 : null;
       }
     }
   }
 }
 function buildChildArgs(relArgs, fkFieldName, uniqueIds, stripPagination) {
-  const base = relArgs === true || typeof relArgs !== "object" || relArgs === null ? {} : __spreadValues({}, relArgs);
-  if (stripPagination) {
-    delete base.take;
-    delete base.skip;
+  const isObject = relArgs !== true && typeof relArgs === "object" && relArgs !== null;
+  const source = isObject ? relArgs : null;
+  const base = {};
+  if (source) {
+    if (source.select !== void 0) base.select = source.select;
+    if (source.include !== void 0) base.include = source.include;
+    if (source.orderBy !== void 0) base.orderBy = source.orderBy;
+    if (!stripPagination) {
+      if (source.take !== void 0) base.take = source.take;
+      if (source.skip !== void 0) base.skip = source.skip;
+    }
+    if (source.cursor !== void 0) base.cursor = source.cursor;
+    if (source.distinct !== void 0) base.distinct = source.distinct;
   }
-  const existingWhere = base.where;
   const inCondition = { [fkFieldName]: { in: uniqueIds } };
-  base.where = existingWhere ? { AND: [existingWhere, inCondition] } : inCondition;
+  base.where = source && source.where ? { AND: [source.where, inCondition] } : inCondition;
   return base;
 }
 function ensureFkInSelect(childArgs, fkFieldName) {
@@ -8778,9 +8915,9 @@ function wrapQueryForMethod(method, cteName, resultAlias) {
   }
 }
 function isAllCountQueries(queries, keys) {
-  var _a3;
+  var _a4;
   for (const key of keys) {
-    if (((_a3 = queries[key]) == null ? void 0 : _a3.method) !== "count") return false;
+    if (((_a4 = queries[key]) == null ? void 0 : _a4.method) !== "count") return false;
   }
   return true;
 }
@@ -8923,8 +9060,8 @@ function buildMergedCountBatchSql(queries, keys, aliasesByKey, modelMap, models,
   const fromSql = rewrittenSubs.join(" CROSS JOIN ");
   const sql = `SELECT ${selectParts.join(", ")} FROM ${fromSql}`;
   const aliases = keys.map((k) => {
-    var _a3;
-    return (_a3 = aliasesByKey.get(k)) != null ? _a3 : "";
+    var _a4;
+    return (_a4 = aliasesByKey.get(k)) != null ? _a4 : "";
   });
   return { sql, params: finalParams, keys, aliases };
 }
@@ -9282,11 +9419,11 @@ function parseBatchValue(rawValue, method, modelName, modelMap) {
   }
 }
 function parseBatchResults(row, keys, queries, aliases, modelMap) {
-  var _a3;
+  var _a4;
   const results = {};
   for (let i = 0; i < keys.length; i++) {
     const key = keys[i];
-    const columnKey = (_a3 = aliases == null ? void 0 : aliases[i]) != null ? _a3 : key;
+    const columnKey = (_a4 = aliases == null ? void 0 : aliases[i]) != null ? _a4 : key;
     const rawValue = row[columnKey];
     const query = queries[key];
     results[key] = parseBatchValue(
@@ -9408,8 +9545,8 @@ var createCoreReducer = (config) => {
   return {
     processRow,
     getParent: (key) => {
-      var _a3;
-      return (_a3 = parentMap.get(key)) != null ? _a3 : null;
+      var _a4;
+      return (_a4 = parentMap.get(key)) != null ? _a4 : null;
     },
     getAllParents: () => Array.from(parentMap.values()),
     getParentMap: () => parentMap