Skip to content
Source
Sign inSign up
TanStack/db

fix(db): retain accepted edits across older delete settlement #1907

MergedKyleAMathews(GitHub profile, opens in a new tab)merged 5 commits intomain fromrefs/pull/1907/headmerged by KyleAMathews(GitHub profile, opens in a new tab)

Summary

An accepted delete must still hide the old source row if a later reinsert fails. The old row previously reappeared when the delete settled before a dependent edit.

This PR keeps the delete and edit as separate accepted contributions while the reinsert remains unresolved. An active reinsert shows the edit. A successful reinsert keeps the edit visible. A failed reinsert clears the dependent edit and leaves the delete effective. Truncate replay preserves these outcomes.

Why

The optimistic-history oracle first found the opposite settlement-order failure on main. The Collection returned c: 0 after an accepted edit, but the independent model required c: 1.

A later review found a second failure. The delete settled first, then the dependent edit settled, and the reinsert failed. The Collection exposed the original source row instead of the accepted delete.

The new oracle crosses both delete/edit settlement orders, both reinsert outcomes, and truncate versus no truncate. Its test-only commit failed on the second history before the fix. The fix keeps the accepted delete while the edit still depends on the unconfirmed reinsert. The oracle review record records the exact RED and GREEN results.

Original oracle replay:

  • Seed: 617148825
  • Path: 13:5:4:12:12:15:15:19:21:23:24:27:27:33:34:26:29:26:27:26:26:26

Verification

  • The new eight-case matrix passed. Its delete-first, failed-reinsert case failed on the starting production code.
  • The exact seed-and-path oracle replay passed at the pushed head.
  • The DB oracle campaign passed 42 files and 2,601 tests.
  • The full DB runtime suite passed 186 files and 6,588 tests. Direct TypeScript validation passed separately.
  • The DB build, changed-file ESLint, Prettier, and diff validation passed.

This is a separate core-state follow-up. It does not change merged PR #1860 or the #1498 two-tab oracle.

Summary by CodeRabbit

  • Bug Fixes
    • Accepted edits to an item being reinserted remain visible when an earlier deletion is confirmed. This also applies after truncate replay, regardless of which operation settles first.
    • If an insertion fails, edits that depend on it are cleared while applicable accepted deletions remain in effect.
    • Optimistic changes now remain consistent across insertion, deletion, and truncate outcomes, including when a reinsert succeeds or fails.
    1. Review in Change Stack →

      Navigate logical layers of code changes, visualize relationships, and explore their blast radius.

      No actionable comments were generated in the recent review. 🎉

      ℹ️ Recent review info
      ⚙️ Run configuration

      Configuration used: defaults

      Review profile: CHILL

      Plan: Advanced

      Run ID: 1d861109-0d16-4472-a57e-1848c7901de4

      📥 Commits

      Reviewing files that changed from the base of the PR and between e1cfd38761c9901e693568bc4394219e05b2e42c and 71506898d6f48ba2ed4937d916d41dc28cc20b32.

      📒 Files selected for processing (6)
      • .changeset/fix-accepted-dependent-edit.md
      • docs/contributing/oracle-coverage.md
      • docs/contributing/oracle-reviews/pr-1907-accepted-delete-ownership.md
      • packages/db/src/collection/state.ts
      • packages/db/tests/collection-state-retention-oracle.property.test.ts
      • packages/db/tests/optimistic-history-oracle.ts
      🚧 Files skipped from review as they are similar to previous changes (1)
      • .changeset/fix-accepted-dependent-edit.md

      Included review availability: This review used your included allowance. Your plan provides up to 8 included reviews per hour; 7 remain after this review.


      📝 Walkthrough

      Walkthrough

      Optimistic upserts now track their insert mutation and transaction. Delete settlement and truncate replay preserve dependent edits and applicable delete layers. Tests cover settlement order, reinsert outcome, and truncate combinations.

      Changes

      Optimistic edit retention

      Layer / File(s)Summary
      Preserve dependent edits through settlement and truncate replay
      packages/db/src/collection/state.ts, packages/db/tests/collection-state-retention-oracle.property.test.ts, packages/db/tests/optimistic-history-oracle.ts, docs/contributing/oracle-coverage.md, docs/contributing/oracle-reviews/*, .changeset/fix-accepted-dependent-edit.md
      Optimistic upserts retain their insert mutation and transaction. Delete settlement and failure cleanup preserve dependent edits and accepted deletes as applicable. Truncate snapshots capture both layers and retain applicable pending direct deletes. Tests cover eight combinations of truncate, settlement order, and reinsert acceptance. Oracle records describe the assertions and coverage limits. The changeset declares a patch release for @tanstack/db.

      Priority: ➖ Normal

      Estimated code review effort: 3 (Moderate) | ~20 minutes

      Change: Bug fix

      Merge Risk: ⚪ Minimal · up to 71506

      The reported replay issue does not occur through this path. No actionable merge-blocking issue remains after normal checks.

      Security Architecture Review

      Security architecture risk: 🔵 Low · up to 71506

      The change affects which row remains visible when related operations finish in different orders. The inspected mutation and replay paths did not show expanded access or a new privilege path, but behavior outside the library and recovery after a process interruption are not fully established.

      Retained concerns No architecture-level concerns identified.

      Security review details

      Security Blast Radius

      • inferred — The directly inspected effect is visible row state within a collection, potentially including all captured keys during truncate; tenant boundaries and exposure through external consumers are not established by these paths.

      Trust Boundaries and Controls

      • inferred — The changed replay logic consumes existing collection mutations rather than adding a mutation admission path; no authorization or cross-collection bypass was identified in the inspected callers and state transitions.

      Resilience and Maintainability Implications

      • observed — Cancellation declines transactions whose application has started, while completed transactions are removed from bookkeeping and failed transactions remain available for rollback recomputation.
      🚥 Pre-merge checks | ✅ 5
      ✅ Passed checks (5 passed)
      Check nameStatusExplanation
      Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 3…
      Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
      Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
      Title check✅ PassedThe title clearly and concisely describes the main change: retaining accepted edits when an older delete settles.
      Description check✅ PassedThe description explains the change, motivation, affected behavior, test coverage, and verification results. It does not use the template headings or explicitly state the checklist and release-impact …
      ✨ Finishing Touches
      📝 Generate docstrings
      • Commit to this branch
      • Create a new PR
      🧪 Generate unit tests (beta)
      • Commit to this branch
      • Create a new PR

      Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

      ❤️ Share
      Comment `@coderabbitai help` to get the list of available commands.
    2. More templates

      @tanstack/angular-db

      npm i https://pkg.pr.new/@tanstack/angular-db@1907

      @tanstack/browser-db-sqlite-persistence

      npm i https://pkg.pr.new/@tanstack/browser-db-sqlite-persistence@1907

      @tanstack/capacitor-db-sqlite-persistence

      npm i https://pkg.pr.new/@tanstack/capacitor-db-sqlite-persistence@1907

      @tanstack/cloudflare-durable-objects-db-sqlite-persistence

      npm i https://pkg.pr.new/@tanstack/cloudflare-durable-objects-db-sqlite-persistence@1907

      @tanstack/db

      npm i https://pkg.pr.new/@tanstack/db@1907

      @tanstack/db-ivm

      npm i https://pkg.pr.new/@tanstack/db-ivm@1907

      @tanstack/db-sqlite-persistence-core

      npm i https://pkg.pr.new/@tanstack/db-sqlite-persistence-core@1907

      @tanstack/electric-db-collection

      npm i https://pkg.pr.new/@tanstack/electric-db-collection@1907

      @tanstack/electron-db-sqlite-persistence

      npm i https://pkg.pr.new/@tanstack/electron-db-sqlite-persistence@1907

      @tanstack/expo-db-sqlite-persistence

      npm i https://pkg.pr.new/@tanstack/expo-db-sqlite-persistence@1907

      @tanstack/node-db-sqlite-persistence

      npm i https://pkg.pr.new/@tanstack/node-db-sqlite-persistence@1907

      @tanstack/offline-transactions

      npm i https://pkg.pr.new/@tanstack/offline-transactions@1907

      @tanstack/powersync-db-collection

      npm i https://pkg.pr.new/@tanstack/powersync-db-collection@1907

      @tanstack/query-db-collection

      npm i https://pkg.pr.new/@tanstack/query-db-collection@1907

      @tanstack/react-db

      npm i https://pkg.pr.new/@tanstack/react-db@1907

      @tanstack/react-native-db-sqlite-persistence

      npm i https://pkg.pr.new/@tanstack/react-native-db-sqlite-persistence@1907

      @tanstack/react-router-with-db

      npm i https://pkg.pr.new/@tanstack/react-router-with-db@1907

      @tanstack/rxdb-db-collection

      npm i https://pkg.pr.new/@tanstack/rxdb-db-collection@1907

      @tanstack/solid-db

      npm i https://pkg.pr.new/@tanstack/solid-db@1907

      @tanstack/svelte-db

      npm i https://pkg.pr.new/@tanstack/svelte-db@1907

      @tanstack/tauri-db-sqlite-persistence

      npm i https://pkg.pr.new/@tanstack/tauri-db-sqlite-persistence@1907

      @tanstack/trailbase-db-collection

      npm i https://pkg.pr.new/@tanstack/trailbase-db-collection@1907

      @tanstack/vue-db

      npm i https://pkg.pr.new/@tanstack/vue-db@1907

      commit: 7150689

    3. Size Change: +69 B (+0.04%)

      Total Size: 174 kB

      📦 View Changed
      FilenameSizeChange
      packages/db/dist/esm/collection/state.js8.32 kB+69 B (+0.84%)
      ℹ️ View Unchanged
      FilenameSize
      packages/db/dist/esm/client.js3.7 kB
      packages/db/dist/esm/collection-options.js236 B
      packages/db/dist/esm/collection/change-events.js1.44 kB
      packages/db/dist/esm/collection/changes.js2.4 kB
      packages/db/dist/esm/collection/cleanup-queue.js794 B
      packages/db/dist/esm/collection/events.js481 B
      packages/db/dist/esm/collection/index.js4.46 kB
      packages/db/dist/esm/collection/indexes.js1.99 kB
      packages/db/dist/esm/collection/lifecycle.js2.69 kB
      packages/db/dist/esm/collection/mutations.js2.61 kB
      packages/db/dist/esm/collection/subscription.js8.81 kB
      packages/db/dist/esm/collection/sync.js5.09 kB
      packages/db/dist/esm/collection/transaction-metadata.js144 B
      packages/db/dist/esm/deferred.js207 B
      packages/db/dist/esm/errors.js5.34 kB
      packages/db/dist/esm/event-emitter.js964 B
      packages/db/dist/esm/index.js3.82 kB
      packages/db/dist/esm/indexes/auto-index.js829 B
      packages/db/dist/esm/indexes/base-index.js1.18 kB
      packages/db/dist/esm/indexes/basic-index.js2.07 kB
      packages/db/dist/esm/indexes/btree-index.js2.26 kB
      packages/db/dist/esm/indexes/index-registry.js820 B
      packages/db/dist/esm/indexes/reverse-index.js376 B
      packages/db/dist/esm/live-query-adapter.js318 B
      packages/db/dist/esm/live-query-observer.js3.69 kB
      packages/db/dist/esm/live-query-options.js731 B
      packages/db/dist/esm/live-query-window-controller.js4.36 kB
      packages/db/dist/esm/local-only.js989 B
      packages/db/dist/esm/local-storage.js2.17 kB
      packages/db/dist/esm/optimistic-action.js359 B
      packages/db/dist/esm/paced-mutations.js496 B
      packages/db/dist/esm/proxy.js3.32 kB
      packages/db/dist/esm/query/builder/clone-query.js748 B
      packages/db/dist/esm/query/builder/functions.js1.47 kB
      packages/db/dist/esm/query/builder/index.js6.76 kB
      packages/db/dist/esm/query/builder/query-ir.js116 B
      packages/db/dist/esm/query/builder/ref-proxy.js1.28 kB
      packages/db/dist/esm/query/compiler/evaluators.js2.04 kB
      packages/db/dist/esm/query/compiler/expressions.js603 B
      packages/db/dist/esm/query/compiler/group-by.js4.14 kB
      packages/db/dist/esm/query/compiler/index.js9.11 kB
      packages/db/dist/esm/query/compiler/joins.js2.99 kB
      packages/db/dist/esm/query/compiler/lazy-targets.js1.12 kB
      packages/db/dist/esm/query/compiler/order-by.js1.93 kB
      packages/db/dist/esm/query/compiler/parent-routes.js319 B
      packages/db/dist/esm/query/compiler/query-equivalence.js455 B
      packages/db/dist/esm/query/compiler/route-metadata.js1.24 kB
      packages/db/dist/esm/query/compiler/select.js1.59 kB
      packages/db/dist/esm/query/effect.js5.22 kB
      packages/db/dist/esm/query/equality-value-identity.js591 B
      packages/db/dist/esm/query/expression-helpers.js1.45 kB
      packages/db/dist/esm/query/ir-stable-identity.js4.21 kB
      packages/db/dist/esm/query/ir.js1.74 kB
      packages/db/dist/esm/query/live-query-collection.js391 B
      packages/db/dist/esm/query/live/bucket-facade-adapter.js2.73 kB
      packages/db/dist/esm/query/live/collection-config-builder.js7.11 kB
      packages/db/dist/esm/query/live/collection-registry.js264 B
      packages/db/dist/esm/query/live/collection-subscriber.js2.31 kB
      packages/db/dist/esm/query/live/internal.js145 B
      packages/db/dist/esm/query/live/materialized-pipeline.js2.32 kB
      packages/db/dist/esm/query/live/ordered-source-loader.js4.32 kB
      packages/db/dist/esm/query/live/subset-demand-controller.js1.57 kB
      packages/db/dist/esm/query/live/utils.js1.19 kB
      packages/db/dist/esm/query/optimizer.js3.11 kB
      packages/db/dist/esm/query/query-once.js359 B
      packages/db/dist/esm/query/runtime-reference-identity.js630 B
      packages/db/dist/esm/query/subset-dedupe.js497 B
      packages/db/dist/esm/scheduler.js1.34 kB
      packages/db/dist/esm/SortedMap.js1.3 kB
      packages/db/dist/esm/strategies/debounceStrategy.js247 B
      packages/db/dist/esm/strategies/queueStrategy.js428 B
      packages/db/dist/esm/strategies/throttleStrategy.js246 B
      packages/db/dist/esm/sync-persistence.js530 B
      packages/db/dist/esm/transactions.js3.71 kB
      packages/db/dist/esm/utils.js1.21 kB
      packages/db/dist/esm/utils/array-utils.js270 B
      packages/db/dist/esm/utils/browser-polyfills.js304 B
      packages/db/dist/esm/utils/btree.js4.51 kB
      packages/db/dist/esm/utils/callbacks.js174 B
      packages/db/dist/esm/utils/comparison.js1.5 kB
      packages/db/dist/esm/utils/cursor.js677 B
      packages/db/dist/esm/utils/error.js167 B
      packages/db/dist/esm/utils/get-or-create.js155 B
      packages/db/dist/esm/utils/index-optimization.js2.42 kB
      packages/db/dist/esm/utils/type-guards.js230 B
      packages/db/dist/esm/utils/uuid.js449 B
      packages/db/dist/esm/virtual-props.js360 B
      compressed-size-action::db-package-size
    4. Size Change: 0 B

      Total Size: 7.97 kB

      ℹ️ View Unchanged
      FilenameSize
      packages/react-db/dist/esm/DbProvider.js317 B
      packages/react-db/dist/esm/HydrationBoundary.js263 B
      packages/react-db/dist/esm/index.js330 B
      packages/react-db/dist/esm/live-query-internals.js282 B
      packages/react-db/dist/esm/useLiveInfiniteQuery.js1.9 kB
      packages/react-db/dist/esm/useLiveQuery.js3.3 kB
      packages/react-db/dist/esm/useLiveQueryEffect.js355 B
      packages/react-db/dist/esm/useLiveSuspenseQuery.js820 B
      packages/react-db/dist/esm/usePacedMutations.js401 B
      compressed-size-action::react-db-package-size

Sign in to join this conversation.