@@ -343,7 +343,7 @@ Two per-table virtual tables for time travel:
343343
344344``` sql
345345-- Every version of every row across all commits
346- SELECT * FROM dolt_history_users WHERE rowid_val = 42 ;
346+ SELECT * FROM dolt_history_users WHERE id = 42 ;
347347
348348-- The table as it existed at a specific commit / branch / tag
349349SELECT * FROM dolt_at_users(' abc123...' );
@@ -494,15 +494,18 @@ View and resolve merge conflicts:
494494``` sql
495495-- View which tables have conflicts (summary)
496496SELECT * FROM dolt_conflicts;
497- -- table_name | num_conflicts
498- -- users | 2
499-
500- -- View individual conflict rows for a table
497+ -- table | num_conflicts
498+ -- users | 2
499+
500+ -- View individual conflict rows for a table. Columns are
501+ -- (from_root_ish, base_<col>..., our_<col>..., our_diff_type,
502+ -- their_<col>..., their_diff_type, dolt_conflict_id) — one base/our/their
503+ -- triple per user column, plus per-side diff_type and a stable
504+ -- dolt_conflict_id for resolution.
501505SELECT * FROM dolt_conflicts_users;
502- -- base_rowid | base_value | our_rowid | our_value | their_rowid | their_value
503506
504507-- Resolve individual conflicts by deleting them (keeps current working value)
505- DELETE FROM dolt_conflicts_users WHERE base_rowid = 5 ;
508+ DELETE FROM dolt_conflicts_users WHERE dolt_conflict_id = 5 ;
506509
507510-- Or resolve all conflicts for a table at once
508511SELECT dolt_conflicts_resolve(' --ours' , ' users' ); -- keep our values
@@ -819,7 +822,7 @@ Doltlite is a drop-in replacement for SQLite, so the natural question is: what
819822does version control cost?
820823
821824Every PR runs a [ sysbench-style benchmark] ( test/sysbench_compare.sh ) comparing
822- doltlite against stock SQLite on 23 OLTP workloads, with a 2× ceiling enforced
825+ doltlite against stock SQLite on 31 OLTP workloads, with a 2× ceiling enforced
823826by CI. The per-release numbers (reads + writes table) are published with each
824827release on the [ GitHub releases page] ( https://github.com/dolthub/doltlite/releases ) .
825828Run ` test/sysbench_compare.sh ` to reproduce locally.
@@ -845,15 +848,15 @@ invocation).
845848
846849### Doltlite Shell Tests
847850
848- 40 test suites covering all features:
851+ 60+ test suites covering all features:
849852
850853``` bash
851854# Run all suites
852855cd build
853856bash ../test/run_doltlite_tests.sh
854857
855858# Run individual suites
856- bash ../test/doltlite_parity.sh # SQLite compatibility (110 tests)
859+ bash ../test/doltlite_parity.sh # SQLite compatibility (119 tests)
857860bash ../test/doltlite_commit.sh # Commits and log
858861bash ../test/doltlite_staging.sh # Add, status, staging
859862bash ../test/doltlite_branch.sh # Branching and checkout
0 commit comments