prisma-sql 1.72.0 → 1.73.0

package/dist/index.cjs

@@ -5151,14 +5151,18 @@ function buildNestedToOneJoins(relations, baseAlias, baseModel, aliasGen, dialec
   }
   return { joins, aliasMap };
 }
-function buildNestedToOneSelects(relations, aliasMap) {
+function buildNestedToOneSelects(relations, aliasMap, dialect) {
   const selects = [];
   for (const rel of relations) {
     const relAlias = aliasMap.get(rel.name);
     if (!relAlias) continue;
     const relSelect = buildRelationSelect(rel.args, rel.model, relAlias);
     if (!relSelect || relSelect.trim().length === 0) continue;
-    selects.push(`${sqlStringLiteral(rel.name)}, ${relSelect}`);
+    const jsonExpr = jsonBuildObject(relSelect, dialect);
+    const pkField = getPrimaryKeyField(rel.model);
+    const pkCol = `${relAlias}.${quoteColumn(rel.model, pkField)}`;
+    const nullSafeExpr = `CASE WHEN ${pkCol} IS NOT NULL THEN ${jsonExpr} ELSE NULL END`;
+    selects.push(`${sqlStringLiteral(rel.name)}, ${nullSafeExpr}`);
   }
   return selects;
 }
@@ -5236,7 +5240,11 @@ function buildSelectWithNestedIncludes(relArgs, relModel, relAlias, ctx) {
     ctx.dialect
   );
   const baseSelect = buildRelationSelect(relArgs, relModel, relAlias);
-  const nestedSelects = buildNestedToOneSelects(nestedToOnes, aliasMap);
+  const nestedSelects = buildNestedToOneSelects(
+    nestedToOnes,
+    aliasMap,
+    ctx.dialect
+  );
   const allParts = [];
   if (baseSelect && baseSelect.trim().length > 0) {
     allParts.push(baseSelect);