prisma-sql 1.80.2 → 1.80.4

package/dist/index.js

@@ -1036,7 +1036,7 @@ function normalizeField(field) {
   return field;
 }
 function getFieldIndices(model) {
-  var _a6;
+  var _a6, _b;
   let cached = FIELD_INDICES_CACHE.get(model);
   if (cached) return cached;
   const scalarFields = /* @__PURE__ */ new Map();
@@ -1071,6 +1071,16 @@ function getFieldIndices(model) {
       quotedColumns.set(field.name, quote(columnName));
     }
   }
+  if (pkFields.length === 0) {
+    const compositePk = (_b = model.primaryKey) == null ? void 0 : _b.fields;
+    if (Array.isArray(compositePk)) {
+      for (const f of compositePk) {
+        if (typeof f === "string" && scalarFields.has(f)) {
+          pkFields.push(f);
+        }
+      }
+    }
+  }
   const scalarFieldSet = new Set(scalarNames);
   const relationFieldSet = new Set(relationNames);
   cached = Object.freeze({
@@ -1460,23 +1470,23 @@ function normalizeField2(field) {
   return field;
 }
 function getPrimaryKeyFields(model) {
+  var _a6;
   const cached = getFieldIndices(model).pkFields;
   if (cached.length > 0) return [...cached];
   const idField = model.fields.find(
     (f) => f.name === "id" && !f.isRelation
   );
   if (idField) return ["id"];
+  const compositePk = (_a6 = model.primaryKey) == null ? void 0 : _a6.fields;
+  if (Array.isArray(compositePk) && compositePk.length > 0) {
+    return compositePk.filter((f) => typeof f === "string");
+  }
   throw new Error(
-    `Model ${model.name} has no primary key field. Models must have either fields with isId=true or a field named 'id'.`
+    `Model ${model.name} has no primary key field. Models must have either fields with isId=true, a field named 'id', or a composite @@id.`
   );
 }
 function getPrimaryKeyField(model) {
   const fields = getPrimaryKeyFields(model);
-  if (fields.length !== 1) {
-    throw new Error(
-      `getPrimaryKeyField requires single-field PK, but ${model.name} has ${fields.length} fields`
-    );
-  }
   return fields[0];
 }
 function getFieldByName(model, fieldName) {
@@ -5487,6 +5497,7 @@ function extractNestedToOneRelations(relArgs, relModel, schemaByName) {
     if (isList) continue;
     const nestedModel = schemaByName.get(field.relatedModel);
     if (!nestedModel) continue;
+    if (hasNestedRelationInArgs(entry.value, nestedModel)) continue;
     toOneRelations.push({
       name: entry.name,
       field,