Maintainer fixup for the choose-your-own-storage-backend PR, amended across the
pre-review CI-repair and the review-loop apply-fixes iterations so contributor
commits stay intact under one maintainer commit.
CI repair (pre-review):
- default.nix: bump vendorHash for the added Postgres/MySQL driver deps.
- conformance.yml: provision the Postgres service DB with a C-locale cluster so
text ORDER BY sorts by code point, matching Dolt's utf8mb4_0900_bin oracle.
Review fixes — blockers:
- uow/doltserver_tx: on a non-serialization DOLT_COMMIT failure, ROLLBACK on the
pinned session before releasing it, and poison (pool-discard via driver.ErrBadConn)
the connection when the rollback also fails, so a later borrower can't inherit an
open transaction and implicitly commit orphaned writes. Satisfies the existing
doltserver_tx_test rollback/poison cases.
- sqlitedialect: translate GREATEST/LEAST to SQLite scalar max/min so the
ReconcileChildCounters upsert (GREATEST(last_child, ?)) no longer aborts creation
or import of hierarchical dotted issue IDs (e.g. x-1.2) on the SQLite backend.
Review fixes — majors:
- conformance: add a portable dotted hierarchical child-ID scenario (x-1, x-1.1,
x-1.2, x-1.2.1) exercising the ReconcileChildCounters GREATEST path on every
backend — the coverage hole that let the SQLite blocker ship green. Verified
against the embedded-Dolt oracle and the real SQLite driver.
- postgres: warn at provision/open when the database collation is not code-point
ordered (C/POSIX/C.*), since text ORDER BY otherwise diverges from Dolt silently.
- sqlite: pin the pool to one connection and add busy_timeout + WAL to the DSN so
overlapping operations wait instead of surfacing a raw "database is locked"
(matches the Dolt backend's single-connection posture). Adds a concurrency guard.
- cmd/bd: gate explicit `bd dolt commit` / `bd vc commit` with a typed
storage.ErrUnsupported on non-Dolt backends instead of the no-op Commit printing
"Committed."; internal opportunistic auto-commit is untouched.
Review fixes — attempt 2 (stale init backend-flag test contract):
- cmd/bd/init_test, init_embedded_test: the init backend-flag tests still asserted
the pre-#3151 one-backend contract (--backend=sqlite must fail "SQLite backend
has been removed"; --backend=postgres is an "unknown backend"), so
`go test ./cmd/bd -run '^TestInitBackendFlag$'` failed in a clean environment now
that sqlite/postgres/mysql are supported pluggable backends. Rewrite
TestInitBackendFlag and the cgo TestEmbeddedInit sibling (rejected_backends →
sql_backend_flags) for the new contract: --backend=sqlite initializes and
persists backend=sqlite; --backend=postgres is recognized and fails only on
missing connection config (not "unknown backend"); a genuinely unknown backend
is still rejected. Pin BEADS_DIR and scrub BEADS_*/BD_* so the subtests are
hermetic against an ambient .beads or Dolt server.
Cleanups (non-gating):
- cmd/bd/init: extract checkExistingSQLBackend so the added SQL-backend branches
don't inflate checkExistingBeadsDataAt's complexity, and load config once.
- configfile: correct the stale "Deprecated: always dolt" Backend field comment.
Review fixes -- attempt 3 (SQLite datetime parity blocker + conformance/rewrite
hardening of the storage-parity gate):
- sqlite/dsn: add _time_format=datetime. Without it modernc binds time.Time via
t.String() ("2026-07-09 12:34:56.123 +0000 UTC"), a shape SQLite's date functions
cannot parse, so the counts mega-query's DATE_FORMAT(created_at,...) (strftime on
SQLite) returns NULL and deps_json exposes a zero created_at while Dolt emits the
real timestamp. datetime stores whole-second "2026-07-09 12:34:56", matching
Dolt/MySQL datetime(0). Verified end-to-end against the real modernc driver.
- conformance: add ReadyWorkDepCreatedAtParity -- imports a dependency with a known
created_at (the bd import / CreateIssuesWithFullOptions bound-time.Time path) and
asserts the counts-rendered deps_json created_at equals it, closing the blind spot
that let the SQLite blocker ship green (the counts tests only checked DependencyCount).
Proven to fail on the pre-fix DSN and pass on both the fixed SQLite backend and the
embedded-Dolt oracle.
- conformance: add ClaimReadyIssueConcurrentExclusivity -- races 24 workers over 8
ready issues and asserts each is claimed exactly once, exercising the SQL backends'
multi-writer claim property that was previously only asserted, never raced. Gated to
the multi-connection dialects (postgres/mysql) via DialectName; SQLite (single-conn
pool) and embedded-Dolt skip.
- conformance.sh: run the embedded-Dolt reference conformance with
BEADS_TEST_EMBEDDED_DOLT=1 and fail loudly if it skips. It self-skips without the env
var, so the parity gate was reporting success while never running the reference oracle.
- mysqldialect: drive the is_blocked-recompute error-1093 rewrite test from the real
issueops templates (new issueops.SelfReferentialRecomputeTemplates) instead of a
hand-copied fixture, so template drift fails a non-gated test rather than only the
env-gated MySQL conformance suite. All four mark/unmark x issue/wisp templates
verified rewritten into the materialized derived-table form.
Note: the review re-flagged TestInitBackendFlag as failing, but it passes in a clean run
(plain and gms_pure_go, matching the scorecard's own rerun); the only cmd/bd failure in
this sandbox is an unrelated pre-existing embedded-Dolt/CGO test not in this PR's diff.
Review fixes -- attempt 4 (conformance-gate self-brick + all-wisps inline-dependency
drop blockers; Postgres error-log password-leak major):
- conformance.sh: anchor the embedded-Dolt reference skip/pass guards to top-level
result lines (^--- SKIP/PASS: TestConformance). The attempt-3 loud-fail guard used
an unanchored grep, so the indented, legitimate subtest skip of
ClaimReadyIssueConcurrentExclusivity (embedded-Dolt is single-writer) matched it and
false-failed the entire storage-parity gate on every run even when the top-level
suite passed. Whole-suite-skip protection is preserved.
- sqlkit/portable + embeddeddolt/create_issue: the all-wisps arm looped the
single-issue issueops.CreateIssueInTx, which runs no batch dependency-persist pass,
so an all-wisps batch carrying inline dependencies (e.g. importing no-history beads
with inter-bead edges -- export DOES include no-history beads, GH#2619) silently
dropped every edge (not even reported via OnSkippedDependency) and, one transaction
per issue, forfeited batch atomicity. Both now mark ephemeral, then run the whole
batch in ONE transaction through issueops.CreateIssuesInTx, matching the server-mode
DoltStore all-wisps arm. The embedded-Dolt reference oracle had the same latent drop,
so the oracle and the new SQL backends were corrected together to keep conformance
parity (the finding compared sqlkit against the server-mode DoltStore, which already
persisted these edges).
- conformance: add CreateAllWispsInlineDependencies -- an all-wisp batch with one valid
inter-wisp edge and one unresolvable edge; asserts the valid edge persists and the
unresolvable one is reported via OnSkippedDependency. Fails on the pre-fix per-issue
loop, passes on the batch path; verified on SQLite and the embedded-Dolt oracle, with
a full embedded-Dolt conformance re-run clean.
- pgdialect: scrub query-param/sslpassword secrets from pgx ParseConfig errors in Open
and OpenRaw (new ScrubDSNError). pgx's ParseConfigError redacts only URL userinfo, so
a postgres://u@h/db?password=SECRET DSN (the shape bd init connects with) leaked the
cleartext secret through the wrapped parse/TLS-config error into logs. Connect-time
errors were verified not to carry the password. Adds redact_error_test coverage for
the query-param, sslpassword, userinfo, and libpq-keyword shapes plus the real
Open/OpenRaw parse-failure path.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
77 lines
4.3 KiB
Bash
Executable file
77 lines
4.3 KiB
Bash
Executable file
#!/usr/bin/env bash
|
|
#
|
|
# Single conformance entrypoint. CI runs this verbatim; run it locally the same way:
|
|
#
|
|
# ./scripts/conformance.sh
|
|
#
|
|
# Two tiers, both reading the backend registry (test/conformance/profiles.go for the
|
|
# E2E tier; the per-backend conformance_test.go files for the in-process tier). Add a
|
|
# backend = add a profile + a factory; both tiers pick it up.
|
|
#
|
|
# Backends that need an external service auto-skip when their env is unset:
|
|
# BEADS_PG_TEST_URL postgres://user:pass@host:port/db (enables the postgres backend)
|
|
# BEADS_PG_PASSWORD optional, if the password is not in the URL
|
|
#
|
|
# Optional deep gate (bts-rs 523-scenario differential oracle; needs the bts-rs
|
|
# checkout + ~50 min, so it is off by default and not part of the per-PR loop):
|
|
# CONFORMANCE_DEEP=1 BTS_RS_DIR=/path/to/bts-rs ./scripts/conformance.sh
|
|
#
|
|
set -euo pipefail
|
|
cd "$(dirname "$0")/.."
|
|
|
|
TAGS="gms_pure_go"
|
|
|
|
echo "==> Tier 1: in-process store conformance + wedge gates"
|
|
# The embedded-Dolt backend runs the full backend-agnostic suite (conformance.RunAll) as
|
|
# the reference oracle every SQL backend is compared against. BEADS_TEST_EMBEDDED_DOLT=1
|
|
# is REQUIRED, not optional: without it that suite self-skips
|
|
# (internal/storage/embeddeddolt/conformance_test.go), which would let this whole
|
|
# storage-parity gate report success while never running the oracle. Run it with -v and
|
|
# fail loudly if the top-level TestConformance skips or reports no pass, so the gate can
|
|
# never go green on a silent skip.
|
|
#
|
|
# The skip/pass checks MUST anchor to top-level result lines (column 0). `go test -v`
|
|
# indents subtest results, and RunAll legitimately skips backend-inapplicable subtests
|
|
# (e.g. Claim/ClaimReadyIssueConcurrentExclusivity self-skips on the single-writer
|
|
# embedded-Dolt reference). An unanchored `--- SKIP: TestConformance` grep matches those
|
|
# indented subtest lines and false-fails the gate on every run even though the top-level
|
|
# suite passed.
|
|
embedded_dolt_log="$(mktemp)"
|
|
BEADS_TEST_EMBEDDED_DOLT=1 CGO_ENABLED=1 go test -tags "$TAGS" -v \
|
|
./internal/storage/embeddeddolt/ -run TestConformance | tee "$embedded_dolt_log"
|
|
if grep -qE '^--- SKIP: TestConformance' "$embedded_dolt_log" || ! grep -qE '^--- PASS: TestConformance' "$embedded_dolt_log"; then
|
|
rm -f "$embedded_dolt_log"
|
|
echo "FATAL: embedded-Dolt reference conformance skipped or did not run; storage parity gate is not enforced (need BEADS_TEST_EMBEDDED_DOLT=1)" >&2
|
|
exit 1
|
|
fi
|
|
rm -f "$embedded_dolt_log"
|
|
# Each SQL backend now passes the FULL in-process store conformance suite (TestConformance
|
|
# = conformance.RunAll, the same ~40 behavior subtests the Dolt reference runs) — the only
|
|
# methods it does NOT implement are the genuinely-Dolt-only ones (version-control/remote/
|
|
# sync/…), which RunAll does not exercise. Alongside RunAll: live smoke, the
|
|
# interface-completeness audit (shell == deferral allowlist — no SILENT unsupported) plus
|
|
# its behavioral complement (every allowlisted method returns typed ErrUnsupported), the
|
|
# seed-once regression, and the dialect corpus-PREPARE + password-redaction gates. All
|
|
# self-skip without BEADS_PG_TEST_URL.
|
|
CGO_ENABLED=1 go test -tags "$TAGS" ./internal/storage/postgres/ \
|
|
-run 'TestPGSmoke|TestInterfaceCompleteness|TestUnsupportedContract|TestConformance|TestSeedOnlyOnFirstProvision'
|
|
CGO_ENABLED=1 go test -tags "$TAGS" ./internal/storage/pgdialect/
|
|
# MySQL wedge gates (self-skip without BEADS_MYSQL_TEST_URL); the dialect rewrite test
|
|
# (the is_blocked 1093 workaround) always runs.
|
|
CGO_ENABLED=1 go test -tags "$TAGS" ./internal/storage/mysql/ \
|
|
-run 'TestInterfaceCompleteness|TestUnsupportedContract|TestConformance|TestSeedOnlyOnFirstProvision'
|
|
CGO_ENABLED=1 go test -tags "$TAGS" ./internal/storage/mysqldialect/
|
|
# SQLite is embedded (pure-Go), always runs.
|
|
CGO_ENABLED=1 go test -tags "$TAGS" ./internal/storage/sqlite/ \
|
|
-run 'TestInterfaceCompleteness|TestUnsupportedContract|TestConformance|TestSeedOnlyOnFirstProvision'
|
|
CGO_ENABLED=1 go test -tags "$TAGS" ./internal/storage/sqlitedialect/
|
|
|
|
echo "==> Tier 2: end-to-end 'bd init' + CLI conformance (differential vs Dolt)"
|
|
CGO_ENABLED=1 go test -tags "$TAGS e2e" ./test/conformance/
|
|
|
|
if [[ "${CONFORMANCE_DEEP:-0}" == "1" ]]; then
|
|
echo "==> Deep: bts-rs 523-scenario differential oracle"
|
|
./scripts/run-oracle-p.sh
|
|
fi
|
|
|
|
echo "==> conformance OK"
|