@vibeorm/sql 5.5.0 → 5.7.0

package/dist/ast.d.ts

@@ -1103,6 +1103,14 @@ export type OnConflictClause = OnConflictUpdate | OnConflictDoNothing;
 export type UpdateStatement = {
     readonly kind: "update";
     readonly table: TableRef;
+    /** The target's alias; required with {@link UpdateStatement.from}, where two relations are in scope. */
+    readonly alias?: string;
+    /**
+     * A joined source: `UPDATE … FROM` on PostgreSQL/SQLite (its `on` AND-ed
+     * before `where`), `UPDATE … JOIN … ON` on MySQL. A
+     * {@link SourceColumnRef} set value reads its columns.
+     */
+    readonly from?: UpdateSource;
     /**
      * Column → parameter value, or an atomic {@link SetOperation}. As a
      * {@link ChainStep} only (statement-maxx lane C3), a value may be a
@@ -1227,6 +1235,23 @@ export declare function stepColumnRef(params: {
     step: string;
     column: string;
 }): StepColumnRef;
+/** The joined relation of an {@link UpdateStatement}: its table, alias and join condition. */
+export type UpdateSource = {
+    readonly table: TableRef;
+    readonly alias: string;
+    readonly on: SqlExpr;
+};
+/** An UPDATE set value read from the joined source's `column` (`UPDATE … FROM`). */
+export type SourceColumnRef = {
+    readonly __sourceColumn: true;
+    readonly column: string;
+};
+/** Read `column` of an {@link UpdateStatement}'s joined source as a set value. */
+export declare function sourceColumnRef(params: {
+    column: string;
+}): SourceColumnRef;
+/** Is this UPDATE set value a {@link SourceColumnRef}? */
+export declare function isSourceColumnRef(value: unknown): value is SourceColumnRef;
 /** Is this INSERT … SELECT cell a {@link StepColumnRef}? */
 export declare function isStepColumnRef(value: unknown): value is StepColumnRef;
 /**
@@ -1368,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.
@@ -1378,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.d.ts

@@ -40,8 +40,8 @@ export type { ResultDecoder, ResultReadDecoder, ResultParameterEncoder, ResultSc
  * lives in this package; see the root sql-catalog.md for the reviewable surface.
  */
 export { compileExclusion, renderExclusionSetup, renderExclusionDdl, renderExclusionCatalog, renderExclusionProbe } from "./exclusion.ts";
-export type { AdvisoryLockKey, AdvisoryLockStatement, AdvisoryLocksStatement, AggFn, AggRef, AggSelect, ChainResult, ChainRowSource, ChainCapture, CaptureReturningColumn, ChainStatement, ChainStep, ChainStepStatement, ChainTally, ChainVeto, ColRef, ComparisonOp, DateTruncation, CountSubquery, ScalarSubquery, DeleteStatement, ExcludedRef, InnerJoin, KeyListMember, KeyPage, KeyRows, KeyTableJoin, KeyTableMember, InsertSelectStatement, InsertStatement, ReturningColumn, JsonFilterOp, LateralJoin, LeftJoin, ListSetOperation, OnConflictClause, OnConflictDoNothing, OnConflictUpdate, OrderByAggregate, OrderByColumn, OrderBySubquery, OrderTerm, RowLock, RowNumberProjection, DbNowMarker, JsonParamCell, SelectExpr, SelectStatement, SetOperation, SetOperator, SqlExpr, SqlStatement, StepColumnRef, TableRef, UpdateStatement, } from "./ast.ts";
-export { ADVISORY_LOCK_RESULT_COLUMN, CHAIN_VETO_PREFIX, CHAIN_VETO_TOKEN_PATTERN, SQL_DEFAULT_CELL, SQL_KEEP_CELL, chainVetoToken, dbNowMarker, excludedRef, isDbNowMarker, isExcludedRef, isJsonParamCell, isListSetOperation, isSetOperation, isSqlDefaultCell, isSqlKeepCell, isStepColumnRef, isCaptureReturningColumn, jsonParamCell, returningColumnName, stepColumnRef, } from "./ast.ts";
+export type { AdvisoryLockKey, AdvisoryLockStatement, AdvisoryLocksStatement, AggFn, AggRef, AggSelect, ChainResult, ChainRowSource, ChainCapture, CaptureReturningColumn, ChainStatement, ChainStep, ChainStepStatement, ChainTally, ChainVeto, ColRef, ComparisonOp, DateTruncation, CountSubquery, ScalarSubquery, DeleteStatement, ExcludedRef, InnerJoin, KeyListMember, KeyPage, KeyRows, KeyTableJoin, KeyTableMember, InsertSelectStatement, InsertStatement, ReturningColumn, JsonFilterOp, LateralJoin, LeftJoin, ListSetOperation, OnConflictClause, OnConflictDoNothing, OnConflictUpdate, OrderByAggregate, OrderByColumn, OrderBySubquery, OrderTerm, RowLock, RowNumberProjection, DbNowMarker, JsonParamCell, SelectExpr, SelectStatement, SetOperation, SetOperator, SqlExpr, SqlStatement, StepColumnRef, SourceColumnRef, UpdateSource, TableRef, UpdateStatement, } from "./ast.ts";
+export { ADVISORY_LOCK_RESULT_COLUMN, CHAIN_VETO_PREFIX, CHAIN_VETO_TOKEN_PATTERN, SQL_DEFAULT_CELL, SQL_KEEP_CELL, chainVetoToken, dbNowMarker, excludedRef, isDbNowMarker, isExcludedRef, isJsonParamCell, isListSetOperation, isSetOperation, isSqlDefaultCell, isSqlKeepCell, isStepColumnRef, isSourceColumnRef, sourceColumnRef, isCaptureReturningColumn, jsonParamCell, returningColumnName, stepColumnRef, } from "./ast.ts";
 export type { AdvisoryLockFunctions, AdvisoryLockModeFunctions, RowLockSyntax, EmptyInsertSyntax, SqlDialect, } from "./dialect.ts";
 export { ADVISORY_KEY_BOUNDS, describeRowLock, renderAdvisoryLock, renderAdvisoryLocks, renderRowLockClause } from "./locks.ts";
 export { JSON_TRANSPORT, projectionOutputName } from "./json-transport.ts";

package/dist/index.js

@@ -2903,6 +2903,15 @@ var ADVISORY_LOCK_RESULT_COLUMN = "acquired";
 function stepColumnRef(params) {
   return { __stepColumn: true, step: params.step, column: params.column };
 }
+function sourceColumnRef(params) {
+  return Object.freeze({ __sourceColumn: true, column: params.column });
+}
+function isSourceColumnRef(value) {
+  if (typeof value !== "object" || value === null)
+    return false;
+  const candidate = value;
+  return candidate.__sourceColumn === true && typeof candidate.column === "string" && Object.keys(value).length === 2;
+}
 function isStepColumnRef(value) {
   return typeof value === "object" && value !== null && value.__stepColumn === true;
 }
@@ -4960,17 +4969,18 @@ function applyReturning(params) {
       renderCaptureReturning({ dialect, column: capture });
     return { suffix: "", status: "omitted" };
   }
+  const read = (name) => params.qualify === undefined ? name : `${params.qualify}.${name}`;
   const columns = requested.map((column) => {
     if (typeof column === "string")
-      return dialect.quoteIdent({ name: column });
+      return read(dialect.quoteIdent({ name: column }));
     if ("capture" in column)
       return renderCaptureReturning({ dialect, column });
     if ("transform" in column) {
       const name = dialect.quoteIdent({ name: column.name });
-      return `${dialect.jsonTextProjection({ expression: name })} AS ${name}`;
+      return `${dialect.jsonTextProjection({ expression: read(name) })} AS ${name}`;
     }
     const name = dialect.quoteIdent({ name: column.name });
-    return `${textProjection({ dialect, expression: name })} AS ${name}`;
+    return `${textProjection({ dialect, expression: read(name) })} AS ${name}`;
   }).join(", ");
   return { suffix: ` RETURNING ${columns}`, status: "native" };
 }
@@ -5404,6 +5414,18 @@ function renderUpdate(params) {
   if (assignments.length === 0) {
     throw internalError4({ message: "update must set at least one column" });
   }
+  const source = statement.from;
+  if (source !== undefined) {
+    if (statement.alias === undefined || statement.alias === source.alias)
+      throw internalError4({ message: "UPDATE \u2026 FROM needs distinct target and source aliases" });
+    const target = dialect.quoteIdent({ name: statement.alias });
+    const joined = dialect.quoteIdent({ name: source.alias });
+    const assign = () => renderAssignments({ dialect, entries: assignments, collector, selfRef: target, source: joined, ...dialect.name === "mysql" ? { qualifyWrite: target } : {}, ...params.earlier === undefined ? {} : { steps: params.earlier } });
+    const where = () => statement.where === undefined ? "" : ` AND ${renderExpr({ dialect, expr: statement.where, collector })}`;
+    const text = dialect.name === "mysql" ? `UPDATE ${renderTable(dialect, statement.table)} AS ${target} JOIN ${renderTable(dialect, source.table)} AS ${joined} ON ${renderExpr({ dialect, expr: source.on, collector })} SET ${assign()}${statement.where === undefined ? "" : ` WHERE ${renderExpr({ dialect, expr: statement.where, collector })}`}` : `UPDATE ${renderTable(dialect, statement.table)} AS ${target} SET ${assign()} FROM ${renderTable(dialect, source.table)} AS ${joined} WHERE ${renderExpr({ dialect, expr: source.on, collector })}${where()}`;
+    const returning = applyReturning({ dialect, requested: statement.returning, ...dialect.name === "postgres" ? { qualify: target } : {} });
+    return { text: text + returning.suffix, values: collector.values, returning: returning.status };
+  }
   const setSql = renderAssignments({ dialect, entries: assignments, collector, ...params.earlier === undefined ? {} : { steps: params.earlier } });
   let text = `UPDATE ${renderTable(dialect, statement.table)} SET ${setSql}`;
   if (statement.where !== undefined) {
@@ -5423,6 +5445,11 @@ function renderAssignments(params) {
   return entries.map(([name, value]) => {
     const column = dialect.quoteIdent({ name });
     const read = selfRef === undefined ? column : `${selfRef}.${column}`;
+    if (isSourceColumnRef(value)) {
+      if (params.source === undefined)
+        throw internalError4({ message: `an UPDATE set value reads the joined source's column ${value.column}, but the statement joins no source` });
+      return `${column} = ${params.source}.${dialect.quoteIdent({ name: value.column })}`;
+    }
     if (isStepColumnRef(value)) {
       if (params.steps === undefined || !params.steps.has(value.step)) {
         throw internalError4({ message: `an UPDATE set value reads step "${value.step}", which is not an earlier chain step` });
@@ -5466,7 +5493,7 @@ function renderAssignments(params) {
       return `${column} = ${read} || ${collector.add(value.value)}`;
     }
     return `${column} = ${collector.add(value)}`;
-  }).join(", ");
+  }).map((assignment) => params.qualifyWrite === undefined ? assignment : `${params.qualifyWrite}.${assignment}`).join(", ");
 }
 function renderDelete(params) {
   const { dialect, statement, collector } = params;
@@ -5569,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;
 }
@@ -5595,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;
 }
@@ -6413,6 +6447,7 @@ export {
   isReusableSqlCommand,
   isReusableSqlQuery,
   isSetOperation,
+  isSourceColumnRef,
   isSqlBindingCollector,
   isSqlCommand,
   isSqlDefaultCell,
@@ -6532,6 +6567,7 @@ export {
   sealSqlInputScope,
   shortestFloat32,
   snapshotSqlValue,
+  sourceColumnRef,
   sql,
   sqlInputContract,
   sqlParamContract,
@@ -6551,4 +6587,4 @@ export {
   toPgArrayLiteral
 };
 
-//# debugId=98E9DEF83EE89CED64756E2164756E21
+//# debugId=0EA38AD633C52F8C64756E2164756E21