prisma-sql 1.72.0 → 1.74.0

package/dist/index.cjs

@@ -4592,12 +4592,12 @@ function resolveCountSelect(countSelectRaw, model) {
   return null;
 }
 function buildIncludeColumns(spec) {
-  var _a3, _b;
+  var _a3, _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 = (_b = (_a3 = spec.args) == null ? void 0 : _a3.select) == null ? void 0 : _b[COUNT_SELECT_KEY];
+  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];
   if (countSelectRaw) {
     const resolvedCountSelect = resolveCountSelect(countSelectRaw, model);
     if (resolvedCountSelect && Object.keys(resolvedCountSelect).length > 0) {
@@ -4732,7 +4732,7 @@ function extractIncludeSpec(args) {
   const includeSpec = {};
   if (args.include && isPlainObject(args.include)) {
     for (const [key, value] of Object.entries(args.include)) {
-      if (value !== false) {
+      if (value !== false && key !== COUNT_SELECT_KEY) {
         includeSpec[key] = value;
       }
     }
@@ -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);