@quereus/quereus 0.17.0 → 0.18.0

package/dist/src/runtime/emit/update.js

@@ -2,11 +2,22 @@ import { emitPlanNode, emitCallFromPlan } from '../emitters.js';
 import { QuereusError } from '../../common/errors.js';
 import { StatusCode } from '../../common/types.js';
 import { buildRowDescriptor, composeOldNewRow } from '../../util/row-descriptor.js';
-import { withRowContextGenerator } from '../context-helpers.js';
+import { createRowSlot, withRowContext } from '../context-helpers.js';
 export function emitUpdate(plan, ctx) {
     const tableSchema = plan.table.tableSchema;
     // Create row descriptor for the source rows (needed for assignment expression evaluation)
     const sourceRowDescriptor = buildRowDescriptor(plan.source.getAttributes());
+    // Split assignments into regular and generated
+    const regularIndices = [];
+    const generatedIndices = [];
+    plan.assignments.forEach((assign, i) => {
+        if (assign.isGenerated) {
+            generatedIndices.push(i);
+        }
+        else {
+            regularIndices.push(i);
+        }
+    });
     // Pre-calculate assignment column indices
     const assignmentTargetIndices = plan.assignments.map(assign => {
         const colNameLower = assign.targetColumn.name.toLowerCase();
@@ -19,27 +30,38 @@ export function emitUpdate(plan, ctx) {
     // Emit assignment value expressions as callbacks
     const assignmentEvaluators = plan.assignments.map(assign => emitCallFromPlan(assign.value, ctx));
     async function* run(rctx, sourceRowsIterable, ...assignmentEvaluators) {
-        yield* withRowContextGenerator(rctx, sourceRowDescriptor, sourceRowsIterable, async function* (sourceRow) {
-            // Evaluate assignment expressions in the context of this row
-            const assignmentValues = [];
-            for (const evaluator of assignmentEvaluators) {
-                const value = evaluator(rctx);
-                assignmentValues.push(value);
+        const slot = createRowSlot(rctx, sourceRowDescriptor);
+        try {
+            for await (const sourceRow of sourceRowsIterable) {
+                slot.set(sourceRow);
+                // Phase 1: Evaluate regular (non-generated) assignment expressions
+                const updatedRow = [...sourceRow]; // Copy the original row
+                for (const i of regularIndices) {
+                    const value = assignmentEvaluators[i](rctx);
+                    updatedRow[assignmentTargetIndices[i]] = value;
+                }
+                // Phase 2: Evaluate generated column expressions against the updated row
+                // Use withRowContext to temporarily override the row context so generated
+                // expressions see post-SET values (the scan's slot may shadow our slot)
+                if (generatedIndices.length > 0) {
+                    withRowContext(rctx, sourceRowDescriptor, () => updatedRow, () => {
+                        for (const i of generatedIndices) {
+                            const value = assignmentEvaluators[i](rctx);
+                            updatedRow[assignmentTargetIndices[i]] = value;
+                        }
+                    });
+                }
+                // Create flat row with OLD (source) and NEW (updated) values for constraint checking
+                const flatRow = composeOldNewRow(sourceRow, updatedRow, tableSchema.columns.length);
+                // Yield the flat row for constraint checking
+                // NOTE: UpdateNode only transforms rows - it does NOT execute the actual update
+                // The UpdateExecutorNode is responsible for calling vtab.update
+                yield flatRow;
             }
-            // Create a new row with updated values
-            const updatedRow = [...sourceRow]; // Copy the original row
-            // Apply assignment values to the row
-            for (let i = 0; i < assignmentValues.length; i++) {
-                const targetColIdx = assignmentTargetIndices[i];
-                updatedRow[targetColIdx] = assignmentValues[i];
-            }
-            // Create flat row with OLD (source) and NEW (updated) values for constraint checking
-            const flatRow = composeOldNewRow(sourceRow, updatedRow, tableSchema.columns.length);
-            // Yield the flat row for constraint checking
-            // NOTE: UpdateNode only transforms rows - it does NOT execute the actual update
-            // The UpdateExecutorNode is responsible for calling vtab.update
-            yield flatRow;
-        });
+        }
+        finally {
+            slot.close();
+        }
     }
     const sourceInstruction = emitPlanNode(plan.source, ctx);
     return {

package/dist/src/runtime/emit/update.js.map

@@ -1 +1 @@
-{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/runtime/emit/update.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/runtime/emit/update.ts"],"names":[],"mappings":"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"}

package/dist/src/runtime/emit/window.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"window.d.ts","sourceRoot":"","sources":["../../../../src/runtime/emit/window.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,EAAkC,MAAM,aAAa,CAAC;AAE/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAa9D,wBAAgB,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,eAAe,GAAG,WAAW,CAyF9E"}
+{"version":3,"file":"window.d.ts","sourceRoot":"","sources":["../../../../src/runtime/emit/window.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,EAAkC,MAAM,aAAa,CAAC;AAE/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAgB9D,wBAAgB,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,eAAe,GAAG,WAAW,CAgI9E"}