@vibeorm/sql 5.6.0 → 5.7.0

package/dist/ast.d.ts

@@ -1393,7 +1393,10 @@ export type ChainResult = {
  *   array_agg("__vibe_i")::text FROM (SELECT DISTINCT ARRAY["c0", "c1"] AS
  *   "__vibe_i" FROM "step" LIMIT $n) AS "__vibe_d")` — a two-dimensional text
  *   array literal of at most `limit` distinct images, NULL when the step
- *   returned no row. A before image skips the rows whose arm marker is true.
+ *   returned no row. With `inserted`, both read the update arm's rows only
+ *   (`WHERE NOT` the marker), and `_a` is left out with `insertedOnly`;
+ * - `<alias>_ia` (with `inserted` and `after`): the insert arm's after images
+ *   (`WHERE` the marker), so an upsert's after images arrive per arm.
  *
  * `before` / `after` name columns the step RETURNS (its
  * {@link CaptureReturningColumn} aliases), in image order. `limit` is bound once.
@@ -1403,7 +1406,7 @@ export type ChainCapture = {
     readonly alias: string;
     /** The step's `"inserted"` arm-marker column, for an `INSERT … ON CONFLICT DO UPDATE` step. */
     readonly inserted?: string;
-    /** With `inserted`: images of inserted rows only — `after` reads the rows whose marker is true. */
+    /** With `inserted`: images of inserted rows only — `<alias>_ia`, no `<alias>_a`. */
     readonly insertedOnly?: true;
     readonly before?: readonly string[];
     readonly after?: readonly string[];

package/dist/index.js

@@ -5596,8 +5596,12 @@ function captureAliases(params) {
       out.push(`${entry.alias}_i`);
     if (entry.before !== undefined && entry.before.length > 0)
       out.push(`${entry.alias}_b`);
-    if (entry.after !== undefined && entry.after.length > 0)
-      out.push(`${entry.alias}_a`);
+    if (entry.after !== undefined && entry.after.length > 0) {
+      if (entry.inserted === undefined || entry.insertedOnly !== true)
+        out.push(`${entry.alias}_a`);
+      if (entry.inserted !== undefined)
+        out.push(`${entry.alias}_ia`);
+    }
   }
   return out;
 }
@@ -5622,10 +5626,13 @@ function renderChainCaptures(params) {
     const limit = collector.add(entry.limit);
     const item = quote("__vibe_i");
     const image = (columns, filter) => `(SELECT array_agg(${item})::text FROM (SELECT DISTINCT ARRAY[${columns.map(quote).join(", ")}] AS ${item} FROM ${step}${filter} LIMIT ${limit}) AS ${quote("__vibe_d")})`;
+    const updatedRows = marker === undefined ? "" : ` WHERE NOT ${marker}`;
     if (before.length > 0)
-      out.push(`${image(before, marker === undefined ? "" : ` WHERE NOT ${marker}`)} AS ${quote(`${entry.alias}_b`)}`);
-    if (after.length > 0)
-      out.push(`${image(after, marker !== undefined && entry.insertedOnly === true ? ` WHERE ${marker}` : "")} AS ${quote(`${entry.alias}_a`)}`);
+      out.push(`${image(before, updatedRows)} AS ${quote(`${entry.alias}_b`)}`);
+    if (after.length > 0 && (marker === undefined || entry.insertedOnly !== true))
+      out.push(`${image(after, updatedRows)} AS ${quote(`${entry.alias}_a`)}`);
+    if (after.length > 0 && marker !== undefined)
+      out.push(`${image(after, ` WHERE ${marker}`)} AS ${quote(`${entry.alias}_ia`)}`);
   }
   return out;
 }
@@ -6580,4 +6587,4 @@ export {
   toPgArrayLiteral
 };
 
-//# debugId=FBE116988ABE557464756E2164756E21
+//# debugId=0EA38AD633C52F8C64756E2164756E21