pqb 0.47.1 → 0.47.3

package/dist/index.js

@@ -3104,13 +3104,15 @@ const processComputedResult = (query, result) => {
 };
 const processComputedBatches = (query, batches, originalReturnType, returnType, tempColumns, renames, key) => {
   let promises;
-  for (const key2 in query.selectedComputeds) {
-    const computed = query.selectedComputeds[key2];
+  const plainValue = originalReturnType === "value" || originalReturnType === "valueOrThrow";
+  for (const computedKey in query.selectedComputeds) {
+    const setAsKey = plainValue ? key : computedKey;
+    const computed = query.selectedComputeds[computedKey];
     if (computed.kind === "one") {
       for (const { data } of batches) {
         for (const record of data) {
           if (record) {
-            record[key2] = computed.fn(record);
+            record[setAsKey] = computed.fn(record);
           }
         }
       }
@@ -3133,11 +3135,11 @@ const processComputedBatches = (query, batches, originalReturnType, returnType,
         }
         const res = computed.fn(present);
         if (Array.isArray(res)) {
-          saveBatchComputed(key2, data, res, blanks);
+          saveBatchComputed(setAsKey, data, res, blanks);
         } else {
           (promises ?? (promises = [])).push(
             res.then(
-              (res2) => saveBatchComputed(key2, data, res2, blanks)
+              (res2) => saveBatchComputed(setAsKey, data, res2, blanks)
             )
           );
         }
@@ -4703,7 +4705,11 @@ const mergeColumnsSql = (columns, quotedColumns2, target, except) => {
       notExcluded.push(quotedColumns2[i]);
     }
   }
-  return notExcluded.length ? `DO UPDATE SET ${notExcluded.map((column) => `${column} = excluded.${column}`).join(", ")}` : "DO NOTHING";
+  return notExcluded.length ? `DO UPDATE SET ${notExcluded.map((column) => `${column} = excluded.${column}`).join(", ")}` : (
+    // update whatever is the first column because DO NOTHING prevents RETURNING,
+    // and we might want to return data from the insert
+    `DO UPDATE SET ${quotedColumns2[0]} = excluded.${quotedColumns2[0]}`
+  );
 };
 const encodeRow = (ctx, values, q, QueryClass, row, runtimeDefaults, quotedAs) => {
   const arr = row.map((value) => {