@quereus/quereus 2.9.0 → 3.0.1

package/dist/src/vtab/memory/layer/connection.js

@@ -1,4 +1,3 @@
-import { TransactionLayer } from './transaction.js';
 import { createLogger } from '../../../common/logger.js';
 import { StatusCode } from '../../../common/types.js';
 import { quereusError } from '../../../common/errors.js';
@@ -16,7 +15,25 @@ export class MemoryTableConnection {
     readLayer;
     pendingTransactionLayer = null;
     explicitTransaction = false; // Track if transaction was explicitly started
-    /** Stack of savepoint snapshots, indexed by depth from TransactionManager */
+    /**
+     * Stack of savepoint entries, indexed by depth from TransactionManager.
+     *
+     * Each slot stores:
+     *   - `snapshot`: the immutable savepoint snapshot when a pending layer
+     *     existed at savepoint time (eager path), or `null` if pending was
+     *     null (lazy marker — no eager copy needed).
+     *   - `readLayer`: the connection's readLayer at savepoint creation time,
+     *     used to restore the read view when rolling back to a lazy marker
+     *     that follows an outer eager-swap (otherwise the rollback would
+     *     leave readLayer pointing at the inner snapshot's data).
+     *
+     * Eager path (snapshot != null): `createSavepoint` swaps `readLayer` to
+     * the snapshot and clears `pendingTransactionLayer`, so the next mutation
+     * allocates a fresh pending layer parented on the snapshot. This
+     * preserves the "SELECT iterates an immutable layer while INSERT writes
+     * a fresh child BTree" invariant, fixing mid-transaction halloween in
+     * self-referential INSERT...SELECT.
+     */
     savepointStack = [];
     constructor(manager, initialReadLayer) {
         this.connectionId = connectionCounter++;
@@ -38,25 +55,33 @@ export class MemoryTableConnection {
     }
     /** Commits the current transaction */
     async commit() {
-        if (!this.pendingTransactionLayer) {
-            // Commit without an active transaction is a no-op
-            return;
+        // If readLayer is a swapped savepoint snapshot (eager path), its data
+        // must be promoted into the committed chain on commit even when no
+        // further mutations created a new pending layer afterwards.
+        // commitTransaction handles the lazy pending-layer creation in that
+        // case.
+        if (this.pendingTransactionLayer
+            || this.readLayer !== this.tableManager.currentCommittedLayer) {
+            await this.tableManager.commitTransaction(this);
+            // commitTransaction handles updating connection state (readLayer, pendingTransactionLayer)
         }
-        await this.tableManager.commitTransaction(this);
-        // commitTransaction handles updating connection state (readLayer, pendingTransactionLayer)
+        // Always clear transaction state: DB-level commit broadcasts hit every
+        // connection regardless of whether it had work to do, and the connection
+        // must come out of explicit-transaction mode so subsequent autocommit
+        // statements work correctly.
         this.clearTransactionState();
     }
     /** Rolls back the current transaction */
     rollback() {
-        if (!this.pendingTransactionLayer) {
-            // Rollback without an active transaction is a no-op
-            return;
-        }
-        // Reset readLayer to the current committed layer
-        // Important: We need to ensure we're reading from a clean state
+        // Reset readLayer to the current committed layer; readLayer may have
+        // been swapped to a savepoint snapshot by createSavepoint's eager path.
         this.readLayer = this.tableManager.currentCommittedLayer;
-        // Simply discard the pending layer
+        // Discard any pending layer
         this.pendingTransactionLayer = null;
+        // Always clear transaction state: DB-level rollback broadcasts hit every
+        // connection regardless of whether it had work to do, and the connection
+        // must come out of explicit-transaction mode so subsequent autocommit
+        // statements work correctly.
         this.clearTransactionState();
         debugLog(`Connection %d: Rolled back transaction, readLayer reset to ${this.readLayer.getLayerId()}`, this.connectionId);
     }
@@ -70,65 +95,56 @@ export class MemoryTableConnection {
         if (depth < 0) {
             quereusError(`Invalid savepoint depth: ${depth}. Must be non-negative.`, StatusCode.INTERNAL);
         }
-        if (!this.pendingTransactionLayer) {
-            // Start an implicit transaction and create a fresh layer immediately so the savepoint has something to snapshot
-            this.pendingTransactionLayer = new TransactionLayer(this.tableManager.currentCommittedLayer);
+        // Capture readLayer BEFORE any swap so rollback to a later lazy marker
+        // can restore the pre-swap view (see the comment on `savepointStack`).
+        const savedReadLayer = this.readLayer;
+        // Lazy-snapshot: if no pending layer exists yet, store a null snapshot
+        // marker instead of eagerly promoting. The pending layer will be created
+        // on first mutation; rolling back to a lazy marker restores the
+        // no-pending state with the saved readLayer.
+        //
+        // Eager-snapshot: promote the existing pending layer to immutable
+        // (markCommitted) and reuse it as the snapshot. Data-copying via a
+        // fresh layer doesn't survive "delete of inherited row" — the copy
+        // iterates the post-delete view (which already excludes the row),
+        // so a fresh layer would re-inherit the original entry from the
+        // parent BTree. Promoting the layer keeps the BTree's
+        // copy-on-write structure (with the cloned-and-spliced leaf)
+        // intact.
+        let snapshot = null;
+        if (this.pendingTransactionLayer) {
+            snapshot = this.pendingTransactionLayer;
+            snapshot.markCommitted();
+        }
+        this.savepointStack.push({ snapshot, readLayer: savedReadLayer });
+        // Eager-snapshot path: swap the immutable snapshot in as readLayer and
+        // drop the now-stale pending layer reference, so the next mutation
+        // allocates a fresh pending layer parented on the snapshot. This keeps
+        // SELECT iterators reading the snapshot's BTree while INSERTs mutate a
+        // different BTree (the new pending's copy-on-write child), matching
+        // the autocommit invariant for self-referential INSERT...SELECT.
+        if (snapshot) {
+            this.readLayer = snapshot;
+            this.pendingTransactionLayer = null;
         }
-        // Create a snapshot of the current transaction state and push onto the stack
-        const savepointLayer = this.createTransactionSnapshot(this.pendingTransactionLayer);
-        this.savepointStack.push(savepointLayer);
         // A SAVEPOINT implicitly puts the connection into explicit-transaction mode
         // so that subsequent statements do NOT auto-commit and invalidate the savepoint.
         this.explicitTransaction = true;
         debugLog(`Connection %d: Created savepoint at depth %d (stack size: %d)`, this.connectionId, depth, this.savepointStack.length);
     }
-    /**
-     * Creates a snapshot of a transaction layer by copying its effective data to a new independent layer.
-     * This is necessary because BTree inheritance can cause shared mutable state issues.
-     * The snapshot becomes immutable and independent of the source layer.
-     */
-    createTransactionSnapshot(sourceLayer) {
-        // Create a new transaction layer based on the source layer's parent
-        // This ensures the snapshot is independent of the source layer
-        const snapshotLayer = new TransactionLayer(sourceLayer.getParent());
-        // Copy change tracking state
-        if (sourceLayer.isTrackingChanges()) {
-            snapshotLayer.copyChangeTrackingFrom(sourceLayer);
-        }
-        // Copy all data from the source layer to the snapshot
-        const primaryTree = sourceLayer.getModificationTree('primary');
-        if (!primaryTree) {
-            // Empty transaction layer - just return the empty snapshot
-            snapshotLayer.markCommitted();
-            return snapshotLayer;
-        }
-        const firstPath = primaryTree.first();
-        if (!firstPath.on) {
-            // No data in the tree - return the empty snapshot
-            snapshotLayer.markCommitted();
-            return snapshotLayer;
-        }
-        // Copy all rows from the source layer
-        const { primaryKeyExtractorFromRow } = sourceLayer.getPkExtractorsAndComparators(sourceLayer.getSchema());
-        for (const path of primaryTree.ascending(firstPath)) {
-            const row = primaryTree.at(path);
-            try {
-                // Extract primary key and record the row in the snapshot
-                const primaryKey = primaryKeyExtractorFromRow(row);
-                snapshotLayer.recordUpsert(primaryKey, row, null);
-            }
-            catch (error) {
-                warnLog(`Connection %d: Failed to copy row to savepoint snapshot: %o`, this.connectionId, error);
-            }
-        }
-        // Mark the snapshot as committed to make it immutable
-        snapshotLayer.markCommitted();
-        return snapshotLayer;
-    }
     /** Releases savepoints from the top of the stack down to the target depth (exclusive) */
     releaseSavepoint(targetDepth) {
-        if (!this.pendingTransactionLayer)
+        // Don't short-circuit on missing pendingTransactionLayer: a statement
+        // savepoint may have pushed a null marker, and the matching release
+        // must still pop it.
+        if (targetDepth > this.savepointStack.length) {
+            // Setting `Array.length` to a value larger than the current length
+            // pads with undefined slots, corrupting subsequent rollback-to /
+            // release lookups. Skip with a warning — the most likely cause is a
+            // failed savepoint replay during `Database.registerConnection`.
+            warnLog(`Connection %d: Release savepoint depth %d out of range (stack size: %d)`, this.connectionId, targetDepth, this.savepointStack.length);
             return;
+        }
         this.savepointStack.length = targetDepth;
         debugLog(`Connection %d: Released savepoints to depth %d`, this.connectionId, targetDepth);
     }
@@ -137,19 +153,25 @@ export class MemoryTableConnection {
      * The savepoint is preserved (per SQL standard) so it can be rolled back to again.
      */
     rollbackToSavepoint(targetDepth) {
-        if (!this.pendingTransactionLayer)
-            return;
         if (targetDepth >= this.savepointStack.length) {
             warnLog(`Connection %d: Savepoint depth %d out of range (stack size: %d)`, this.connectionId, targetDepth, this.savepointStack.length);
             return;
         }
-        const savepoint = this.savepointStack[targetDepth];
-        // Create a fresh mutable layer that inherits from the savepoint's immutable snapshot.
-        // This allows further mutations after rollback.
-        this.pendingTransactionLayer = new TransactionLayer(savepoint);
-        // Enable change tracking if it was active on the snapshot
-        if (savepoint.isTrackingChanges()) {
-            this.pendingTransactionLayer.enableChangeTracking();
+        const entry = this.savepointStack[targetDepth];
+        if (entry.snapshot === null) {
+            // Lazy-snapshot marker: at savepoint creation there was no pending
+            // layer. Restore both readLayer (in case an outer eager-swap
+            // happened since) and clear pending.
+            this.readLayer = entry.readLayer;
+            this.pendingTransactionLayer = null;
+        }
+        else {
+            // Eager-snapshot path: createSavepoint swapped readLayer to the
+            // snapshot and dropped pendingTransactionLayer. Restore that exact
+            // state on rollback — the next mutation will lazily create a new
+            // pending layer parented on the snapshot.
+            this.readLayer = entry.snapshot;
+            this.pendingTransactionLayer = null;
         }
         // Remove savepoints above the target, but preserve the target itself
         this.savepointStack.length = targetDepth + 1;

package/dist/src/vtab/memory/layer/connection.js.map

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

package/dist/src/vtab/memory/layer/manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../../../../src/vtab/memory/layer/manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../../../../src/vtab/memory/layer/manager.ts"],"names":[],"mappings":"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"}

package/dist/src/vtab/memory/layer/manager.js

@@ -188,11 +188,66 @@ export class MemoryTableManager {
             connection.clearSavepoints();
             return;
         }
+        // If pending is null but readLayer is a swapped savepoint snapshot
+        // AHEAD of the committed chain, wrap an empty pending around it so
+        // the snapshot's data lands in the committed chain. "Ahead" means
+        // readLayer's parent chain leads back to `_currentCommittedLayer`
+        // (i.e., the snapshot was forked off the current committed head).
+        // If readLayer is instead a stale ancestor (e.g., the connection was
+        // last seeing a TransactionLayer that has since been consolidated into
+        // `baseLayer` by ALTER TABLE) or carries an out-of-date schema, leave
+        // it alone — committing such a layer would supplant the schema-aware
+        // committed head with stale data.
+        if (!connection.pendingTransactionLayer
+            && connection.readLayer !== this._currentCommittedLayer
+            && connection.readLayer instanceof TransactionLayer
+            && connection.readLayer.getSchema() === this.tableSchema) {
+            let walker = connection.readLayer.getParent();
+            let isAhead = false;
+            while (walker) {
+                if (walker === this._currentCommittedLayer) {
+                    isAhead = true;
+                    break;
+                }
+                walker = walker.getParent();
+            }
+            if (isAhead) {
+                connection.pendingTransactionLayer = new TransactionLayer(connection.readLayer);
+                if (this.eventEmitter?.hasDataListeners?.()) {
+                    connection.pendingTransactionLayer.enableChangeTracking();
+                }
+            }
+        }
         const pendingLayer = connection.pendingTransactionLayer;
-        if (!pendingLayer)
+        if (!pendingLayer) {
+            // No pending — refresh readLayer to the current committed head so a
+            // stale ancestor (post-schema-change) doesn't leak into the next
+            // statement's view.
+            connection.readLayer = this._currentCommittedLayer;
             return;
-        // Capture changes before marking committed
-        const changes = pendingLayer.getPendingChanges();
+        }
+        // Capture changes from pendingLayer and any ancestor TransactionLayers
+        // up to (but not including) the currentCommittedLayer. Ancestor layers
+        // in the chain are typically savepoint-promoted in-transaction layers
+        // whose pendingChanges were never emitted (they were never directly
+        // committed). Walking the chain ensures events from earlier writes
+        // in the same transaction aren't dropped just because a SAVEPOINT
+        // promotion swapped the pending layer mid-transaction.
+        const eventChunks = [];
+        {
+            let layer = pendingLayer;
+            while (layer && layer !== this._currentCommittedLayer) {
+                if (layer instanceof TransactionLayer) {
+                    const events = layer.getPendingChanges();
+                    if (events.length > 0)
+                        eventChunks.push(events);
+                }
+                layer = layer.getParent();
+            }
+        }
+        // Chunks are newest-layer-first; reverse to chronological order while
+        // preserving intra-layer event order.
+        const changes = eventChunks.reverse().flat();
         const lockKey = `MemoryTable.Commit:${this.schemaName}.${this._tableName}`;
         const release = await Latches.acquire(lockKey);
         logger.debugLog(`[Commit ${connection.connectionId}] Acquired lock for ${this._tableName}`);
@@ -440,8 +495,15 @@ export class MemoryTableManager {
     }
     ensureTransactionLayer(connection) {
         if (!connection.pendingTransactionLayer) {
-            // Lazily create a new TransactionLayer based on the current committed layer
-            connection.pendingTransactionLayer = new TransactionLayer(this._currentCommittedLayer);
+            // Lazily create a new TransactionLayer parented on the connection's
+            // current readLayer (not the manager's _currentCommittedLayer).
+            // In the clean autocommit case the two are identical. After an
+            // eager-snapshot savepoint, readLayer is the immutable snapshot
+            // containing all in-transaction writes up to that point, so the
+            // new pending inherits those rows and reads-your-own-writes still
+            // works, while SELECTs iterating the snapshot don't see the new
+            // pending's mutations.
+            connection.pendingTransactionLayer = new TransactionLayer(connection.readLayer);
             // Enable change tracking if there are data listeners
             if (this.eventEmitter?.hasDataListeners?.()) {
                 connection.pendingTransactionLayer.enableChangeTracking();
@@ -467,7 +529,7 @@ export class MemoryTableManager {
         const primaryKey = this.primaryKeyFromRow(newRowData);
         const existingRow = this.lookupEffectiveRow(primaryKey, targetLayer);
         if (existingRow !== null) {
-            // Resolve PK-conflict action: statement OR > column-level default > ABORT.
+            // Resolve PK-conflict action: statement OR > per-constraint default > ABORT.
             const pkAction = onConflict ?? resolvePkDefaultConflict(schema) ?? ConflictResolution.ABORT;
             if (pkAction === ConflictResolution.IGNORE) {
                 return { status: 'ok', row: undefined };
@@ -538,6 +600,13 @@ export class MemoryTableManager {
             if (pkAction === ConflictResolution.IGNORE) {
                 return { status: 'ok', row: undefined };
             }
+            if (pkAction === ConflictResolution.REPLACE) {
+                // Evict the row currently at the new PK, then move the updated row.
+                targetLayer.recordDelete(newPrimaryKey, existingRowAtNewKey);
+                targetLayer.recordDelete(oldPrimaryKey, oldRowData);
+                targetLayer.recordUpsert(newPrimaryKey, newRowData, null);
+                return { status: 'ok', row: newRowData, replacedRow: existingRowAtNewKey };
+            }
             // Return constraint violation with existing row
             return {
                 status: 'constraint',
@@ -1079,6 +1148,7 @@ export class MemoryTableManager {
                     name: newIndexSchemaEntry.name,
                     columns: Object.freeze(newIndexSchemaEntry.columns.map(c => c.index)),
                     predicate: newIndexSchemaEntry.predicate,
+                    derivedFromIndex: newIndexSchemaEntry.name,
                 };
                 updatedUniqueConstraints = Object.freeze([
                     ...(this.tableSchema.uniqueConstraints ?? []),
@@ -1129,9 +1199,16 @@ export class MemoryTableManager {
                 }
                 throw new QuereusError(`Index '${indexName}' not on table '${this._tableName}'.`, StatusCode.ERROR);
             }
+            // Strip any UNIQUE constraint synthesized from this index alongside
+            // the index itself (mirrors SchemaManager.dropIndex). Without this,
+            // checkUniqueConstraints would keep enforcing it after DROP INDEX.
+            const remainingUniqueConstraints = (this.tableSchema.uniqueConstraints ?? []).filter(uc => uc.derivedFromIndex?.toLowerCase() !== indexNameLower);
             const finalNewTableSchema = Object.freeze({
                 ...this.tableSchema,
-                indexes: Object.freeze((this.tableSchema.indexes || []).filter(idx => idx.name.toLowerCase() !== indexNameLower))
+                indexes: Object.freeze((this.tableSchema.indexes || []).filter(idx => idx.name.toLowerCase() !== indexNameLower)),
+                uniqueConstraints: remainingUniqueConstraints.length > 0
+                    ? Object.freeze(remainingUniqueConstraints)
+                    : undefined,
             });
             this.baseLayer.updateSchema(finalNewTableSchema);
             await this.baseLayer.dropIndexFromBase(indexName);
@@ -1258,11 +1335,15 @@ export class MemoryTableManager {
     }
 }
 /**
- * Returns the first non-undefined `defaultConflict` declared on a primary-key
- * column. PK conflicts conceptually point at the table's PK; if any PK column
- * had `ON CONFLICT <action>` declared at column level, use that.
+ * Resolves the per-constraint default conflict action for PK conflicts.
+ * Prefers the table-level `PRIMARY KEY (...) ON CONFLICT <action>` clause
+ * (the constraint's own declaration) over any column-level `defaultConflict`
+ * declared on a PK column (which primarily targets that column's own
+ * constraints and only acts as a fallback for PK conflicts).
  */
 function resolvePkDefaultConflict(schema) {
+    if (schema.primaryKeyDefaultConflict !== undefined)
+        return schema.primaryKeyDefaultConflict;
     for (const def of schema.primaryKeyDefinition) {
         const col = schema.columns[def.index];
         if (col && col.defaultConflict !== undefined)