diff --git a/.github/scripts/embedded-storage-test-shards.txt b/.github/scripts/embedded-storage-test-shards.txt index 089738a24..f06b0bcd3 100644 --- a/.github/scripts/embedded-storage-test-shards.txt +++ b/.github/scripts/embedded-storage-test-shards.txt @@ -178,6 +178,7 @@ 40 4 TestBlockedListerContract 40 4 TestCreateBatchFastPathsMatchPerRowSmallDepAdd_Embedded +40 4 TestEmbeddedFirstMintOnEmptyHistoryIsRevisionOne 40 4 TestEmbeddedIssueOperationsUpdateLabelPatchOrdering 40 4 TestEmbeddedReaderGetMissIsNotFoundAndBackendFailureDoesNotDecay 40 4 TestEmbeddedReaderListFilterFamiliesNarrowToTheirRows @@ -571,6 +572,7 @@ 40 39 TestEmbeddedDependencyEditorMixedBatchRefusalRollsBackBothPlanes 40 39 TestEmbeddedIssueOperationsClaimLeavesBlockedStateAlone 40 39 TestEmbeddedMigrateRepairedDependenciesIDColumnCommitsAtomicallyWithVersion53_4690 +40 39 TestEmbeddedMigration0071ReplacesDescendingCompactionSnapshotsIndex 40 39 TestEmbeddedReaderListSkipCountsDropsTheCardinalitiesAndNothingElse 40 39 TestEmbeddedRelationsResolvesAWispAnchor 40 39 TestParticipationGenerationFence diff --git a/CHANGELOG.md b/CHANGELOG.md index cf1021419..f74c873b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -535,6 +535,40 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 transport, so a write makes one handshake. `bd list` reads its vocabulary with one `listSettings`, and the hook decorator skips its post-write re-reads when no hook for the event is installed. +- **Embedded mode now runs Dolt 2.4.1 (`dolthub/driver` v2.4.1), and + migration 0071 keeps the databases it creates open to Dolt older than + 2.3.3.** Dolt 2.3.3 and later store a descending index column as + descending (dolthub/dolt#11746), where earlier releases silently stored it + ascending, and migration 0010 declares `compaction_snapshots`' + `idx_comp_snap_issue` with `created_at DESC`. Dolt older than 2.3.3 cannot + read a table holding such an index: writes to any table and + `information_schema` queries fail with `table has unknown fields`, on 2.1.8 + an `UPDATE` or `DELETE` on `issues` reports a `fk_comp_snap_issue` violation, + and a `bd` that links an older Dolt fails to open the workspace with + `schema skew check: probing schema_migrations existence: Error 1105: table + has unknown fields`, which `BD_IGNORE_SCHEMA_SKEW=1` does not get past. The + descending order never served a query, so migration 0071 replaces the + index with `idx_comp_snap_issue_asc` (`issue_id`, `compaction_level`, + `created_at`, all ascending) on every database, including one whose schema + a `dolt sql-server` 2.3.3 or newer created. At schema version 71, Dolt + 2.1.8 and 2.2.0 read, write, push and clone the database, and a v69 `bd` + on the Dolt 2.2.0 driver stops at its ordinary schema-version refusal + instead, which `BD_IGNORE_SCHEMA_SKEW=1` gets past (measured 2026-10-18). + One gap remains: `bd init` commits each migration separately, so on a + database created by Dolt 2.3.3 or later the commits from before 0071 still + hold the descending index. On older Dolt, reading `compaction_snapshots` at + one of them (`AS OF`, `dolt_history_compaction_snapshots`, + `dolt_diff_compaction_snapshots`) fails, and so does any `dolt diff` with + one as an endpoint. The recommended `dolt` CLI and `dolt sql-server` + version is now 2.4.1 or later, the release CI pins, measured free of the + `DOLT_RESET('--hard')` defect described in docs/architecture/dolt.md. + Releases before 2.4.0 also drop a join condition when an `ON` clause has an + `OR` over indexed columns (dolthub/dolt#11886, the cause of #7037). Managed + proxied-server mode now recommends dolt 2.4.1 or newer and warns below it; + it is still a warning, not a refusal. Dolt 2.3.3 and later also report a + stricter default `sql_mode` than 2.2.0, adding `NO_ZERO_IN_DATE`, + `NO_ZERO_DATE` and `ERROR_FOR_DIVISION_BY_ZERO`, in embedded mode and on + those servers. - **`created_by` defaults to the actor in the library, for every create shape and every backend.** `PreparePublicCreateRequest`, which `Lifecycle.Create`, `BatchCreator` items and batch-apply create items all diff --git a/default.nix b/default.nix index 22a4bc8bf..1a76c5bce 100644 --- a/default.nix +++ b/default.nix @@ -19,7 +19,7 @@ buildGoModule { # proxyVendor avoids vendor/modules.txt consistency checks when the vendored # tree lags go.mod/go.sum. proxyVendor = true; - vendorHash = "sha256-IL80Qs9c7ZG17R/hRF6D+F6WVmGB0I+k60+nFuUpIJA="; + vendorHash = "sha256-gmmYdg3fFN7ovArk/JGpnZiLB8oa/9yI1oOrRXMyOXo="; # Match go.mod to the selected Nix Go toolchain. buildGoModule also builds # vendored dependencies in the Nix sandbox, where toolchain downloads are not diff --git a/docs/architecture/dolt.md b/docs/architecture/dolt.md index 5e41e492f..80676d0a4 100644 --- a/docs/architecture/dolt.md +++ b/docs/architecture/dolt.md @@ -26,7 +26,7 @@ Install a specific version. Do not install `releases/latest` — see version to use and why the pin exists. ```bash -DOLT_VERSION=2.2.0 # see "Which Dolt version to install" below +DOLT_VERSION=2.4.1 # see "Which Dolt version to install" below os=$(uname -s | tr '[:upper:]' '[:lower:]') arch=$(uname -m | sed -e 's/^x86_64$/amd64/' -e 's/^aarch64$/arm64/') @@ -44,14 +44,36 @@ against the pin below. ### Which Dolt version to install -Beads pins Dolt to **2.2.0**. CI installs that same pin with +Beads pins Dolt to **2.4.1**. CI installs that same pin with `scripts/ci/install-dolt.sh`, which records the per-version measurements and the criterion for raising it; raise the pin here and in that script together. This pin is about the standalone `dolt` CLI, which only server and proxied-server mode use. Embedded mode is unaffected either way: it links the -Dolt engine into `bd` at the version in `go.mod`, currently the commit tagged -v2.2.0 upstream, no matter which `dolt` CLI is on your PATH. +Dolt engine into `bd` through the v2.4.1 driver in `go.mod`, no matter which +`dolt` CLI is on your PATH. The CLI pin tracks that driver, so every mode runs +the same engine. + +Dolt 2.3.3 is the first release that stores a descending index column as +descending (dolthub/dolt#11746), and older releases cannot read a table that +holds one: even a plain `INSERT` fails with `table has unknown fields`. The +beads schema declared one such column until schema version 71, which replaces +it with an ascending index. Measured against databases the v2.4.1 engine +created before version 71: on 2026-10-10, dolt 2.2.0 and 2.3.1 failed that +`INSERT` and 2.4.1 succeeded; on 2026-10-17, 2.2.0 and 2.3.2 failed and 2.3.3, +2.4.0 and 2.4.1 succeeded. On 2026-10-18, dolt 2.1.8 and 2.2.0 read, wrote, +pushed, cloned and pulled a database `bd init` had migrated to version 71. + +History is the exception. `bd init` commits each schema migration separately, +so on a database a Dolt 2.3.3 or newer engine created, embedded mode +included, the commits from before version 71 still hold the descending +column. Dolt older than 2.3.3 fails to read `compaction_snapshots` at those +commits (an `AS OF` query, `dolt_history_compaction_snapshots`, +`dolt_diff_compaction_snapshots`) and fails any `dolt diff` with one of them +as an endpoint, even a diff of another table. Other tables' `AS OF` and +`dolt_history_` reads work. Dolt before 2.4.0 also has a join bug that +returns wrong results (dolthub/dolt#11886). Both are reasons to install the +pin rather than an older release. Dolt 2.3.0 (released 2026-08-13) regressed `CALL DOLT_RESET('--hard')`. A few percent of freshly created databases come up with that procedure unusable — @@ -68,11 +90,15 @@ Measured by creating fresh databases and immediately calling the procedure: | 2.1.8 | 0 / 40 | | 2.2.0 | 0 / 60 | | 2.3.0 | 3 / 60 | -| 2.3.1 | 3 / 100 | +| 2.3.1 | 3 / 100 (2026-08-20); 8 / 150 (2026-10-10) | +| 2.4.1 | 0 / 250 | -Versions after 2.3.1 have not been measured. Raise the pin only once a newer -release is confirmed clean by that same measurement — not because it is -newer. +The 2026-10-10 runs re-measured 2.3.1 as a positive control, confirming the +method still reproduces the regression; the embedded engine through the +v2.4.1 driver measured 0 / 60. 2.4.1 is the only release after 2.3.1 +measured this way; 2.3.2, 2.3.3 and 2.4.0 have not been. Raise the pin only +once a newer release is confirmed clean by that same measurement — not +because it is newer. Pin rather than track `latest` for a second, independent reason: the upstream `releases/latest` URL resolves to the most recently *created* release, not the diff --git a/docs/reference/troubleshooting.md b/docs/reference/troubleshooting.md index 78e26267c..c904c4c93 100644 --- a/docs/reference/troubleshooting.md +++ b/docs/reference/troubleshooting.md @@ -395,20 +395,25 @@ Managed proxied-server mode spawns an external `dolt` CLI it finds via clone-local sidecar setting will slot between the two when the sidecar reader lands in contract part 2). On startup it probes that binary with `dolt version` and recommends -**dolt >= 2.0.0**: the 2026-07-25 cross-version compatibility matrix found -that cross-reading storage written by the beads Dolt Go module (as opposed -to writing it, which older dolt CLIs can also do) requires dolt >= 2.0.0 — -dolt 1.85 can *serve* proxied mode but cannot *read* storage the module -wrote, and dolt 1.52.1 fails at both serving and reading. +**dolt >= 2.4.1**, matching the Dolt engine `bd` links (the v2.4.1 driver). +Older releases have two known problems. Dolt before 2.4.0 has a join bug that +returns wrong results (dolthub/dolt#11886). Dolt before 2.3.3 fails with +`table has unknown fields` on a descending index column (dolthub/dolt#11746), +which a database created by Dolt 2.3.3 or newer holds until `bd` migrates it +to schema version 71, and keeps in its history from before that. +[Which Dolt version to install](/architecture/dolt#which-dolt-version-to-install) +records the dated measurements. (Earlier, the 2026-07-25 cross-version matrix +had found that dolt < 2.0.0 cannot even *read* storage the module wrote.) This is a warning, not a hard failure — there is deliberately no hard version floor, so an older dolt can still be used at your own risk. To resolve it, install the pinned dolt version — see [Which Dolt version to install](/architecture/dolt#which-dolt-version-to-install) — and either update PATH or set `BEADS_DOLT_BIN` to the new binary's path. -Install that specific version rather than `latest`: 2.3.x is a newer release -that satisfies this warning but carries a -[separate data-operation defect](/architecture/dolt#which-dolt-version-to-install). +Install that specific version rather than `latest`: the pin is the release +measured clean for a +[separate data-operation defect](/architecture/dolt#which-dolt-version-to-install), +and `releases/latest` can move to an unmeasured release. The advisory repeats at most once per day, not on every command: the probe result and the warning timestamp are cached (keyed by the binary's path, diff --git a/examples/bd-example-extension-go/go.mod b/examples/bd-example-extension-go/go.mod index 10f5973a8..4f109aa94 100644 --- a/examples/bd-example-extension-go/go.mod +++ b/examples/bd-example-extension-go/go.mod @@ -58,17 +58,17 @@ require ( github.com/cockroachdb/apd/v3 v3.2.3 // indirect github.com/denisbrodbeck/machineid v1.0.1 // indirect github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12 // indirect - github.com/dolthub/dolt/go v0.40.5-0.20260806213044-796d07497741 // indirect - github.com/dolthub/driver/v2 v2.2.0 // indirect + github.com/dolthub/dolt/go v0.40.5-0.20261002233748-c6af56fead88 // indirect + github.com/dolthub/driver/v2 v2.4.1 // indirect github.com/dolthub/eventsapi_schema v0.0.0-20260715220557-d9b4a1c6b4d4 // indirect + github.com/dolthub/file-locks v0.1.2 // indirect github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 // indirect - github.com/dolthub/fslock v0.0.5 // indirect github.com/dolthub/go-icu-regex v0.0.0-20260610153742-72563bc7ca83 // indirect - github.com/dolthub/go-mysql-server v0.20.1-0.20260805191915-e5eafe0da809 // indirect + github.com/dolthub/go-mysql-server v0.20.1-0.20261001232740-19405eb6f203 // indirect github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 // indirect github.com/dolthub/ishell v0.0.0-20260414231531-5f031e3e9037 // indirect - github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71 // indirect - github.com/dolthub/vitess v0.0.0-20260728212736-0542037326d7 // indirect + github.com/dolthub/jsonpath v0.0.2-0.20260807003725-336cd89c1c76 // indirect + github.com/dolthub/vitess v0.0.0-20260930232419-a6b7b0c65d17 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/edsrzf/mmap-go v1.2.0 // indirect github.com/envoyproxy/go-control-plane/envoy v1.37.0 // indirect @@ -83,7 +83,6 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/go-sql-driver/mysql v1.10.1 // indirect github.com/go-viper/mapstructure/v2 v2.5.0 // indirect - github.com/goccy/go-json v0.10.5 // indirect github.com/gocraft/dbr/v2 v2.7.6 // indirect github.com/gofrs/flock v0.8.1 // indirect github.com/golang-jwt/jwt/v5 v5.3.0 // indirect @@ -96,7 +95,7 @@ require ( github.com/google/uuid v1.6.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.11 // indirect github.com/googleapis/gax-go/v2 v2.17.0 // indirect - github.com/gowebpki/jcs v1.0.1 // indirect + github.com/gowebpki/jcs v1.0.2 // indirect github.com/hashicorp/golang-lru v1.0.2 // indirect github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect github.com/juju/gnuflag v1.0.0 // indirect @@ -107,7 +106,7 @@ require ( github.com/lestrrat-go/strftime v1.2.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.22 // indirect - github.com/mattn/go-runewidth v0.0.24 // indirect + github.com/mattn/go-runewidth v0.0.28 // indirect github.com/mohae/uvarint v0.0.0-20160208145430-c3f9e62bf2b0 // indirect github.com/olebedev/when v1.1.0 // indirect github.com/oracle/oci-go-sdk/v65 v65.55.0 // indirect @@ -146,31 +145,32 @@ require ( go.opentelemetry.io/contrib/detectors/gcp v1.44.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.70.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.70.0 // indirect - go.opentelemetry.io/otel v1.46.0 // indirect - go.opentelemetry.io/otel/metric v1.46.0 // indirect - go.opentelemetry.io/otel/sdk v1.46.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.46.0 // indirect - go.opentelemetry.io/otel/trace v1.46.0 // indirect + go.opentelemetry.io/otel v1.47.0 // indirect + go.opentelemetry.io/otel/log v1.47.0 // indirect + go.opentelemetry.io/otel/metric v1.47.0 // indirect + go.opentelemetry.io/otel/sdk v1.47.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.47.0 // indirect + go.opentelemetry.io/otel/trace v1.47.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect go.yaml.in/yaml/v3 v3.0.5 // indirect - golang.org/x/crypto v0.55.0 // indirect + golang.org/x/crypto v0.57.0 // indirect golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect - golang.org/x/mod v0.40.0 // indirect - golang.org/x/net v0.58.0 // indirect + golang.org/x/mod v0.41.0 // indirect + golang.org/x/net v0.59.0 // indirect golang.org/x/oauth2 v0.36.0 // indirect - golang.org/x/sync v0.23.0 // indirect - golang.org/x/sys v0.48.0 // indirect + golang.org/x/sync v0.24.0 // indirect + golang.org/x/sys v0.49.0 // indirect golang.org/x/telemetry v0.0.0-20260811182544-a038080d80e5 // indirect - golang.org/x/term v0.46.0 // indirect - golang.org/x/text v0.41.0 // indirect + golang.org/x/term v0.47.0 // indirect + golang.org/x/text v0.42.0 // indirect golang.org/x/time v0.14.0 // indirect golang.org/x/tools v0.49.0 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect google.golang.org/api v0.264.0 // indirect google.golang.org/genproto v0.0.0-20260128011058-8636f8732409 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20260819154853-08b0e4226688 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260819154853-08b0e4226688 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20260928230214-8a89bd6388cc // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260928230214-8a89bd6388cc // indirect google.golang.org/grpc v1.83.2 // indirect google.golang.org/protobuf v1.36.12 // indirect gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect diff --git a/examples/bd-example-extension-go/go.sum b/examples/bd-example-extension-go/go.sum index 65acbc008..0494f1aa2 100644 --- a/examples/bd-example-extension-go/go.sum +++ b/examples/bd-example-extension-go/go.sum @@ -359,28 +359,28 @@ github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12 h1:I github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12/go.mod h1:rN7X8BHwkjPcfMQQ2QTAq/xM3leUSGLfb+1Js7Y6TVo= github.com/dolthub/dolt-mcp v0.3.4 h1:AyG5cw+fNWXDHXujtQnqUPZrpWtPg6FN6yYtjv1pP44= github.com/dolthub/dolt-mcp v0.3.4/go.mod h1:bCZ7KHvDYs+M0e+ySgmGiNvLhcwsN7bbf5YCyillLrk= -github.com/dolthub/dolt/go v0.40.5-0.20260806213044-796d07497741 h1:z+Disx4RJn0dxaYSzcp8pbiXddi3dpIoUJaMtVa/iBE= -github.com/dolthub/dolt/go v0.40.5-0.20260806213044-796d07497741/go.mod h1:houDkPceGRjDBdaDsfym5OQUB4465mBUnPvSxMOPrPo= -github.com/dolthub/driver/v2 v2.2.0 h1:Qm9BhvvKNmeTDF6kZdDkdLe62CF1W6GrCA3ZDRx/tlk= -github.com/dolthub/driver/v2 v2.2.0/go.mod h1:Ngki9vM88/sqin1RKfUt/9Ex8DmoePtHgY7d4+YoolU= +github.com/dolthub/dolt/go v0.40.5-0.20261002233748-c6af56fead88 h1:2HfeitrXNFvlCPWog+yMjSeZ4qBWSZOnOaeWI9Ai8QU= +github.com/dolthub/dolt/go v0.40.5-0.20261002233748-c6af56fead88/go.mod h1:+DGXtWsZ7EFxHfh7LFKUEVdfj9aDPhR5SnaLZ7dxWQQ= +github.com/dolthub/driver/v2 v2.4.1 h1:Wzk1Wd6GVQ3CpBa2OQgGTb1KoldMDfYgu2hVzyVrSJg= +github.com/dolthub/driver/v2 v2.4.1/go.mod h1:dWP6ygBQw8JUIG9uvQo1R/vAfeCV9Sg7t9neNx7THyc= github.com/dolthub/eventsapi_schema v0.0.0-20260715220557-d9b4a1c6b4d4 h1:0mg9QEFdkkBwJMxvz1tCjHYmfG2iIC6aShj1InDq9/M= github.com/dolthub/eventsapi_schema v0.0.0-20260715220557-d9b4a1c6b4d4/go.mod h1:SSLraQS/jGLYFgff3vuZ+JbVUct6vyEeMzjLBqWqoyM= +github.com/dolthub/file-locks v0.1.2 h1:D0eaII+636hkk7uJu++qaUT/XqDtRTQArWBQ6vEHfJU= +github.com/dolthub/file-locks v0.1.2/go.mod h1:8B7bWbbkj76BAnD2EaNrj/6HW25iCpq4Ivzz+kA5b1w= github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 h1:u3PMzfF8RkKd3lB9pZ2bfn0qEG+1Gms9599cr0REMww= github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2/go.mod h1:mIEZOHnFx4ZMQeawhw9rhsj+0zwQj7adVsnBX7t+eKY= -github.com/dolthub/fslock v0.0.5 h1:QoXhBhgY1oumHE26qyE7tgmXUT8qjJwxsIzo54O/B/k= -github.com/dolthub/fslock v0.0.5/go.mod h1:sdofYYqE0D79zNZyB4/kmlnsQOVap1C2yByjGKSirEM= github.com/dolthub/go-icu-regex v0.0.0-20260610153742-72563bc7ca83 h1:FEMjCGEroDnY/BXyAffVZxUpXhP2GpoUJyyq5KaLn8c= github.com/dolthub/go-icu-regex v0.0.0-20260610153742-72563bc7ca83/go.mod h1:F3cnm+vMRK1HaU6+rNqQrOCyR03HHhR1GWG2gnPOqaE= -github.com/dolthub/go-mysql-server v0.20.1-0.20260805191915-e5eafe0da809 h1:c+S3O08LgGS+czU/CuN+/pOKMri5F6kxajoWrTyrE1s= -github.com/dolthub/go-mysql-server v0.20.1-0.20260805191915-e5eafe0da809/go.mod h1:9GLxpglhedopzqBGpW0PGrw7UlwG5kBIOepE2QfTQ1s= +github.com/dolthub/go-mysql-server v0.20.1-0.20261001232740-19405eb6f203 h1:Q1q3rmpxwHNU3u0uUXM9Zd+VSXtsGiXjU1ohY5z0+pU= +github.com/dolthub/go-mysql-server v0.20.1-0.20261001232740-19405eb6f203/go.mod h1:8yhQsTiaXTn5/q9DCc1RJoOkVvGgDvvVrylW9EFjv/A= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q= github.com/dolthub/ishell v0.0.0-20260414231531-5f031e3e9037 h1:oIW9HwuWrhxv+4HZxA+QQSKHLqWFyXZ2FmNjUYwkdiM= github.com/dolthub/ishell v0.0.0-20260414231531-5f031e3e9037/go.mod h1:ehexgi1mPxRTk0Mok/pADALuHbvATulTh6gzr7NzZto= -github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71 h1:bMGS25NWAGTEtT5tOBsCuCrlYnLRKpbJVJkDbrTRhwQ= -github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71/go.mod h1:2/2zjLQ/JOOSbbSboojeg+cAwcRV0fDLzIiWch/lhqI= -github.com/dolthub/vitess v0.0.0-20260728212736-0542037326d7 h1:gvOpHisi0CbG3hixdGulNQdXy3V7+AWxe37kGBgTmRI= -github.com/dolthub/vitess v0.0.0-20260728212736-0542037326d7/go.mod h1:5SVEJgAhw5nnQUFnGgKI1Svqes1Mw+zKUsalyxmOuG0= +github.com/dolthub/jsonpath v0.0.2-0.20260807003725-336cd89c1c76 h1:ZmLDDKnfbWc8VtOU/peSnUmUW8Z/Y6FEz4es6iCALvQ= +github.com/dolthub/jsonpath v0.0.2-0.20260807003725-336cd89c1c76/go.mod h1:2/2zjLQ/JOOSbbSboojeg+cAwcRV0fDLzIiWch/lhqI= +github.com/dolthub/vitess v0.0.0-20260930232419-a6b7b0c65d17 h1:ybmsrwM4mBagCff/1rfhQ1n/ozEqGvviD5JIW5ZbZ1g= +github.com/dolthub/vitess v0.0.0-20260930232419-a6b7b0c65d17/go.mod h1:5SVEJgAhw5nnQUFnGgKI1Svqes1Mw+zKUsalyxmOuG0= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= @@ -468,8 +468,6 @@ github.com/go-viper/mapstructure/v2 v2.5.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlnd github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= -github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4= -github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/gocraft/dbr/v2 v2.7.6 h1:ASHKFgCbTLODbb9f756Cl8VAlnvQLKqIzx9E1Cfb7eo= github.com/gocraft/dbr/v2 v2.7.6/go.mod h1:8IH98S8M8J0JSEiYk0MPH26ZDUKemiQ/GvmXL5jo+Uw= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= @@ -608,8 +606,8 @@ github.com/googleapis/gax-go/v2 v2.17.0/go.mod h1:mzaqghpQp4JDh3HvADwrat+6M3MOID github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gowebpki/jcs v1.0.1 h1:Qjzg8EOkrOTuWP7DqQ1FbYtcpEbeTzUoTN9bptp8FOU= -github.com/gowebpki/jcs v1.0.1/go.mod h1:CID1cNZ+sHp1CCpAR8mPf6QRtagFBgPJE0FCUQ6+BrI= +github.com/gowebpki/jcs v1.0.2 h1:IY0Iv76ThSvocWinl2rphYmGLhMufS3ZD1giKqkI6ps= +github.com/gowebpki/jcs v1.0.2/go.mod h1:caHbxgiKxrUu6KNItCUKoggR5/ZUSNxVCm9ZxWJXR0U= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 h1:/Tnpcb2E0Pz/tN9s3bfEY2Q8ePCEX9iuS+cneUwncnw= @@ -743,8 +741,8 @@ github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Ky github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.22 h1:j8l17JJ9i6VGPUFUYoTUKPSgKe/83EYU2zBC7YNKMw4= github.com/mattn/go-isatty v0.0.22/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4= -github.com/mattn/go-runewidth v0.0.24 h1:cpokDiIn0MGnhdHwuWnJBITySJ20QyNGnY2kR/ay2DU= -github.com/mattn/go-runewidth v0.0.24/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs= +github.com/mattn/go-runewidth v0.0.28 h1:rPyg2ybwEKPebvpzVWe1gKBkH8EQFkxO4Y0hjBeLaBU= +github.com/mattn/go-runewidth v0.0.28/go.mod h1:3qAiGCV4Koz/yuveO58qUefmUTRm8r0IGEXZ9jeHp/8= github.com/mattn/go-sqlite3 v1.14.52 h1:wVbm2Qnf4OXkqhBTSPuCRZDRnxfbVrrmiCEroVdog8U= github.com/mattn/go-sqlite3 v1.14.52/go.mod h1:6JTjA44L93a0QCyJef5YvlPoKXntQPjzWv5gtm9sB6w= github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= @@ -958,24 +956,26 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.7 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.70.0/go.mod h1:DqEFwLumhzMBDQv9PcWbyoDxHI/4lAk6CM4nJBH39sc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.70.0 h1:LMuyCAyfalSjDyjdC65nK6N0zoTT63+E/u95X0JovZI= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.70.0/go.mod h1:085m8qbm4hgc8rZWGDEa4vmyyo2c3nPxUslYUKUIU04= -go.opentelemetry.io/otel v1.46.0 h1:FHt5/CDyVxi/8IM1CH7VE/rRgq3kLHa2mSTVMO8AWyc= -go.opentelemetry.io/otel v1.46.0/go.mod h1:Gj3SEScelsNC45tp4nSxRYlS+f5iez7W8XPMCt905kE= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.46.0 h1:AP23h/mFgb/lc7tdck1Kfn9qxsM8TAeNPCU5C3pzaps= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.46.0/go.mod h1:K4EqCe1b4kGk5WR690ntg9LaBfsPoV32FwthbyoptuA= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.46.0 h1:PR9eAf7o0dQs3hshZNZpE9aW2dXWX/KdDf6pJilVD3U= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.46.0/go.mod h1:2Z4KyNdH1uuzivdinyfGsxzNNT/Rl45pwtVwfYVI0xk= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.46.0 h1:KdRxPiAoMptR3vfWzvjjvutTsSiwbC2uG0496rzZNfo= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.46.0/go.mod h1:K/qSA+3G7Eovxi4K09wzrAgkWRnosS0DAOZeEpve7sM= -go.opentelemetry.io/otel/metric v1.46.0 h1:yBnkXvgV7AXFILZc5K6IZe/CBFF3OS7BJ8ov6/lj0K8= -go.opentelemetry.io/otel/metric v1.46.0/go.mod h1:iPmdWqifKUdzziPkvvzIJXITl56fQx2mGM/DHLB3/2o= -go.opentelemetry.io/otel/metric/x v0.68.0 h1:TA/cBT23D3MnxYPwHL7YFOdYGdx0A0v+s7Mzotpd1dU= -go.opentelemetry.io/otel/metric/x v0.68.0/go.mod h1:agudOmvWhwUTjgibWDzxD2PoWYnpw5Ht5jISYOD2Hd4= -go.opentelemetry.io/otel/sdk v1.46.0 h1:h5CNQQjEbuQXY/JfZtgt3i7HVFV3aHPO2OAwO2eTYPI= -go.opentelemetry.io/otel/sdk v1.46.0/go.mod h1:GAERFXFt5SYCEB+YiKUbMBeza6UaDH7GmGOZEfh2gSM= -go.opentelemetry.io/otel/sdk/metric v1.46.0 h1:0piZ26EG4RBfebb2jhDH6ERCYHoVWduc3kLgPCwSnSE= -go.opentelemetry.io/otel/sdk/metric v1.46.0/go.mod h1:I1PbKrdVc8Qu8HYVDNtqVIwLwjNrhsV/uFuxfwg8mO4= -go.opentelemetry.io/otel/trace v1.46.0 h1:OULy7ccdJnZtJ0UDYFOIGaCmiWzJ8Vi2G/Rsu60qs1c= -go.opentelemetry.io/otel/trace v1.46.0/go.mod h1:J7GAXweO77XSFkB/rmAqk9D6ihszhFjLU+d9WuUxDLI= +go.opentelemetry.io/otel v1.47.0 h1:j7ALJ/zgkS7Z6aeJW09p8VC9804bC+PpeTfCD4XPnOM= +go.opentelemetry.io/otel v1.47.0/go.mod h1:8wS9O2qfXrYrzp6hIF/HOYJJf/wIhFPhR2xLuP+iXQU= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.47.0 h1:7kszRN4Ze5GeAkUnBjBSUIunVBMA+mZIG04auueqguM= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.47.0/go.mod h1:CLzakYy8jOdkBfcveCWYkeKJxujcF4xPhh2Z7IfE98U= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.47.0 h1:ww5DYBpMKcqLdxjWrhGUIh6O+ZfvZUaMk4niVyNQPEQ= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.47.0/go.mod h1:Av5t+Ezx5S/Ks2dsEfWhny+GK+wrZ1K7NZ6aHSWnX3U= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.47.0 h1:N3YQCxjxQ/bMjyc3heladfRm9t9RTksGQH8z4w6yU/0= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.47.0/go.mod h1:Mp8HOFqcaUyypCuGv9IhDdTHnJ56lSudSHMd+pVSCEA= +go.opentelemetry.io/otel/log v1.47.0 h1:cOTS1CcLbSQeZKanGJ+0JpF/+t4PELi3O3bbl2lqCcI= +go.opentelemetry.io/otel/log v1.47.0/go.mod h1:9byitSQ5pLC6PpqwGXjqdMKya6ZTswHRZh2vvXT33nw= +go.opentelemetry.io/otel/metric v1.47.0 h1:4PptaldXx3Eat1XjMZ68pPJEs5wrhlemctZE9a3UdWY= +go.opentelemetry.io/otel/metric v1.47.0/go.mod h1:ADGSXxRrXM6bjbvLo535EstVFlPpPYZm4LBKixjDHwU= +go.opentelemetry.io/otel/metric/x v0.69.0 h1:DjRLr15H83v+hCW7JA9NoJvOkYTtmq5YoDRbe9deYpM= +go.opentelemetry.io/otel/metric/x v0.69.0/go.mod h1:uVvsMPMFFyj/HUQfrUnH3JjnOQ1dwFDorgFLRBasM0k= +go.opentelemetry.io/otel/sdk v1.47.0 h1:zWXEr4j2lFefG87TU6Yg8a7ngfohIKFZHKp0Hf5hC6I= +go.opentelemetry.io/otel/sdk v1.47.0/go.mod h1:VUc24kiOeoGsxG8G9ULx3fWKvB7jMhnGE8Oi607lgR0= +go.opentelemetry.io/otel/sdk/metric v1.47.0 h1:lfISg2j93VT6yqdk9OfUaZmw/GfcZqCCV3jdXtsPnKw= +go.opentelemetry.io/otel/sdk/metric v1.47.0/go.mod h1:ypLp+mW1Nt2x+Szt3b5/i1syodyts49lMOwxpDI3VGw= +go.opentelemetry.io/otel/trace v1.47.0 h1:JOjX/Oci8K94QHddo+bbfya/Ai/nf6/dt9ZfrFNWSrM= +go.opentelemetry.io/otel/trace v1.47.0/go.mod h1:jNaSLa2PZEYFG6fRjJABAu+bw4FS08uDmPg28lTghu0= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v1.11.0 h1:5rrYs0Ykyj50sdU/JU0x8etU+LubXWb+gED6TbEdMIk= go.opentelemetry.io/proto/otlp v1.11.0/go.mod h1:SmVizdCOAm3XBtG1g1NnOdhW6jtddT72hLMhv8VwA8E= @@ -1027,8 +1027,8 @@ golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= -golang.org/x/crypto v0.55.0 h1:+KWHjbgOaAQ66dh/YlkZKHlz9ZUlq61AFirAR9ntP8M= -golang.org/x/crypto v0.55.0/go.mod h1:uq0V9dE/fzQuJtbnL+2EhWOE63vo164FY8xqEnV9xis= +golang.org/x/crypto v0.57.0 h1:3ZVCjf8Ggz7zneR/EHRVx68Ctf+2pmIMP2UFhh9cC6M= +golang.org/x/crypto v0.57.0/go.mod h1:Fdz0i5U6CoizGwLda9DttjSk6qlZo25zYNtR+ycvuZA= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1054,8 +1054,8 @@ golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+o golang.org/x/image v0.0.0-20200618115811-c13761719519/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20201208152932-35266b937fa6/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20210216034530-4410531fe030/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/image v0.38.0 h1:5l+q+Y9JDC7mBOMjo4/aPhMDcxEptsX+Tt3GgRQRPuE= -golang.org/x/image v0.38.0/go.mod h1:/3f6vaXC+6CEanU4KJxbcUZyEePbyKbaLoDOe4ehFYY= +golang.org/x/image v0.41.0 h1:8wS72eGJMJaBxK6okTzd4WaXumUlTVlb753MlsSvTCo= +golang.org/x/image v0.41.0/go.mod h1:uIc348UZMSvS5Z65CVZ7iDPaNobNFEPeJ4kbqTOszmA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -1082,8 +1082,8 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.40.0 h1:hUv+3cXcdRHz08UmSiOob7sadHig73uo5bkXxQ/tvUs= -golang.org/x/mod v0.40.0/go.mod h1:0/weTWkPWGBikyTWAX3dkjVztMmBA5hM0DH6BElSupE= +golang.org/x/mod v0.41.0 h1:qJmnOUb4YB+FsEuM3HcWucdZASCPGhsX6uljO6pog0c= +golang.org/x/mod v0.41.0/go.mod h1:Ek9pY8RKWXwsWvd3rQiHYtMqkjSUV+s1Rj7j4H5Ur6o= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1137,8 +1137,8 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.58.0 h1:ynWG7rqYi4ccpTEuPZ2QGWHktVEM9DMCj9yzDE0Q7To= -golang.org/x/net v0.58.0/go.mod h1:YwCddHnFlT7eLQqVprV19OnhLGtc5xOKgE0RyqgfWAU= +golang.org/x/net v0.59.0 h1:5zfYln+w5XCxwrnMMJPufRgNoXEaGxl0wo5GqPXyues= +golang.org/x/net v0.59.0/go.mod h1:2DA/G1UfVbCpQPeWTmMPGY7Cs2PkBkwu743bVX5PIVg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1174,8 +1174,8 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.23.0 h1:KameEIfc1IkluZyXWLn39Wd4tURc6GbCiISGiZm2bQk= -golang.org/x/sync v0.23.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0= +golang.org/x/sync v0.24.0 h1:iqiDrGoDgyuvAKrhLQthUEzU/R378N78gXbBjxed7oA= +golang.org/x/sync v0.24.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1257,8 +1257,8 @@ golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.48.0 h1:bbX/i/6MgT9BVLM9RT1thmxL04yeTAhbEz4SyadbXoo= -golang.org/x/sys v0.48.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og= +golang.org/x/sys v0.49.0 h1:XbzkgYJHdqh/8m2Uu0W/dQv8nktxx4BFHp1M0gROTXA= +golang.org/x/sys v0.49.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og= golang.org/x/telemetry v0.0.0-20260811182544-a038080d80e5 h1:ZUSxONxc981v7AW7QUg+I9WwZzSTTJ019ENBYr5pV/Q= golang.org/x/telemetry v0.0.0-20260811182544-a038080d80e5/go.mod h1:LVehoXe41cL5SCVQilsV7Gg6BNG+Js6P9PhSbYTIUkQ= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= @@ -1267,8 +1267,8 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.46.0 h1:3+OXuTbaKDgwk8jTi3aSLHRlmWqHEUDUtxnbFigO4YE= -golang.org/x/term v0.46.0/go.mod h1:+K02xbkittuwc0Am4abfA3Fc+XRGXkvBXNO88NCXPoc= +golang.org/x/term v0.47.0 h1:cpyOwQkr2Nzxe2p6KnrTG7Ei2wtzjsuSjhpXXepZ/BM= +golang.org/x/term v0.47.0/go.mod h1:efAfAuG6RKABvg1ArGebRkvX6LXul14SM67o2e4mUCY= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1281,8 +1281,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.41.0 h1:vz/seA0lnX87Othu2f/0L24RcgrXD9/YFTSuGjj3rH8= -golang.org/x/text v0.41.0/go.mod h1:jvf1O8ajNzZqhSrQBPbutR/EB83Cc0CFrezNQIwbb5M= +golang.org/x/text v0.42.0 h1:JbOZXgfeCPU9gacVtYliJqOhD+zhrEqK4LfdpmlUZqI= +golang.org/x/text v0.42.0/go.mod h1:ojzP1Z+2QtioaF8DTtO8K5q7JWVVYwZKenzujK0Zd0E= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1516,10 +1516,10 @@ google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2I google.golang.org/genproto v0.0.0-20220401170504-314d38edb7de/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/genproto v0.0.0-20260128011058-8636f8732409 h1:VQZ/yAbAtjkHgH80teYd2em3xtIkkHd7ZhqfH2N9CsM= google.golang.org/genproto v0.0.0-20260128011058-8636f8732409/go.mod h1:rxKD3IEILWEu3P44seeNOAwZN4SaoKaQ/2eTg4mM6EM= -google.golang.org/genproto/googleapis/api v0.0.0-20260819154853-08b0e4226688 h1:ax2KzoSRIZU/M0cIxri3pKxy99vniH1PVxWC6si/eZI= -google.golang.org/genproto/googleapis/api v0.0.0-20260819154853-08b0e4226688/go.mod h1:1RJ9BQGyNdZwkGc1eTqkErfRZ6RJyYPHZo73BZ1vQqI= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260819154853-08b0e4226688 h1:cYNAzI2sUwhmCcoj9TxvihSrqsxt6uIkj3rDRhSDmW4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260819154853-08b0e4226688/go.mod h1:DjtHYE8FKJLivXcBEjGwndXfIC23G0VpXiXKqG179uA= +google.golang.org/genproto/googleapis/api v0.0.0-20260928230214-8a89bd6388cc h1:rZHRz0ogq4Pid1IKtA/ivHi8XONVF5tqUQXA2TtgpkE= +google.golang.org/genproto/googleapis/api v0.0.0-20260928230214-8a89bd6388cc/go.mod h1:K/n0XLazCJHjD73YuMyNJsN38BPPy1kfFnKxUXaThFU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260928230214-8a89bd6388cc h1:4bNTbnb44EqGVy9HaQxSY2jnafSUdgV3qHtedvNpDKg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260928230214-8a89bd6388cc/go.mod h1:OaIUM3+LpYcK2GXM4FTmhWoIq371Owdr+Cc7/BsYHHc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= diff --git a/examples/library-usage/go.mod b/examples/library-usage/go.mod index 7f7aabef7..c70b37bbb 100644 --- a/examples/library-usage/go.mod +++ b/examples/library-usage/go.mod @@ -58,17 +58,17 @@ require ( github.com/cockroachdb/apd/v3 v3.2.3 // indirect github.com/denisbrodbeck/machineid v1.0.1 // indirect github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12 // indirect - github.com/dolthub/dolt/go v0.40.5-0.20260806213044-796d07497741 // indirect - github.com/dolthub/driver/v2 v2.2.0 // indirect + github.com/dolthub/dolt/go v0.40.5-0.20261002233748-c6af56fead88 // indirect + github.com/dolthub/driver/v2 v2.4.1 // indirect github.com/dolthub/eventsapi_schema v0.0.0-20260715220557-d9b4a1c6b4d4 // indirect + github.com/dolthub/file-locks v0.1.2 // indirect github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 // indirect - github.com/dolthub/fslock v0.0.5 // indirect github.com/dolthub/go-icu-regex v0.0.0-20260610153742-72563bc7ca83 // indirect - github.com/dolthub/go-mysql-server v0.20.1-0.20260805191915-e5eafe0da809 // indirect + github.com/dolthub/go-mysql-server v0.20.1-0.20261001232740-19405eb6f203 // indirect github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 // indirect github.com/dolthub/ishell v0.0.0-20260414231531-5f031e3e9037 // indirect - github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71 // indirect - github.com/dolthub/vitess v0.0.0-20260728212736-0542037326d7 // indirect + github.com/dolthub/jsonpath v0.0.2-0.20260807003725-336cd89c1c76 // indirect + github.com/dolthub/vitess v0.0.0-20260930232419-a6b7b0c65d17 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/edsrzf/mmap-go v1.2.0 // indirect github.com/envoyproxy/go-control-plane/envoy v1.37.0 // indirect @@ -83,7 +83,6 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/go-sql-driver/mysql v1.10.1 // indirect github.com/go-viper/mapstructure/v2 v2.5.0 // indirect - github.com/goccy/go-json v0.10.5 // indirect github.com/gocraft/dbr/v2 v2.7.6 // indirect github.com/gofrs/flock v0.8.1 // indirect github.com/golang-jwt/jwt/v5 v5.3.0 // indirect @@ -96,7 +95,7 @@ require ( github.com/google/uuid v1.6.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.11 // indirect github.com/googleapis/gax-go/v2 v2.17.0 // indirect - github.com/gowebpki/jcs v1.0.1 // indirect + github.com/gowebpki/jcs v1.0.2 // indirect github.com/hashicorp/golang-lru v1.0.2 // indirect github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect github.com/juju/gnuflag v1.0.0 // indirect @@ -107,7 +106,7 @@ require ( github.com/lestrrat-go/strftime v1.2.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.22 // indirect - github.com/mattn/go-runewidth v0.0.24 // indirect + github.com/mattn/go-runewidth v0.0.28 // indirect github.com/mohae/uvarint v0.0.0-20160208145430-c3f9e62bf2b0 // indirect github.com/olebedev/when v1.1.0 // indirect github.com/oracle/oci-go-sdk/v65 v65.55.0 // indirect @@ -146,31 +145,32 @@ require ( go.opentelemetry.io/contrib/detectors/gcp v1.44.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.70.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.70.0 // indirect - go.opentelemetry.io/otel v1.46.0 // indirect - go.opentelemetry.io/otel/metric v1.46.0 // indirect - go.opentelemetry.io/otel/sdk v1.46.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.46.0 // indirect - go.opentelemetry.io/otel/trace v1.46.0 // indirect + go.opentelemetry.io/otel v1.47.0 // indirect + go.opentelemetry.io/otel/log v1.47.0 // indirect + go.opentelemetry.io/otel/metric v1.47.0 // indirect + go.opentelemetry.io/otel/sdk v1.47.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.47.0 // indirect + go.opentelemetry.io/otel/trace v1.47.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect go.yaml.in/yaml/v3 v3.0.5 // indirect - golang.org/x/crypto v0.55.0 // indirect + golang.org/x/crypto v0.57.0 // indirect golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect - golang.org/x/mod v0.40.0 // indirect - golang.org/x/net v0.58.0 // indirect + golang.org/x/mod v0.41.0 // indirect + golang.org/x/net v0.59.0 // indirect golang.org/x/oauth2 v0.36.0 // indirect - golang.org/x/sync v0.23.0 // indirect - golang.org/x/sys v0.48.0 // indirect + golang.org/x/sync v0.24.0 // indirect + golang.org/x/sys v0.49.0 // indirect golang.org/x/telemetry v0.0.0-20260811182544-a038080d80e5 // indirect - golang.org/x/term v0.46.0 // indirect - golang.org/x/text v0.41.0 // indirect + golang.org/x/term v0.47.0 // indirect + golang.org/x/text v0.42.0 // indirect golang.org/x/time v0.14.0 // indirect golang.org/x/tools v0.49.0 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect google.golang.org/api v0.264.0 // indirect google.golang.org/genproto v0.0.0-20260128011058-8636f8732409 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20260819154853-08b0e4226688 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260819154853-08b0e4226688 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20260928230214-8a89bd6388cc // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260928230214-8a89bd6388cc // indirect google.golang.org/grpc v1.83.2 // indirect google.golang.org/protobuf v1.36.12 // indirect gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect diff --git a/examples/library-usage/go.sum b/examples/library-usage/go.sum index 65acbc008..0494f1aa2 100644 --- a/examples/library-usage/go.sum +++ b/examples/library-usage/go.sum @@ -359,28 +359,28 @@ github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12 h1:I github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12/go.mod h1:rN7X8BHwkjPcfMQQ2QTAq/xM3leUSGLfb+1Js7Y6TVo= github.com/dolthub/dolt-mcp v0.3.4 h1:AyG5cw+fNWXDHXujtQnqUPZrpWtPg6FN6yYtjv1pP44= github.com/dolthub/dolt-mcp v0.3.4/go.mod h1:bCZ7KHvDYs+M0e+ySgmGiNvLhcwsN7bbf5YCyillLrk= -github.com/dolthub/dolt/go v0.40.5-0.20260806213044-796d07497741 h1:z+Disx4RJn0dxaYSzcp8pbiXddi3dpIoUJaMtVa/iBE= -github.com/dolthub/dolt/go v0.40.5-0.20260806213044-796d07497741/go.mod h1:houDkPceGRjDBdaDsfym5OQUB4465mBUnPvSxMOPrPo= -github.com/dolthub/driver/v2 v2.2.0 h1:Qm9BhvvKNmeTDF6kZdDkdLe62CF1W6GrCA3ZDRx/tlk= -github.com/dolthub/driver/v2 v2.2.0/go.mod h1:Ngki9vM88/sqin1RKfUt/9Ex8DmoePtHgY7d4+YoolU= +github.com/dolthub/dolt/go v0.40.5-0.20261002233748-c6af56fead88 h1:2HfeitrXNFvlCPWog+yMjSeZ4qBWSZOnOaeWI9Ai8QU= +github.com/dolthub/dolt/go v0.40.5-0.20261002233748-c6af56fead88/go.mod h1:+DGXtWsZ7EFxHfh7LFKUEVdfj9aDPhR5SnaLZ7dxWQQ= +github.com/dolthub/driver/v2 v2.4.1 h1:Wzk1Wd6GVQ3CpBa2OQgGTb1KoldMDfYgu2hVzyVrSJg= +github.com/dolthub/driver/v2 v2.4.1/go.mod h1:dWP6ygBQw8JUIG9uvQo1R/vAfeCV9Sg7t9neNx7THyc= github.com/dolthub/eventsapi_schema v0.0.0-20260715220557-d9b4a1c6b4d4 h1:0mg9QEFdkkBwJMxvz1tCjHYmfG2iIC6aShj1InDq9/M= github.com/dolthub/eventsapi_schema v0.0.0-20260715220557-d9b4a1c6b4d4/go.mod h1:SSLraQS/jGLYFgff3vuZ+JbVUct6vyEeMzjLBqWqoyM= +github.com/dolthub/file-locks v0.1.2 h1:D0eaII+636hkk7uJu++qaUT/XqDtRTQArWBQ6vEHfJU= +github.com/dolthub/file-locks v0.1.2/go.mod h1:8B7bWbbkj76BAnD2EaNrj/6HW25iCpq4Ivzz+kA5b1w= github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 h1:u3PMzfF8RkKd3lB9pZ2bfn0qEG+1Gms9599cr0REMww= github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2/go.mod h1:mIEZOHnFx4ZMQeawhw9rhsj+0zwQj7adVsnBX7t+eKY= -github.com/dolthub/fslock v0.0.5 h1:QoXhBhgY1oumHE26qyE7tgmXUT8qjJwxsIzo54O/B/k= -github.com/dolthub/fslock v0.0.5/go.mod h1:sdofYYqE0D79zNZyB4/kmlnsQOVap1C2yByjGKSirEM= github.com/dolthub/go-icu-regex v0.0.0-20260610153742-72563bc7ca83 h1:FEMjCGEroDnY/BXyAffVZxUpXhP2GpoUJyyq5KaLn8c= github.com/dolthub/go-icu-regex v0.0.0-20260610153742-72563bc7ca83/go.mod h1:F3cnm+vMRK1HaU6+rNqQrOCyR03HHhR1GWG2gnPOqaE= -github.com/dolthub/go-mysql-server v0.20.1-0.20260805191915-e5eafe0da809 h1:c+S3O08LgGS+czU/CuN+/pOKMri5F6kxajoWrTyrE1s= -github.com/dolthub/go-mysql-server v0.20.1-0.20260805191915-e5eafe0da809/go.mod h1:9GLxpglhedopzqBGpW0PGrw7UlwG5kBIOepE2QfTQ1s= +github.com/dolthub/go-mysql-server v0.20.1-0.20261001232740-19405eb6f203 h1:Q1q3rmpxwHNU3u0uUXM9Zd+VSXtsGiXjU1ohY5z0+pU= +github.com/dolthub/go-mysql-server v0.20.1-0.20261001232740-19405eb6f203/go.mod h1:8yhQsTiaXTn5/q9DCc1RJoOkVvGgDvvVrylW9EFjv/A= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q= github.com/dolthub/ishell v0.0.0-20260414231531-5f031e3e9037 h1:oIW9HwuWrhxv+4HZxA+QQSKHLqWFyXZ2FmNjUYwkdiM= github.com/dolthub/ishell v0.0.0-20260414231531-5f031e3e9037/go.mod h1:ehexgi1mPxRTk0Mok/pADALuHbvATulTh6gzr7NzZto= -github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71 h1:bMGS25NWAGTEtT5tOBsCuCrlYnLRKpbJVJkDbrTRhwQ= -github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71/go.mod h1:2/2zjLQ/JOOSbbSboojeg+cAwcRV0fDLzIiWch/lhqI= -github.com/dolthub/vitess v0.0.0-20260728212736-0542037326d7 h1:gvOpHisi0CbG3hixdGulNQdXy3V7+AWxe37kGBgTmRI= -github.com/dolthub/vitess v0.0.0-20260728212736-0542037326d7/go.mod h1:5SVEJgAhw5nnQUFnGgKI1Svqes1Mw+zKUsalyxmOuG0= +github.com/dolthub/jsonpath v0.0.2-0.20260807003725-336cd89c1c76 h1:ZmLDDKnfbWc8VtOU/peSnUmUW8Z/Y6FEz4es6iCALvQ= +github.com/dolthub/jsonpath v0.0.2-0.20260807003725-336cd89c1c76/go.mod h1:2/2zjLQ/JOOSbbSboojeg+cAwcRV0fDLzIiWch/lhqI= +github.com/dolthub/vitess v0.0.0-20260930232419-a6b7b0c65d17 h1:ybmsrwM4mBagCff/1rfhQ1n/ozEqGvviD5JIW5ZbZ1g= +github.com/dolthub/vitess v0.0.0-20260930232419-a6b7b0c65d17/go.mod h1:5SVEJgAhw5nnQUFnGgKI1Svqes1Mw+zKUsalyxmOuG0= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= @@ -468,8 +468,6 @@ github.com/go-viper/mapstructure/v2 v2.5.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlnd github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= -github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4= -github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/gocraft/dbr/v2 v2.7.6 h1:ASHKFgCbTLODbb9f756Cl8VAlnvQLKqIzx9E1Cfb7eo= github.com/gocraft/dbr/v2 v2.7.6/go.mod h1:8IH98S8M8J0JSEiYk0MPH26ZDUKemiQ/GvmXL5jo+Uw= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= @@ -608,8 +606,8 @@ github.com/googleapis/gax-go/v2 v2.17.0/go.mod h1:mzaqghpQp4JDh3HvADwrat+6M3MOID github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gowebpki/jcs v1.0.1 h1:Qjzg8EOkrOTuWP7DqQ1FbYtcpEbeTzUoTN9bptp8FOU= -github.com/gowebpki/jcs v1.0.1/go.mod h1:CID1cNZ+sHp1CCpAR8mPf6QRtagFBgPJE0FCUQ6+BrI= +github.com/gowebpki/jcs v1.0.2 h1:IY0Iv76ThSvocWinl2rphYmGLhMufS3ZD1giKqkI6ps= +github.com/gowebpki/jcs v1.0.2/go.mod h1:caHbxgiKxrUu6KNItCUKoggR5/ZUSNxVCm9ZxWJXR0U= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 h1:/Tnpcb2E0Pz/tN9s3bfEY2Q8ePCEX9iuS+cneUwncnw= @@ -743,8 +741,8 @@ github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Ky github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.22 h1:j8l17JJ9i6VGPUFUYoTUKPSgKe/83EYU2zBC7YNKMw4= github.com/mattn/go-isatty v0.0.22/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4= -github.com/mattn/go-runewidth v0.0.24 h1:cpokDiIn0MGnhdHwuWnJBITySJ20QyNGnY2kR/ay2DU= -github.com/mattn/go-runewidth v0.0.24/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs= +github.com/mattn/go-runewidth v0.0.28 h1:rPyg2ybwEKPebvpzVWe1gKBkH8EQFkxO4Y0hjBeLaBU= +github.com/mattn/go-runewidth v0.0.28/go.mod h1:3qAiGCV4Koz/yuveO58qUefmUTRm8r0IGEXZ9jeHp/8= github.com/mattn/go-sqlite3 v1.14.52 h1:wVbm2Qnf4OXkqhBTSPuCRZDRnxfbVrrmiCEroVdog8U= github.com/mattn/go-sqlite3 v1.14.52/go.mod h1:6JTjA44L93a0QCyJef5YvlPoKXntQPjzWv5gtm9sB6w= github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= @@ -958,24 +956,26 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.7 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.70.0/go.mod h1:DqEFwLumhzMBDQv9PcWbyoDxHI/4lAk6CM4nJBH39sc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.70.0 h1:LMuyCAyfalSjDyjdC65nK6N0zoTT63+E/u95X0JovZI= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.70.0/go.mod h1:085m8qbm4hgc8rZWGDEa4vmyyo2c3nPxUslYUKUIU04= -go.opentelemetry.io/otel v1.46.0 h1:FHt5/CDyVxi/8IM1CH7VE/rRgq3kLHa2mSTVMO8AWyc= -go.opentelemetry.io/otel v1.46.0/go.mod h1:Gj3SEScelsNC45tp4nSxRYlS+f5iez7W8XPMCt905kE= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.46.0 h1:AP23h/mFgb/lc7tdck1Kfn9qxsM8TAeNPCU5C3pzaps= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.46.0/go.mod h1:K4EqCe1b4kGk5WR690ntg9LaBfsPoV32FwthbyoptuA= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.46.0 h1:PR9eAf7o0dQs3hshZNZpE9aW2dXWX/KdDf6pJilVD3U= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.46.0/go.mod h1:2Z4KyNdH1uuzivdinyfGsxzNNT/Rl45pwtVwfYVI0xk= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.46.0 h1:KdRxPiAoMptR3vfWzvjjvutTsSiwbC2uG0496rzZNfo= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.46.0/go.mod h1:K/qSA+3G7Eovxi4K09wzrAgkWRnosS0DAOZeEpve7sM= -go.opentelemetry.io/otel/metric v1.46.0 h1:yBnkXvgV7AXFILZc5K6IZe/CBFF3OS7BJ8ov6/lj0K8= -go.opentelemetry.io/otel/metric v1.46.0/go.mod h1:iPmdWqifKUdzziPkvvzIJXITl56fQx2mGM/DHLB3/2o= -go.opentelemetry.io/otel/metric/x v0.68.0 h1:TA/cBT23D3MnxYPwHL7YFOdYGdx0A0v+s7Mzotpd1dU= -go.opentelemetry.io/otel/metric/x v0.68.0/go.mod h1:agudOmvWhwUTjgibWDzxD2PoWYnpw5Ht5jISYOD2Hd4= -go.opentelemetry.io/otel/sdk v1.46.0 h1:h5CNQQjEbuQXY/JfZtgt3i7HVFV3aHPO2OAwO2eTYPI= -go.opentelemetry.io/otel/sdk v1.46.0/go.mod h1:GAERFXFt5SYCEB+YiKUbMBeza6UaDH7GmGOZEfh2gSM= -go.opentelemetry.io/otel/sdk/metric v1.46.0 h1:0piZ26EG4RBfebb2jhDH6ERCYHoVWduc3kLgPCwSnSE= -go.opentelemetry.io/otel/sdk/metric v1.46.0/go.mod h1:I1PbKrdVc8Qu8HYVDNtqVIwLwjNrhsV/uFuxfwg8mO4= -go.opentelemetry.io/otel/trace v1.46.0 h1:OULy7ccdJnZtJ0UDYFOIGaCmiWzJ8Vi2G/Rsu60qs1c= -go.opentelemetry.io/otel/trace v1.46.0/go.mod h1:J7GAXweO77XSFkB/rmAqk9D6ihszhFjLU+d9WuUxDLI= +go.opentelemetry.io/otel v1.47.0 h1:j7ALJ/zgkS7Z6aeJW09p8VC9804bC+PpeTfCD4XPnOM= +go.opentelemetry.io/otel v1.47.0/go.mod h1:8wS9O2qfXrYrzp6hIF/HOYJJf/wIhFPhR2xLuP+iXQU= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.47.0 h1:7kszRN4Ze5GeAkUnBjBSUIunVBMA+mZIG04auueqguM= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.47.0/go.mod h1:CLzakYy8jOdkBfcveCWYkeKJxujcF4xPhh2Z7IfE98U= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.47.0 h1:ww5DYBpMKcqLdxjWrhGUIh6O+ZfvZUaMk4niVyNQPEQ= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.47.0/go.mod h1:Av5t+Ezx5S/Ks2dsEfWhny+GK+wrZ1K7NZ6aHSWnX3U= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.47.0 h1:N3YQCxjxQ/bMjyc3heladfRm9t9RTksGQH8z4w6yU/0= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.47.0/go.mod h1:Mp8HOFqcaUyypCuGv9IhDdTHnJ56lSudSHMd+pVSCEA= +go.opentelemetry.io/otel/log v1.47.0 h1:cOTS1CcLbSQeZKanGJ+0JpF/+t4PELi3O3bbl2lqCcI= +go.opentelemetry.io/otel/log v1.47.0/go.mod h1:9byitSQ5pLC6PpqwGXjqdMKya6ZTswHRZh2vvXT33nw= +go.opentelemetry.io/otel/metric v1.47.0 h1:4PptaldXx3Eat1XjMZ68pPJEs5wrhlemctZE9a3UdWY= +go.opentelemetry.io/otel/metric v1.47.0/go.mod h1:ADGSXxRrXM6bjbvLo535EstVFlPpPYZm4LBKixjDHwU= +go.opentelemetry.io/otel/metric/x v0.69.0 h1:DjRLr15H83v+hCW7JA9NoJvOkYTtmq5YoDRbe9deYpM= +go.opentelemetry.io/otel/metric/x v0.69.0/go.mod h1:uVvsMPMFFyj/HUQfrUnH3JjnOQ1dwFDorgFLRBasM0k= +go.opentelemetry.io/otel/sdk v1.47.0 h1:zWXEr4j2lFefG87TU6Yg8a7ngfohIKFZHKp0Hf5hC6I= +go.opentelemetry.io/otel/sdk v1.47.0/go.mod h1:VUc24kiOeoGsxG8G9ULx3fWKvB7jMhnGE8Oi607lgR0= +go.opentelemetry.io/otel/sdk/metric v1.47.0 h1:lfISg2j93VT6yqdk9OfUaZmw/GfcZqCCV3jdXtsPnKw= +go.opentelemetry.io/otel/sdk/metric v1.47.0/go.mod h1:ypLp+mW1Nt2x+Szt3b5/i1syodyts49lMOwxpDI3VGw= +go.opentelemetry.io/otel/trace v1.47.0 h1:JOjX/Oci8K94QHddo+bbfya/Ai/nf6/dt9ZfrFNWSrM= +go.opentelemetry.io/otel/trace v1.47.0/go.mod h1:jNaSLa2PZEYFG6fRjJABAu+bw4FS08uDmPg28lTghu0= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v1.11.0 h1:5rrYs0Ykyj50sdU/JU0x8etU+LubXWb+gED6TbEdMIk= go.opentelemetry.io/proto/otlp v1.11.0/go.mod h1:SmVizdCOAm3XBtG1g1NnOdhW6jtddT72hLMhv8VwA8E= @@ -1027,8 +1027,8 @@ golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= -golang.org/x/crypto v0.55.0 h1:+KWHjbgOaAQ66dh/YlkZKHlz9ZUlq61AFirAR9ntP8M= -golang.org/x/crypto v0.55.0/go.mod h1:uq0V9dE/fzQuJtbnL+2EhWOE63vo164FY8xqEnV9xis= +golang.org/x/crypto v0.57.0 h1:3ZVCjf8Ggz7zneR/EHRVx68Ctf+2pmIMP2UFhh9cC6M= +golang.org/x/crypto v0.57.0/go.mod h1:Fdz0i5U6CoizGwLda9DttjSk6qlZo25zYNtR+ycvuZA= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1054,8 +1054,8 @@ golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+o golang.org/x/image v0.0.0-20200618115811-c13761719519/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20201208152932-35266b937fa6/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20210216034530-4410531fe030/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/image v0.38.0 h1:5l+q+Y9JDC7mBOMjo4/aPhMDcxEptsX+Tt3GgRQRPuE= -golang.org/x/image v0.38.0/go.mod h1:/3f6vaXC+6CEanU4KJxbcUZyEePbyKbaLoDOe4ehFYY= +golang.org/x/image v0.41.0 h1:8wS72eGJMJaBxK6okTzd4WaXumUlTVlb753MlsSvTCo= +golang.org/x/image v0.41.0/go.mod h1:uIc348UZMSvS5Z65CVZ7iDPaNobNFEPeJ4kbqTOszmA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -1082,8 +1082,8 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.40.0 h1:hUv+3cXcdRHz08UmSiOob7sadHig73uo5bkXxQ/tvUs= -golang.org/x/mod v0.40.0/go.mod h1:0/weTWkPWGBikyTWAX3dkjVztMmBA5hM0DH6BElSupE= +golang.org/x/mod v0.41.0 h1:qJmnOUb4YB+FsEuM3HcWucdZASCPGhsX6uljO6pog0c= +golang.org/x/mod v0.41.0/go.mod h1:Ek9pY8RKWXwsWvd3rQiHYtMqkjSUV+s1Rj7j4H5Ur6o= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1137,8 +1137,8 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.58.0 h1:ynWG7rqYi4ccpTEuPZ2QGWHktVEM9DMCj9yzDE0Q7To= -golang.org/x/net v0.58.0/go.mod h1:YwCddHnFlT7eLQqVprV19OnhLGtc5xOKgE0RyqgfWAU= +golang.org/x/net v0.59.0 h1:5zfYln+w5XCxwrnMMJPufRgNoXEaGxl0wo5GqPXyues= +golang.org/x/net v0.59.0/go.mod h1:2DA/G1UfVbCpQPeWTmMPGY7Cs2PkBkwu743bVX5PIVg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1174,8 +1174,8 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.23.0 h1:KameEIfc1IkluZyXWLn39Wd4tURc6GbCiISGiZm2bQk= -golang.org/x/sync v0.23.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0= +golang.org/x/sync v0.24.0 h1:iqiDrGoDgyuvAKrhLQthUEzU/R378N78gXbBjxed7oA= +golang.org/x/sync v0.24.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1257,8 +1257,8 @@ golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.48.0 h1:bbX/i/6MgT9BVLM9RT1thmxL04yeTAhbEz4SyadbXoo= -golang.org/x/sys v0.48.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og= +golang.org/x/sys v0.49.0 h1:XbzkgYJHdqh/8m2Uu0W/dQv8nktxx4BFHp1M0gROTXA= +golang.org/x/sys v0.49.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og= golang.org/x/telemetry v0.0.0-20260811182544-a038080d80e5 h1:ZUSxONxc981v7AW7QUg+I9WwZzSTTJ019ENBYr5pV/Q= golang.org/x/telemetry v0.0.0-20260811182544-a038080d80e5/go.mod h1:LVehoXe41cL5SCVQilsV7Gg6BNG+Js6P9PhSbYTIUkQ= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= @@ -1267,8 +1267,8 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.46.0 h1:3+OXuTbaKDgwk8jTi3aSLHRlmWqHEUDUtxnbFigO4YE= -golang.org/x/term v0.46.0/go.mod h1:+K02xbkittuwc0Am4abfA3Fc+XRGXkvBXNO88NCXPoc= +golang.org/x/term v0.47.0 h1:cpyOwQkr2Nzxe2p6KnrTG7Ei2wtzjsuSjhpXXepZ/BM= +golang.org/x/term v0.47.0/go.mod h1:efAfAuG6RKABvg1ArGebRkvX6LXul14SM67o2e4mUCY= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1281,8 +1281,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.41.0 h1:vz/seA0lnX87Othu2f/0L24RcgrXD9/YFTSuGjj3rH8= -golang.org/x/text v0.41.0/go.mod h1:jvf1O8ajNzZqhSrQBPbutR/EB83Cc0CFrezNQIwbb5M= +golang.org/x/text v0.42.0 h1:JbOZXgfeCPU9gacVtYliJqOhD+zhrEqK4LfdpmlUZqI= +golang.org/x/text v0.42.0/go.mod h1:ojzP1Z+2QtioaF8DTtO8K5q7JWVVYwZKenzujK0Zd0E= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1516,10 +1516,10 @@ google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2I google.golang.org/genproto v0.0.0-20220401170504-314d38edb7de/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/genproto v0.0.0-20260128011058-8636f8732409 h1:VQZ/yAbAtjkHgH80teYd2em3xtIkkHd7ZhqfH2N9CsM= google.golang.org/genproto v0.0.0-20260128011058-8636f8732409/go.mod h1:rxKD3IEILWEu3P44seeNOAwZN4SaoKaQ/2eTg4mM6EM= -google.golang.org/genproto/googleapis/api v0.0.0-20260819154853-08b0e4226688 h1:ax2KzoSRIZU/M0cIxri3pKxy99vniH1PVxWC6si/eZI= -google.golang.org/genproto/googleapis/api v0.0.0-20260819154853-08b0e4226688/go.mod h1:1RJ9BQGyNdZwkGc1eTqkErfRZ6RJyYPHZo73BZ1vQqI= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260819154853-08b0e4226688 h1:cYNAzI2sUwhmCcoj9TxvihSrqsxt6uIkj3rDRhSDmW4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260819154853-08b0e4226688/go.mod h1:DjtHYE8FKJLivXcBEjGwndXfIC23G0VpXiXKqG179uA= +google.golang.org/genproto/googleapis/api v0.0.0-20260928230214-8a89bd6388cc h1:rZHRz0ogq4Pid1IKtA/ivHi8XONVF5tqUQXA2TtgpkE= +google.golang.org/genproto/googleapis/api v0.0.0-20260928230214-8a89bd6388cc/go.mod h1:K/n0XLazCJHjD73YuMyNJsN38BPPy1kfFnKxUXaThFU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260928230214-8a89bd6388cc h1:4bNTbnb44EqGVy9HaQxSY2jnafSUdgV3qHtedvNpDKg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260928230214-8a89bd6388cc/go.mod h1:OaIUM3+LpYcK2GXM4FTmhWoIq371Owdr+Cc7/BsYHHc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= diff --git a/flake.lock b/flake.lock index 227b21207..ba6568a3d 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1782847189, - "narHash": "sha256-twXPFqFsrrY5r28Zh7Homgcp2gUMBgQ6WDS98Q/3xFI=", + "lastModified": 1791426274, + "narHash": "sha256-MWhktfFtFE8Jl7bf9Pkp7TR5MSdYCjCswSo0Gkb4ywc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b6018f87da91d19d0ab4cf979885689b469cdd41", + "rev": "7c8764b7c7b09b34f632464276218ef9090eaa11", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.11", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 7bf3bbdfb..16e5a7b23 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "beads (bd) - An issue tracker designed for AI-supervised coding workflows"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05"; }; outputs = diff --git a/go.mod b/go.mod index 96264246b..b89a9c188 100644 --- a/go.mod +++ b/go.mod @@ -11,13 +11,13 @@ require ( github.com/BurntSushi/toml v1.6.0 github.com/DATA-DOG/go-sqlmock v1.5.2 github.com/JohannesKaufmann/html-to-markdown/v2 v2.5.2 - github.com/anthropics/anthropic-sdk-go v1.71.0 + github.com/anthropics/anthropic-sdk-go v1.80.0 github.com/cenkalti/backoff/v4 v4.3.0 github.com/creack/pty v1.1.24 - github.com/dolthub/driver/v2 v2.2.0 + github.com/dolthub/driver/v2 v2.4.1 github.com/dolthub/eventkit v0.0.0-20260611184414-99f5693e696a github.com/go-sql-driver/mysql v1.10.1 - github.com/gowebpki/jcs v1.0.1 + github.com/gowebpki/jcs v1.0.2 github.com/invopop/jsonschema v0.14.0 github.com/mattn/go-sqlite3 v1.14.52 github.com/olebedev/when v1.1.0 @@ -26,17 +26,17 @@ require ( github.com/stretchr/testify v1.12.1 github.com/testcontainers/testcontainers-go v0.43.0 github.com/testcontainers/testcontainers-go/modules/dolt v0.43.0 - go.opentelemetry.io/otel v1.46.0 - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.46.0 - go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.46.0 - go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.46.0 - go.opentelemetry.io/otel/metric v1.46.0 - go.opentelemetry.io/otel/sdk v1.46.0 - go.opentelemetry.io/otel/sdk/metric v1.46.0 - go.opentelemetry.io/otel/trace v1.46.0 - golang.org/x/sync v0.23.0 - golang.org/x/sys v0.48.0 - golang.org/x/term v0.46.0 + go.opentelemetry.io/otel v1.47.0 + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.47.0 + go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.47.0 + go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.47.0 + go.opentelemetry.io/otel/metric v1.47.0 + go.opentelemetry.io/otel/sdk v1.47.0 + go.opentelemetry.io/otel/sdk/metric v1.47.0 + go.opentelemetry.io/otel/trace v1.47.0 + golang.org/x/sync v0.24.0 + golang.org/x/sys v0.49.0 + golang.org/x/term v0.47.0 gopkg.in/yaml.v3 v3.0.1 rsc.io/script v0.0.2 ) @@ -47,6 +47,7 @@ require ( github.com/buger/jsonparser v1.1.2 // indirect github.com/cenkalti/backoff/v5 v5.0.3 // indirect github.com/cockroachdb/apd/v3 v3.2.3 // indirect + github.com/dolthub/file-locks v0.1.2 // indirect github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 // indirect github.com/fsnotify/fsnotify v1.9.0 // indirect github.com/getkin/kin-openapi v0.144.0 // indirect @@ -63,6 +64,7 @@ require ( github.com/speakeasy-api/openapi v1.19.2 // indirect github.com/standard-webhooks/standard-webhooks/libraries v0.0.1 // indirect github.com/vmware-labs/yaml-jsonpath v0.3.2 // indirect + go.opentelemetry.io/otel/log v1.47.0 // indirect go.yaml.in/yaml/v4 v4.0.0-rc.2 // indirect ) @@ -125,7 +127,7 @@ require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/charmbracelet/colorprofile v0.4.3 // indirect github.com/charmbracelet/ultraviolet v0.0.0-20260811164956-006e29f97886 // indirect - github.com/charmbracelet/x/ansi v0.11.8 + github.com/charmbracelet/x/ansi v0.11.9 github.com/charmbracelet/x/exp/ordered v0.1.0 // indirect github.com/charmbracelet/x/exp/slice v0.0.0-20250327172914-2fdc97757edf // indirect github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0 // indirect @@ -146,16 +148,16 @@ require ( github.com/docker/go-connections v0.6.0 // indirect github.com/docker/go-units v0.5.0 // indirect github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12 // indirect - github.com/dolthub/dolt/go v0.40.5-0.20260806213044-796d07497741 + github.com/dolthub/dolt/go v0.40.5-0.20261002233748-c6af56fead88 github.com/dolthub/eventsapi_schema v0.0.0-20260715220557-d9b4a1c6b4d4 // indirect github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 // indirect github.com/dolthub/fslock v0.0.5 // indirect github.com/dolthub/go-icu-regex v0.0.0-20260610153742-72563bc7ca83 // indirect - github.com/dolthub/go-mysql-server v0.20.1-0.20260805191915-e5eafe0da809 + github.com/dolthub/go-mysql-server v0.20.1-0.20261001232740-19405eb6f203 github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 // indirect github.com/dolthub/ishell v0.0.0-20260414231531-5f031e3e9037 // indirect - github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71 // indirect - github.com/dolthub/vitess v0.0.0-20260728212736-0542037326d7 + github.com/dolthub/jsonpath v0.0.2-0.20260807003725-336cd89c1c76 // indirect + github.com/dolthub/vitess v0.0.0-20260930232419-a6b7b0c65d17 github.com/dustin/go-humanize v1.0.1 // indirect github.com/ebitengine/purego v0.10.0 // indirect github.com/edsrzf/mmap-go v1.2.0 // indirect @@ -170,7 +172,6 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-viper/mapstructure/v2 v2.5.0 // indirect - github.com/goccy/go-json v0.10.5 // indirect github.com/gocraft/dbr/v2 v2.7.6 // indirect github.com/gofrs/flock v0.8.1 // indirect github.com/golang-jwt/jwt/v5 v5.3.0 // indirect @@ -199,7 +200,7 @@ require ( github.com/magiconair/properties v1.8.10 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.22 // indirect - github.com/mattn/go-runewidth v0.0.24 // indirect + github.com/mattn/go-runewidth v0.0.28 // indirect github.com/microcosm-cc/bluemonday v1.0.27 github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect @@ -259,20 +260,20 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect go.yaml.in/yaml/v3 v3.0.5 // indirect - golang.org/x/crypto v0.55.0 // indirect + golang.org/x/crypto v0.57.0 // indirect golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3 // indirect - golang.org/x/mod v0.40.0 - golang.org/x/net v0.58.0 + golang.org/x/mod v0.41.0 + golang.org/x/net v0.59.0 golang.org/x/oauth2 v0.36.0 // indirect golang.org/x/telemetry v0.0.0-20260811182544-a038080d80e5 // indirect - golang.org/x/text v0.41.0 // indirect + golang.org/x/text v0.42.0 // indirect golang.org/x/time v0.14.0 // indirect golang.org/x/tools v0.49.0 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect google.golang.org/api v0.264.0 // indirect google.golang.org/genproto v0.0.0-20260128011058-8636f8732409 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20260819154853-08b0e4226688 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260819154853-08b0e4226688 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20260928230214-8a89bd6388cc // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260928230214-8a89bd6388cc // indirect google.golang.org/grpc v1.83.2 // indirect google.golang.org/protobuf v1.36.12 // indirect gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect diff --git a/go.sum b/go.sum index 9489f5919..e2b0a7cfd 100644 --- a/go.sum +++ b/go.sum @@ -215,8 +215,8 @@ github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible h1:8psS8a+wKfiLt1iVDX79F github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= -github.com/anthropics/anthropic-sdk-go v1.71.0 h1:DK9xG3s5t+xUIOp+R+1LIRjkU/wG57YyQO3630+gYOE= -github.com/anthropics/anthropic-sdk-go v1.71.0/go.mod h1:x+lPk/cCl48uRegeP0hlYYBN1b7bEBTveInIMgLicnY= +github.com/anthropics/anthropic-sdk-go v1.80.0 h1:w86dgWOME3oW93UKZXFxPMwPhjHn3pNaldMZ8kMgHDc= +github.com/anthropics/anthropic-sdk-go v1.80.0/go.mod h1:x+lPk/cCl48uRegeP0hlYYBN1b7bEBTveInIMgLicnY= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/apache/arrow/go/arrow v0.0.0-20200730104253-651201b0f516/go.mod h1:QNYViu/X0HXDHw7m3KXzWSVXIbfUvJqBFe6Gj8/pYA0= github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40 h1:q4dksr6ICHXqG5hm0ZW5IHyeEJXoIJSOZeBLmWPNeIQ= @@ -345,8 +345,8 @@ github.com/charmbracelet/colorprofile v0.4.3 h1:QPa1IWkYI+AOB+fE+mg/5/4HRMZcaXex github.com/charmbracelet/colorprofile v0.4.3/go.mod h1:/zT4BhpD5aGFpqQQqw7a+VtHCzu+zrQtt1zhMt9mR4Q= github.com/charmbracelet/ultraviolet v0.0.0-20260811164956-006e29f97886 h1:rdnVWKgJpTVXKuKuJyxDJ+NFJdUaUqGvyGy61OcvlbA= github.com/charmbracelet/ultraviolet v0.0.0-20260811164956-006e29f97886/go.mod h1:nAw0d9PhFp1qdzi2xhQU5YOu5sVpDIHWlaW2Uz/bCro= -github.com/charmbracelet/x/ansi v0.11.8 h1:JMFwp0CgDC2+jcOB162HH5k7I3FVbgFSMMYg7dSPBQQ= -github.com/charmbracelet/x/ansi v0.11.8/go.mod h1:ZNN+3mXny/516oTQPLMPIBeSINvNJJQ8uQXDgbeJxY0= +github.com/charmbracelet/x/ansi v0.11.9 h1:kIrqLBxtTVbLyyHO2Evoi93EjQo1mylWmpNEsfPxXAM= +github.com/charmbracelet/x/ansi v0.11.9/go.mod h1:DG/hpOnaI2QJ/KMMqLL2h0KVhluuJLazf8973P+Vy5w= github.com/charmbracelet/x/conpty v0.1.1 h1:s1bUxjoi7EpqiXysVtC+a8RrvPPNcNvAjfi4jxsAuEs= github.com/charmbracelet/x/conpty v0.1.1/go.mod h1:OmtR77VODEFbiTzGE9G1XiRJAga6011PIm4u5fTNZpk= github.com/charmbracelet/x/errors v0.0.0-20240508181413-e8d8b6e2de86 h1:JSt3B+U9iqk37QUU2Rvb6DSBYRLtWqFqfxf8l5hOZUA= @@ -433,30 +433,32 @@ github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12 h1:I github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12/go.mod h1:rN7X8BHwkjPcfMQQ2QTAq/xM3leUSGLfb+1Js7Y6TVo= github.com/dolthub/dolt-mcp v0.3.4 h1:AyG5cw+fNWXDHXujtQnqUPZrpWtPg6FN6yYtjv1pP44= github.com/dolthub/dolt-mcp v0.3.4/go.mod h1:bCZ7KHvDYs+M0e+ySgmGiNvLhcwsN7bbf5YCyillLrk= -github.com/dolthub/dolt/go v0.40.5-0.20260806213044-796d07497741 h1:z+Disx4RJn0dxaYSzcp8pbiXddi3dpIoUJaMtVa/iBE= -github.com/dolthub/dolt/go v0.40.5-0.20260806213044-796d07497741/go.mod h1:houDkPceGRjDBdaDsfym5OQUB4465mBUnPvSxMOPrPo= -github.com/dolthub/driver/v2 v2.2.0 h1:Qm9BhvvKNmeTDF6kZdDkdLe62CF1W6GrCA3ZDRx/tlk= -github.com/dolthub/driver/v2 v2.2.0/go.mod h1:Ngki9vM88/sqin1RKfUt/9Ex8DmoePtHgY7d4+YoolU= +github.com/dolthub/dolt/go v0.40.5-0.20261002233748-c6af56fead88 h1:2HfeitrXNFvlCPWog+yMjSeZ4qBWSZOnOaeWI9Ai8QU= +github.com/dolthub/dolt/go v0.40.5-0.20261002233748-c6af56fead88/go.mod h1:+DGXtWsZ7EFxHfh7LFKUEVdfj9aDPhR5SnaLZ7dxWQQ= +github.com/dolthub/driver/v2 v2.4.1 h1:Wzk1Wd6GVQ3CpBa2OQgGTb1KoldMDfYgu2hVzyVrSJg= +github.com/dolthub/driver/v2 v2.4.1/go.mod h1:dWP6ygBQw8JUIG9uvQo1R/vAfeCV9Sg7t9neNx7THyc= github.com/dolthub/eventkit v0.0.0-20260611184414-99f5693e696a h1:qNecLF0XIN1BD0RfS/UmlN8ObC3G7bFUJtEyqJeBea4= github.com/dolthub/eventkit v0.0.0-20260611184414-99f5693e696a/go.mod h1:eHUkm69YMO2/v7bzwwYCEkd+3Xu7+KUpP7jFWAbpDlM= github.com/dolthub/eventsapi_schema v0.0.0-20260715220557-d9b4a1c6b4d4 h1:0mg9QEFdkkBwJMxvz1tCjHYmfG2iIC6aShj1InDq9/M= github.com/dolthub/eventsapi_schema v0.0.0-20260715220557-d9b4a1c6b4d4/go.mod h1:SSLraQS/jGLYFgff3vuZ+JbVUct6vyEeMzjLBqWqoyM= +github.com/dolthub/file-locks v0.1.2 h1:D0eaII+636hkk7uJu++qaUT/XqDtRTQArWBQ6vEHfJU= +github.com/dolthub/file-locks v0.1.2/go.mod h1:8B7bWbbkj76BAnD2EaNrj/6HW25iCpq4Ivzz+kA5b1w= github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 h1:u3PMzfF8RkKd3lB9pZ2bfn0qEG+1Gms9599cr0REMww= github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2/go.mod h1:mIEZOHnFx4ZMQeawhw9rhsj+0zwQj7adVsnBX7t+eKY= github.com/dolthub/fslock v0.0.5 h1:QoXhBhgY1oumHE26qyE7tgmXUT8qjJwxsIzo54O/B/k= github.com/dolthub/fslock v0.0.5/go.mod h1:sdofYYqE0D79zNZyB4/kmlnsQOVap1C2yByjGKSirEM= github.com/dolthub/go-icu-regex v0.0.0-20260610153742-72563bc7ca83 h1:FEMjCGEroDnY/BXyAffVZxUpXhP2GpoUJyyq5KaLn8c= github.com/dolthub/go-icu-regex v0.0.0-20260610153742-72563bc7ca83/go.mod h1:F3cnm+vMRK1HaU6+rNqQrOCyR03HHhR1GWG2gnPOqaE= -github.com/dolthub/go-mysql-server v0.20.1-0.20260805191915-e5eafe0da809 h1:c+S3O08LgGS+czU/CuN+/pOKMri5F6kxajoWrTyrE1s= -github.com/dolthub/go-mysql-server v0.20.1-0.20260805191915-e5eafe0da809/go.mod h1:9GLxpglhedopzqBGpW0PGrw7UlwG5kBIOepE2QfTQ1s= +github.com/dolthub/go-mysql-server v0.20.1-0.20261001232740-19405eb6f203 h1:Q1q3rmpxwHNU3u0uUXM9Zd+VSXtsGiXjU1ohY5z0+pU= +github.com/dolthub/go-mysql-server v0.20.1-0.20261001232740-19405eb6f203/go.mod h1:8yhQsTiaXTn5/q9DCc1RJoOkVvGgDvvVrylW9EFjv/A= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI= github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q= github.com/dolthub/ishell v0.0.0-20260414231531-5f031e3e9037 h1:oIW9HwuWrhxv+4HZxA+QQSKHLqWFyXZ2FmNjUYwkdiM= github.com/dolthub/ishell v0.0.0-20260414231531-5f031e3e9037/go.mod h1:ehexgi1mPxRTk0Mok/pADALuHbvATulTh6gzr7NzZto= -github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71 h1:bMGS25NWAGTEtT5tOBsCuCrlYnLRKpbJVJkDbrTRhwQ= -github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71/go.mod h1:2/2zjLQ/JOOSbbSboojeg+cAwcRV0fDLzIiWch/lhqI= -github.com/dolthub/vitess v0.0.0-20260728212736-0542037326d7 h1:gvOpHisi0CbG3hixdGulNQdXy3V7+AWxe37kGBgTmRI= -github.com/dolthub/vitess v0.0.0-20260728212736-0542037326d7/go.mod h1:5SVEJgAhw5nnQUFnGgKI1Svqes1Mw+zKUsalyxmOuG0= +github.com/dolthub/jsonpath v0.0.2-0.20260807003725-336cd89c1c76 h1:ZmLDDKnfbWc8VtOU/peSnUmUW8Z/Y6FEz4es6iCALvQ= +github.com/dolthub/jsonpath v0.0.2-0.20260807003725-336cd89c1c76/go.mod h1:2/2zjLQ/JOOSbbSboojeg+cAwcRV0fDLzIiWch/lhqI= +github.com/dolthub/vitess v0.0.0-20260930232419-a6b7b0c65d17 h1:ybmsrwM4mBagCff/1rfhQ1n/ozEqGvviD5JIW5ZbZ1g= +github.com/dolthub/vitess v0.0.0-20260930232419-a6b7b0c65d17/go.mod h1:5SVEJgAhw5nnQUFnGgKI1Svqes1Mw+zKUsalyxmOuG0= github.com/dprotaso/go-yit v0.0.0-20191028211022-135eb7262960/go.mod h1:9HQzr9D/0PGwMEbC3d5AB7oi67+h4TsQqItC1GVYG58= github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 h1:PRxIJD8XjimM5aTknUK9w6DHLDox2r2M3DI4i2pnd3w= github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936/go.mod h1:ttYvX5qlB+mlV1okblJqcSMtR4c52UKxDiX9GRBS8+Q= @@ -556,8 +558,6 @@ github.com/go-viper/mapstructure/v2 v2.5.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlnd github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= -github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4= -github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/gocraft/dbr/v2 v2.7.6 h1:ASHKFgCbTLODbb9f756Cl8VAlnvQLKqIzx9E1Cfb7eo= github.com/gocraft/dbr/v2 v2.7.6/go.mod h1:8IH98S8M8J0JSEiYk0MPH26ZDUKemiQ/GvmXL5jo+Uw= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= @@ -699,8 +699,8 @@ github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gowebpki/jcs v1.0.1 h1:Qjzg8EOkrOTuWP7DqQ1FbYtcpEbeTzUoTN9bptp8FOU= -github.com/gowebpki/jcs v1.0.1/go.mod h1:CID1cNZ+sHp1CCpAR8mPf6QRtagFBgPJE0FCUQ6+BrI= +github.com/gowebpki/jcs v1.0.2 h1:IY0Iv76ThSvocWinl2rphYmGLhMufS3ZD1giKqkI6ps= +github.com/gowebpki/jcs v1.0.2/go.mod h1:caHbxgiKxrUu6KNItCUKoggR5/ZUSNxVCm9ZxWJXR0U= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 h1:/Tnpcb2E0Pz/tN9s3bfEY2Q8ePCEX9iuS+cneUwncnw= github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0/go.mod h1:zOBXOsUaBSjKgmH4OGzV1esUpR3oUSCPYVd2cUBjKYY= @@ -843,8 +843,8 @@ github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Ky github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.22 h1:j8l17JJ9i6VGPUFUYoTUKPSgKe/83EYU2zBC7YNKMw4= github.com/mattn/go-isatty v0.0.22/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4= -github.com/mattn/go-runewidth v0.0.24 h1:cpokDiIn0MGnhdHwuWnJBITySJ20QyNGnY2kR/ay2DU= -github.com/mattn/go-runewidth v0.0.24/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs= +github.com/mattn/go-runewidth v0.0.28 h1:rPyg2ybwEKPebvpzVWe1gKBkH8EQFkxO4Y0hjBeLaBU= +github.com/mattn/go-runewidth v0.0.28/go.mod h1:3qAiGCV4Koz/yuveO58qUefmUTRm8r0IGEXZ9jeHp/8= github.com/mattn/go-sqlite3 v1.14.52 h1:wVbm2Qnf4OXkqhBTSPuCRZDRnxfbVrrmiCEroVdog8U= github.com/mattn/go-sqlite3 v1.14.52/go.mod h1:6JTjA44L93a0QCyJef5YvlPoKXntQPjzWv5gtm9sB6w= github.com/microcosm-cc/bluemonday v1.0.27 h1:MpEUotklkwCSLeH+Qdx1VJgNqLlpY2KXwXFM08ygZfk= @@ -1115,24 +1115,26 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.7 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.70.0/go.mod h1:DqEFwLumhzMBDQv9PcWbyoDxHI/4lAk6CM4nJBH39sc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.70.0 h1:LMuyCAyfalSjDyjdC65nK6N0zoTT63+E/u95X0JovZI= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.70.0/go.mod h1:085m8qbm4hgc8rZWGDEa4vmyyo2c3nPxUslYUKUIU04= -go.opentelemetry.io/otel v1.46.0 h1:FHt5/CDyVxi/8IM1CH7VE/rRgq3kLHa2mSTVMO8AWyc= -go.opentelemetry.io/otel v1.46.0/go.mod h1:Gj3SEScelsNC45tp4nSxRYlS+f5iez7W8XPMCt905kE= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.46.0 h1:AP23h/mFgb/lc7tdck1Kfn9qxsM8TAeNPCU5C3pzaps= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.46.0/go.mod h1:K4EqCe1b4kGk5WR690ntg9LaBfsPoV32FwthbyoptuA= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.46.0 h1:PR9eAf7o0dQs3hshZNZpE9aW2dXWX/KdDf6pJilVD3U= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.46.0/go.mod h1:2Z4KyNdH1uuzivdinyfGsxzNNT/Rl45pwtVwfYVI0xk= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.46.0 h1:KdRxPiAoMptR3vfWzvjjvutTsSiwbC2uG0496rzZNfo= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.46.0/go.mod h1:K/qSA+3G7Eovxi4K09wzrAgkWRnosS0DAOZeEpve7sM= -go.opentelemetry.io/otel/metric v1.46.0 h1:yBnkXvgV7AXFILZc5K6IZe/CBFF3OS7BJ8ov6/lj0K8= -go.opentelemetry.io/otel/metric v1.46.0/go.mod h1:iPmdWqifKUdzziPkvvzIJXITl56fQx2mGM/DHLB3/2o= -go.opentelemetry.io/otel/metric/x v0.68.0 h1:TA/cBT23D3MnxYPwHL7YFOdYGdx0A0v+s7Mzotpd1dU= -go.opentelemetry.io/otel/metric/x v0.68.0/go.mod h1:agudOmvWhwUTjgibWDzxD2PoWYnpw5Ht5jISYOD2Hd4= -go.opentelemetry.io/otel/sdk v1.46.0 h1:h5CNQQjEbuQXY/JfZtgt3i7HVFV3aHPO2OAwO2eTYPI= -go.opentelemetry.io/otel/sdk v1.46.0/go.mod h1:GAERFXFt5SYCEB+YiKUbMBeza6UaDH7GmGOZEfh2gSM= -go.opentelemetry.io/otel/sdk/metric v1.46.0 h1:0piZ26EG4RBfebb2jhDH6ERCYHoVWduc3kLgPCwSnSE= -go.opentelemetry.io/otel/sdk/metric v1.46.0/go.mod h1:I1PbKrdVc8Qu8HYVDNtqVIwLwjNrhsV/uFuxfwg8mO4= -go.opentelemetry.io/otel/trace v1.46.0 h1:OULy7ccdJnZtJ0UDYFOIGaCmiWzJ8Vi2G/Rsu60qs1c= -go.opentelemetry.io/otel/trace v1.46.0/go.mod h1:J7GAXweO77XSFkB/rmAqk9D6ihszhFjLU+d9WuUxDLI= +go.opentelemetry.io/otel v1.47.0 h1:j7ALJ/zgkS7Z6aeJW09p8VC9804bC+PpeTfCD4XPnOM= +go.opentelemetry.io/otel v1.47.0/go.mod h1:8wS9O2qfXrYrzp6hIF/HOYJJf/wIhFPhR2xLuP+iXQU= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.47.0 h1:7kszRN4Ze5GeAkUnBjBSUIunVBMA+mZIG04auueqguM= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.47.0/go.mod h1:CLzakYy8jOdkBfcveCWYkeKJxujcF4xPhh2Z7IfE98U= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.47.0 h1:ww5DYBpMKcqLdxjWrhGUIh6O+ZfvZUaMk4niVyNQPEQ= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.47.0/go.mod h1:Av5t+Ezx5S/Ks2dsEfWhny+GK+wrZ1K7NZ6aHSWnX3U= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.47.0 h1:N3YQCxjxQ/bMjyc3heladfRm9t9RTksGQH8z4w6yU/0= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.47.0/go.mod h1:Mp8HOFqcaUyypCuGv9IhDdTHnJ56lSudSHMd+pVSCEA= +go.opentelemetry.io/otel/log v1.47.0 h1:cOTS1CcLbSQeZKanGJ+0JpF/+t4PELi3O3bbl2lqCcI= +go.opentelemetry.io/otel/log v1.47.0/go.mod h1:9byitSQ5pLC6PpqwGXjqdMKya6ZTswHRZh2vvXT33nw= +go.opentelemetry.io/otel/metric v1.47.0 h1:4PptaldXx3Eat1XjMZ68pPJEs5wrhlemctZE9a3UdWY= +go.opentelemetry.io/otel/metric v1.47.0/go.mod h1:ADGSXxRrXM6bjbvLo535EstVFlPpPYZm4LBKixjDHwU= +go.opentelemetry.io/otel/metric/x v0.69.0 h1:DjRLr15H83v+hCW7JA9NoJvOkYTtmq5YoDRbe9deYpM= +go.opentelemetry.io/otel/metric/x v0.69.0/go.mod h1:uVvsMPMFFyj/HUQfrUnH3JjnOQ1dwFDorgFLRBasM0k= +go.opentelemetry.io/otel/sdk v1.47.0 h1:zWXEr4j2lFefG87TU6Yg8a7ngfohIKFZHKp0Hf5hC6I= +go.opentelemetry.io/otel/sdk v1.47.0/go.mod h1:VUc24kiOeoGsxG8G9ULx3fWKvB7jMhnGE8Oi607lgR0= +go.opentelemetry.io/otel/sdk/metric v1.47.0 h1:lfISg2j93VT6yqdk9OfUaZmw/GfcZqCCV3jdXtsPnKw= +go.opentelemetry.io/otel/sdk/metric v1.47.0/go.mod h1:ypLp+mW1Nt2x+Szt3b5/i1syodyts49lMOwxpDI3VGw= +go.opentelemetry.io/otel/trace v1.47.0 h1:JOjX/Oci8K94QHddo+bbfya/Ai/nf6/dt9ZfrFNWSrM= +go.opentelemetry.io/otel/trace v1.47.0/go.mod h1:jNaSLa2PZEYFG6fRjJABAu+bw4FS08uDmPg28lTghu0= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v1.11.0 h1:5rrYs0Ykyj50sdU/JU0x8etU+LubXWb+gED6TbEdMIk= go.opentelemetry.io/proto/otlp v1.11.0/go.mod h1:SmVizdCOAm3XBtG1g1NnOdhW6jtddT72hLMhv8VwA8E= @@ -1187,8 +1189,8 @@ golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= -golang.org/x/crypto v0.55.0 h1:+KWHjbgOaAQ66dh/YlkZKHlz9ZUlq61AFirAR9ntP8M= -golang.org/x/crypto v0.55.0/go.mod h1:uq0V9dE/fzQuJtbnL+2EhWOE63vo164FY8xqEnV9xis= +golang.org/x/crypto v0.57.0 h1:3ZVCjf8Ggz7zneR/EHRVx68Ctf+2pmIMP2UFhh9cC6M= +golang.org/x/crypto v0.57.0/go.mod h1:Fdz0i5U6CoizGwLda9DttjSk6qlZo25zYNtR+ycvuZA= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1214,8 +1216,8 @@ golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+o golang.org/x/image v0.0.0-20200618115811-c13761719519/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20201208152932-35266b937fa6/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20210216034530-4410531fe030/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/image v0.38.0 h1:5l+q+Y9JDC7mBOMjo4/aPhMDcxEptsX+Tt3GgRQRPuE= -golang.org/x/image v0.38.0/go.mod h1:/3f6vaXC+6CEanU4KJxbcUZyEePbyKbaLoDOe4ehFYY= +golang.org/x/image v0.41.0 h1:8wS72eGJMJaBxK6okTzd4WaXumUlTVlb753MlsSvTCo= +golang.org/x/image v0.41.0/go.mod h1:uIc348UZMSvS5Z65CVZ7iDPaNobNFEPeJ4kbqTOszmA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -1242,8 +1244,8 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.40.0 h1:hUv+3cXcdRHz08UmSiOob7sadHig73uo5bkXxQ/tvUs= -golang.org/x/mod v0.40.0/go.mod h1:0/weTWkPWGBikyTWAX3dkjVztMmBA5hM0DH6BElSupE= +golang.org/x/mod v0.41.0 h1:qJmnOUb4YB+FsEuM3HcWucdZASCPGhsX6uljO6pog0c= +golang.org/x/mod v0.41.0/go.mod h1:Ek9pY8RKWXwsWvd3rQiHYtMqkjSUV+s1Rj7j4H5Ur6o= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1300,8 +1302,8 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.58.0 h1:ynWG7rqYi4ccpTEuPZ2QGWHktVEM9DMCj9yzDE0Q7To= -golang.org/x/net v0.58.0/go.mod h1:YwCddHnFlT7eLQqVprV19OnhLGtc5xOKgE0RyqgfWAU= +golang.org/x/net v0.59.0 h1:5zfYln+w5XCxwrnMMJPufRgNoXEaGxl0wo5GqPXyues= +golang.org/x/net v0.59.0/go.mod h1:2DA/G1UfVbCpQPeWTmMPGY7Cs2PkBkwu743bVX5PIVg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1337,8 +1339,8 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.23.0 h1:KameEIfc1IkluZyXWLn39Wd4tURc6GbCiISGiZm2bQk= -golang.org/x/sync v0.23.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0= +golang.org/x/sync v0.24.0 h1:iqiDrGoDgyuvAKrhLQthUEzU/R378N78gXbBjxed7oA= +golang.org/x/sync v0.24.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1427,8 +1429,8 @@ golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.48.0 h1:bbX/i/6MgT9BVLM9RT1thmxL04yeTAhbEz4SyadbXoo= -golang.org/x/sys v0.48.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og= +golang.org/x/sys v0.49.0 h1:XbzkgYJHdqh/8m2Uu0W/dQv8nktxx4BFHp1M0gROTXA= +golang.org/x/sys v0.49.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og= golang.org/x/telemetry v0.0.0-20260811182544-a038080d80e5 h1:ZUSxONxc981v7AW7QUg+I9WwZzSTTJ019ENBYr5pV/Q= golang.org/x/telemetry v0.0.0-20260811182544-a038080d80e5/go.mod h1:LVehoXe41cL5SCVQilsV7Gg6BNG+Js6P9PhSbYTIUkQ= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= @@ -1437,8 +1439,8 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.46.0 h1:3+OXuTbaKDgwk8jTi3aSLHRlmWqHEUDUtxnbFigO4YE= -golang.org/x/term v0.46.0/go.mod h1:+K02xbkittuwc0Am4abfA3Fc+XRGXkvBXNO88NCXPoc= +golang.org/x/term v0.47.0 h1:cpyOwQkr2Nzxe2p6KnrTG7Ei2wtzjsuSjhpXXepZ/BM= +golang.org/x/term v0.47.0/go.mod h1:efAfAuG6RKABvg1ArGebRkvX6LXul14SM67o2e4mUCY= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1451,8 +1453,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.41.0 h1:vz/seA0lnX87Othu2f/0L24RcgrXD9/YFTSuGjj3rH8= -golang.org/x/text v0.41.0/go.mod h1:jvf1O8ajNzZqhSrQBPbutR/EB83Cc0CFrezNQIwbb5M= +golang.org/x/text v0.42.0 h1:JbOZXgfeCPU9gacVtYliJqOhD+zhrEqK4LfdpmlUZqI= +golang.org/x/text v0.42.0/go.mod h1:ojzP1Z+2QtioaF8DTtO8K5q7JWVVYwZKenzujK0Zd0E= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1687,10 +1689,10 @@ google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2I google.golang.org/genproto v0.0.0-20220401170504-314d38edb7de/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/genproto v0.0.0-20260128011058-8636f8732409 h1:VQZ/yAbAtjkHgH80teYd2em3xtIkkHd7ZhqfH2N9CsM= google.golang.org/genproto v0.0.0-20260128011058-8636f8732409/go.mod h1:rxKD3IEILWEu3P44seeNOAwZN4SaoKaQ/2eTg4mM6EM= -google.golang.org/genproto/googleapis/api v0.0.0-20260819154853-08b0e4226688 h1:ax2KzoSRIZU/M0cIxri3pKxy99vniH1PVxWC6si/eZI= -google.golang.org/genproto/googleapis/api v0.0.0-20260819154853-08b0e4226688/go.mod h1:1RJ9BQGyNdZwkGc1eTqkErfRZ6RJyYPHZo73BZ1vQqI= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260819154853-08b0e4226688 h1:cYNAzI2sUwhmCcoj9TxvihSrqsxt6uIkj3rDRhSDmW4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260819154853-08b0e4226688/go.mod h1:DjtHYE8FKJLivXcBEjGwndXfIC23G0VpXiXKqG179uA= +google.golang.org/genproto/googleapis/api v0.0.0-20260928230214-8a89bd6388cc h1:rZHRz0ogq4Pid1IKtA/ivHi8XONVF5tqUQXA2TtgpkE= +google.golang.org/genproto/googleapis/api v0.0.0-20260928230214-8a89bd6388cc/go.mod h1:K/n0XLazCJHjD73YuMyNJsN38BPPy1kfFnKxUXaThFU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260928230214-8a89bd6388cc h1:4bNTbnb44EqGVy9HaQxSY2jnafSUdgV3qHtedvNpDKg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260928230214-8a89bd6388cc/go.mod h1:OaIUM3+LpYcK2GXM4FTmhWoIq371Owdr+Cc7/BsYHHc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= diff --git a/internal/doltversion/cache_test.go b/internal/doltversion/cache_test.go index 497496f90..aefb73d58 100644 --- a/internal/doltversion/cache_test.go +++ b/internal/doltversion/cache_test.go @@ -38,7 +38,8 @@ func forkCount(t *testing.T, countFile string) int { func TestCachedProbeHitSkipsFork(t *testing.T) { dir := t.TempDir() countFile := filepath.Join(dir, "count") - stub := writeCountingVersionStub(t, dir, "dolt", "dolt version 2.1.0", countFile) + recent := RecommendedMin.String() + stub := writeCountingVersionStub(t, dir, "dolt", "dolt version "+recent, countFile) cachePath := filepath.Join(dir, "cache", "dolt-probe.json") now := time.Date(2026, 8, 11, 12, 0, 0, 0, time.UTC) @@ -63,8 +64,8 @@ func TestCachedProbeHitSkipsFork(t *testing.T) { if got := forkCount(t, countFile); got != 1 { t.Errorf("after second probe: fork count = %d, want still 1 (cache hit must not fork)", got) } - if second.Identity.Version.String() != "2.1.0" { - t.Errorf("cached Version = %v, want 2.1.0", second.Identity.Version) + if second.Identity.Version.String() != recent { + t.Errorf("cached Version = %v, want %s", second.Identity.Version, recent) } if second.Warning != nil { t.Errorf("cached Warning = %v, want nil for a recent version", second.Warning) @@ -74,7 +75,8 @@ func TestCachedProbeHitSkipsFork(t *testing.T) { func TestCachedProbeMissOnBinaryChange(t *testing.T) { dir := t.TempDir() countFile := filepath.Join(dir, "count") - stub := writeCountingVersionStub(t, dir, "dolt", "dolt version 2.1.0", countFile) + recent := RecommendedMin.String() + stub := writeCountingVersionStub(t, dir, "dolt", "dolt version "+recent, countFile) cachePath := filepath.Join(dir, "dolt-probe.json") now := time.Date(2026, 8, 11, 12, 0, 0, 0, time.UTC) @@ -107,7 +109,8 @@ func TestCachedProbeMissOnBinaryChange(t *testing.T) { func TestCachedProbeCorruptCacheFailsOpen(t *testing.T) { dir := t.TempDir() countFile := filepath.Join(dir, "count") - stub := writeCountingVersionStub(t, dir, "dolt", "dolt version 2.1.0", countFile) + recent := RecommendedMin.String() + stub := writeCountingVersionStub(t, dir, "dolt", "dolt version "+recent, countFile) cachePath := filepath.Join(dir, "dolt-probe.json") if err := os.WriteFile(cachePath, []byte("{not json"), 0o600); err != nil { t.Fatalf("write corrupt cache: %v", err) @@ -120,8 +123,8 @@ func TestCachedProbeCorruptCacheFailsOpen(t *testing.T) { if res.FromCache { t.Error("FromCache = true, want false (corrupt cache must be ignored)") } - if res.Identity.Version.String() != "2.1.0" { - t.Errorf("Version = %v, want 2.1.0", res.Identity.Version) + if res.Identity.Version.String() != recent { + t.Errorf("Version = %v, want %s", res.Identity.Version, recent) } // The successful probe must have repaired the cache file. if _, ok := loadCacheEntry(cachePath); !ok { diff --git a/internal/doltversion/policy.go b/internal/doltversion/policy.go index 594a1c084..950987b74 100644 --- a/internal/doltversion/policy.go +++ b/internal/doltversion/policy.go @@ -7,19 +7,27 @@ import ( ) // RecommendedMin is the dolt version this package recommends for managed -// proxied-server mode, based on the cross-version compatibility matrix run -// 2026-07-25: it showed that cross-reading storage written by the beads -// Dolt Go module (as opposed to writing it, which older dolt CLIs can also -// do) requires an external dolt >= 2.0.0 — dolt 1.85 can *serve* proxied -// mode but cannot *read* storage the module wrote, and dolt 1.52.1 fails at -// both serving and reading. This is deliberately a recommendation, not a -// hard floor (see CheckRecommended): an earlier design that hard-failed -// startup below a version floor was rejected in adversarial review as -// "policy without evidence" — the matrix only establishes an empirical -// compatibility boundary for the read path, not a product decision to -// refuse older binaries outright, and rollout should be allowed to proceed -// on a warning while that policy question is settled. -var RecommendedMin = MustParse("2.0.0") +// proxied-server mode. It tracks the embedded engine beads links (the +// dolthub/driver v2.4.1 module in go.mod), so the external CLI runs the same +// Dolt as embedded mode. Two boundaries sit below it. Releases before 2.4.0 +// mis-plan a join (dolthub/dolt#11886). Releases before 2.3.3 cannot read a +// descending index column ("table has unknown fields"; 2.3.3 is the first +// release that stores one, dolthub/dolt#11746): migration 0010 declares one, +// so a database a 2.3.3-or-newer engine created holds it until migration 0071 +// replaces it, and its history before 0071 keeps it. 2.4.1 is the release CI +// pins, and the only release after 2.3.1 measured clean of the +// CALL DOLT_RESET('--hard') regression 2.3.0 introduced (2.3.2 through 2.4.0 +// are unmeasured); docs/architecture/dolt.md ("Which Dolt version to install") +// records the dated measurements. Keep it aligned with the CLI/container test +// pins (scripts/ci/install-dolt.sh). +// +// This is deliberately a recommendation, not a hard floor (see +// CheckRecommended): an earlier design that hard-failed startup below a +// version floor was rejected in adversarial review as "policy without +// evidence", and rollout should be allowed to proceed on a warning while that +// policy question is settled. Older binaries produce a warning rather than +// preventing startup. +var RecommendedMin = MustParse("2.4.1") // warningKind distinguishes the two situations ProbeWithPolicy can warn // about, so Warning.Message can render the right wording for each without @@ -80,8 +88,13 @@ func (w *Warning) Message() string { ) default: return fmt.Sprintf( - "dolt %s is older than the recommended minimum %s for proxied-server mode; "+ - "cross-reading storage written by newer dolt Go modules may fail (see gastownhall/beads doltversion package docs)", + "dolt %s is older than the recommended minimum %s for proxied-server mode: "+ + "dolt 2.3.0 regressed CALL DOLT_RESET('--hard'), which fails with \"context canceled\" on some "+ + "freshly created databases (measured on 2.3.0 and 2.3.1; 2.3.2 through 2.4.0 are unmeasured, "+ + "and 2.4.1 measured clean), dolt before 2.4.0 can return wrong join results (dolthub/dolt#11886), "+ + "and dolt before 2.3.3 fails with \"table has unknown fields\" on a descending index, which a "+ + "database created by dolt 2.3.3 or newer holds until a bd schema migration replaces it, and "+ + "keeps in its history (see gastownhall/beads doltversion package docs)", w.Probed, w.Recommended, ) } diff --git a/internal/doltversion/policy_test.go b/internal/doltversion/policy_test.go index 279836d77..13fd25ee4 100644 --- a/internal/doltversion/policy_test.go +++ b/internal/doltversion/policy_test.go @@ -9,21 +9,21 @@ import ( ) func TestCheckRecommended(t *testing.T) { - old := Identity{Version: MustParse("1.52.1")} + old := Identity{Version: MustParse("2.4.0")} if w := CheckRecommended(old); w == nil { - t.Error("CheckRecommended(1.52.1) = nil, want warning (below RecommendedMin)") - } else if w.Probed.String() != "1.52.1" || w.Recommended.String() != RecommendedMin.String() { + t.Error("CheckRecommended(2.4.0) = nil, want warning (below RecommendedMin)") + } else if w.Probed.String() != "2.4.0" || w.Recommended.String() != RecommendedMin.String() { t.Errorf("CheckRecommended warning fields = %+v", w) } - newEnough := Identity{Version: MustParse("2.0.0")} + newEnough := Identity{Version: MustParse("2.4.1")} if w := CheckRecommended(newEnough); w != nil { - t.Errorf("CheckRecommended(2.0.0) = %v, want nil", w) + t.Errorf("CheckRecommended(2.4.1) = %v, want nil", w) } - newer := Identity{Version: MustParse("2.1.0")} + newer := Identity{Version: MustParse("2.5.0")} if w := CheckRecommended(newer); w != nil { - t.Errorf("CheckRecommended(2.1.0) = %v, want nil", w) + t.Errorf("CheckRecommended(2.5.0) = %v, want nil", w) } } @@ -31,6 +31,21 @@ func TestWarningMessage(t *testing.T) { old := &Warning{kind: warningOldVersion, Probed: MustParse("1.52.1"), Recommended: RecommendedMin} if msg := old.Message(); msg == "" { t.Error("Message() for old-version warning is empty") + } else { + // The advisory names what goes wrong below the recommendation, not just + // that something may: the DOLT_RESET('--hard') regression measured on + // 2.3.0 and 2.3.1 (with 2.3.2 through 2.4.0 unmeasured), the join + // mis-plan before 2.4.0 and the descending-index read failure before + // 2.3.3. + for _, want := range []string{ + "1.52.1", RecommendedMin.String(), + "DOLT_RESET('--hard')", "2.3.0 and 2.3.1", "2.3.2 through 2.4.0 are unmeasured", + "2.4.0", "dolthub/dolt#11886", "2.3.3", "table has unknown fields", + } { + if !strings.Contains(msg, want) { + t.Errorf("Message() = %q, want it to mention %q", msg, want) + } + } } unverifiable := &Warning{kind: warningUnverifiable, RawOutput: "garbage output"} @@ -111,7 +126,7 @@ func TestProbeWithPolicyRecommendedVersion(t *testing.T) { dir := t.TempDir() t.Run("recommended version produces no warning", func(t *testing.T) { - stub := writeVersionEchoStub(t, dir, "dolt-recent", "dolt version 2.0.0") + stub := writeVersionEchoStub(t, dir, "dolt-recent", "dolt version 2.4.1") _, warn, err := ProbeWithPolicy(context.Background(), stub) if err != nil { t.Fatalf("ProbeWithPolicy: %v", err) diff --git a/internal/storage/dolt/fresh_bootstrap_heal_integration_test.go b/internal/storage/dolt/fresh_bootstrap_heal_integration_test.go index 31281ccaf..0a1ac6981 100644 --- a/internal/storage/dolt/fresh_bootstrap_heal_integration_test.go +++ b/internal/storage/dolt/fresh_bootstrap_heal_integration_test.go @@ -238,7 +238,8 @@ func freshBootstrapIntegrationConfig(beadsDir string, port int, database, pathSu // twenty comes up with it permanently unusable, answering // "Error 1105 (HY000): context canceled" to every session for the life of the // server process (measured 2026-08-20: 2.1.8 0/40, 2.2.0 0/60, 2.3.0 3/60, -// 2.3.1 3/100 fresh databases broken). Without this probe the defect surfaces +// 2.3.1 3/100 fresh databases broken; re-measured 2026-10-10: 2.3.1 8/150, +// 2.4.1 0/250). Without this probe the defect surfaces // only as the heal's generic #4566 dirty-table refusal, which reads like a // beads bug and points the reader at "run 'bd dolt commit'" — advice that // cannot work, because the reset the heal needs is the thing that is broken. diff --git a/internal/storage/embeddeddolt/BUILD.bazel b/internal/storage/embeddeddolt/BUILD.bazel index 5b9d3687f..1b1ac14b5 100644 --- a/internal/storage/embeddeddolt/BUILD.bazel +++ b/internal/storage/embeddeddolt/BUILD.bazel @@ -190,6 +190,7 @@ go_test( "merge_blockers_test.go", "merge_strategy_test.go", "metadata_cas_contract_test.go", + "migrate_compaction_snapshots_index_test.go", "migrate_consent_gate_test.go", "migrate_dep_rekey_dedup_test.go", "migrate_events_flip_test.go", diff --git a/internal/storage/embeddeddolt/migrate_compaction_snapshots_index_test.go b/internal/storage/embeddeddolt/migrate_compaction_snapshots_index_test.go new file mode 100644 index 000000000..df05e5f0b --- /dev/null +++ b/internal/storage/embeddeddolt/migrate_compaction_snapshots_index_test.go @@ -0,0 +1,226 @@ +//go:build cgo + +package embeddeddolt_test + +import ( + "context" + "database/sql" + "path/filepath" + "strings" + "testing" + + "github.com/steveyegge/beads/internal/storage/embeddeddolt" + "github.com/steveyegge/beads/internal/storage/issueops" + "github.com/steveyegge/beads/internal/storage/schema" +) + +// These tests pin migration 0071 (gastownhall/beads#7646 review) on the engine +// bd links, which -- unlike Dolt older than 2.3.3 -- stores 0010's +// idx_comp_snap_issue (issue_id, compaction_level, created_at DESC) with +// created_at really descending. That stored DESC is what older Dolt cannot +// decode ("table has unknown fields"), so the tests read the shape +// information_schema reports, the foreign key the index backs, and the +// table's one reader. They need BEADS_TEST_EMBEDDED_DOLT=1 (requireEmbedded, +// migrate_selfheal_test.go). The CLI-bundle half is +// TestMigration0071LeavesNoDescendingIndexThroughDoltCLI in +// internal/storage/schema. + +const compSnapMigration0071 = "0071_replace_descending_compaction_snapshots_index.up.sql" + +const compSnapTwinShape = "issue_id:A,compaction_level:A,created_at:A" + +func TestEmbeddedMigration0071ReplacesDescendingCompactionSnapshotsIndex(t *testing.T) { + requireEmbedded(t) + ctx := t.Context() + upSQL, err := schema.MigrationSQL(compSnapMigration0071) + if err != nil { + t.Fatalf("read 0071 migration: %v", err) + } + + // The upgrade a v69 user takes through the production MigrateUp path, which + // applies 0070 and then 0071. + t.Run("upgrade from v69", func(t *testing.T) { + dataDir := seedMainSchemaAt(t, ctx, 69) + conn, closeConn := openPinnedConn(t, ctx, dataDir) + defer closeConn() + + if got, want := compSnapIndexShape(t, ctx, conn, "idx_comp_snap_issue"), "issue_id:A,compaction_level:A,created_at:D"; got != want { + t.Fatalf("v69 idx_comp_snap_issue = %q, want %q: this engine should store 0010's DESC, which is the shape 0071 removes", got, want) + } + + // The newest snapshot of cs-keep is neither first nor last in index + // order, so the reader below has to sort on created_at to find it. + execFrozenGuard(t, ctx, conn, ` +INSERT INTO issues (id, title, description, design, acceptance_criteria, notes, status, priority, issue_type) +VALUES ('cs-keep', 'x', '', '', '', '', 'open', 2, 'task'), + ('cs-gone', 'x', '', '', '', '', 'open', 2, 'task'); +INSERT INTO compaction_snapshots (id, issue_id, compaction_level, snapshot_json, created_at) +VALUES ('cs-snap-1', 'cs-keep', 1, '{"title":"oldest"}', '2026-10-01 00:00:00'), + ('cs-snap-2', 'cs-keep', 2, '{"title":"middle"}', '2026-10-02 00:00:00'), + ('cs-snap-3', 'cs-keep', 1, '{"title":"newest"}', '2026-10-03 00:00:00'), + ('cs-snap-4', 'cs-gone', 1, '{"title":"doomed"}', '2026-10-01 00:00:00'); +`) + mustDrain(t, ctx, conn, "CALL DOLT_ADD('-A')") + mustDrain(t, ctx, conn, "CALL DOLT_COMMIT('-m', 'test: seed compaction snapshots')") + if got := compSnapLatestTitle(t, ctx, conn, "cs-keep"); got != "newest" { + t.Fatalf("before 0071, latest cs-keep snapshot = %q, want %q", got, "newest") + } + + if _, err := schema.MigrateUp(ctx, conn); err != nil { + t.Fatalf("MigrateUp from v69: %v", err) + } + compSnapRequireReplaced(t, ctx, conn) + // A clone or a pull hands the other side HEAD, not the working set. + if tables := dirtyTableNames(t, ctx, conn); contains(tables, "compaction_snapshots") { + t.Fatalf("compaction_snapshots still dirty after MigrateUp (%v); 0071's step commit must carry the new index into HEAD", tables) + } + if got := compSnapLatestTitle(t, ctx, conn, "cs-keep"); got != "newest" { + t.Fatalf("after 0071, latest cs-keep snapshot = %q, want %q", got, "newest") + } + + // Replaying the file onto the migrated store changes nothing. + execFrozenGuard(t, ctx, conn, upSQL) + compSnapRequireReplaced(t, ctx, conn) + + // fk_comp_snap_issue, now backed by the twin, still cascades a delete + // and still refuses a snapshot of a missing issue. + execFrozenGuard(t, ctx, conn, "DELETE FROM issues WHERE id = 'cs-gone'") + if got := scalarInt(t, ctx, conn, "SELECT COUNT(*) FROM compaction_snapshots WHERE issue_id = 'cs-gone'"); got != 0 { + t.Fatalf("snapshots of deleted issue cs-gone = %d, want 0 (ON DELETE CASCADE)", got) + } + if _, err := conn.ExecContext(ctx, ` +INSERT INTO compaction_snapshots (id, issue_id, compaction_level, snapshot_json, created_at) +VALUES ('cs-snap-5', 'cs-missing', 1, '{}', '2026-10-04 00:00:00')`); err == nil { + t.Fatal("snapshot of missing issue cs-missing was accepted; fk_comp_snap_issue must refuse it") + } + }) + + // DDL is not transactional: a pass killed after the add holds both + // indexes, and running the file again must skip the add and finish the + // drop. + t.Run("resume after the add", func(t *testing.T) { + dataDir := seedMainSchemaAt(t, ctx, 69) + conn, closeConn := openPinnedConn(t, ctx, dataDir) + defer closeConn() + + execFrozenGuard(t, ctx, conn, "ALTER TABLE compaction_snapshots ADD INDEX idx_comp_snap_issue_asc (issue_id, compaction_level, created_at)") + execFrozenGuard(t, ctx, conn, upSQL) + compSnapRequireReplaced(t, ctx, conn) + }) + + t.Run("store without the table", func(t *testing.T) { + dataDir := seedMainSchemaAt(t, ctx, 69) + conn, closeConn := openPinnedConn(t, ctx, dataDir) + defer closeConn() + + execFrozenGuard(t, ctx, conn, "DROP TABLE compaction_snapshots") + execFrozenGuard(t, ctx, conn, upSQL) + if got := scalarInt(t, ctx, conn, "SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'compaction_snapshots'"); got != 0 { + t.Fatalf("compaction_snapshots tables = %d after 0071 on a store without one, want 0", got) + } + }) + + // A store created from nothing by the open path bd init uses. + t.Run("fresh store", func(t *testing.T) { + beadsDir := filepath.Join(t.TempDir(), ".beads") + store, err := embeddeddolt.Open(ctx, beadsDir, "testdb", "main") + if err != nil { + t.Fatalf("open fresh store: %v", err) + } + if err := store.Close(); err != nil { + t.Fatalf("close fresh store: %v", err) + } + conn, closeConn := openPinnedConn(t, ctx, filepath.Join(beadsDir, "embeddeddolt")) + defer closeConn() + + compSnapRequireReplaced(t, ctx, conn) + // One descending index column anywhere makes the database unreadable + // for Dolt older than 2.3.3. A migration that wants one has to make + // that trade-off on purpose and change this assertion. + if cols := compSnapDescendingColumns(t, ctx, conn); len(cols) != 0 { + t.Fatalf("fresh store has descending index columns %v, want none", cols) + } + }) +} + +// compSnapIndexShape returns an index on compaction_snapshots as +// "column:collation,..." in index order, or "" when the index does not exist. +func compSnapIndexShape(t *testing.T, ctx context.Context, conn *sql.Conn, index string) string { + t.Helper() + var shape sql.NullString + if err := conn.QueryRowContext(ctx, ` +SELECT GROUP_CONCAT(CONCAT(COLUMN_NAME, ':', COALESCE(COLLATION, '?')) ORDER BY SEQ_IN_INDEX) +FROM INFORMATION_SCHEMA.STATISTICS +WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'compaction_snapshots' AND INDEX_NAME = ?`, index).Scan(&shape); err != nil { + t.Fatalf("read %s shape: %v", index, err) + } + return shape.String +} + +// compSnapRequireReplaced asserts 0071's end state: the all-ascending twin in +// place of idx_comp_snap_issue, and fk_comp_snap_issue as 0042 left it. +func compSnapRequireReplaced(t *testing.T, ctx context.Context, conn *sql.Conn) { + t.Helper() + if got := compSnapIndexShape(t, ctx, conn, "idx_comp_snap_issue"); got != "" { + t.Fatalf("idx_comp_snap_issue = %q after 0071, want it dropped", got) + } + if got := compSnapIndexShape(t, ctx, conn, "idx_comp_snap_issue_asc"); got != compSnapTwinShape { + t.Fatalf("idx_comp_snap_issue_asc = %q after 0071, want %q", got, compSnapTwinShape) + } + var refTable, updateRule, deleteRule string + if err := conn.QueryRowContext(ctx, ` +SELECT REFERENCED_TABLE_NAME, UPDATE_RULE, DELETE_RULE +FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS +WHERE CONSTRAINT_SCHEMA = DATABASE() AND CONSTRAINT_NAME = 'fk_comp_snap_issue'`).Scan(&refTable, &updateRule, &deleteRule); err != nil { + t.Fatalf("read fk_comp_snap_issue: %v", err) + } + if refTable != "issues" || updateRule != "CASCADE" || deleteRule != "CASCADE" { + t.Fatalf("fk_comp_snap_issue references %s ON UPDATE %s ON DELETE %s, want issues ON UPDATE CASCADE ON DELETE CASCADE", refTable, updateRule, deleteRule) + } +} + +// compSnapLatestTitle reads an issue's newest snapshot through the table's +// production reader. +func compSnapLatestTitle(t *testing.T, ctx context.Context, conn *sql.Conn, issueID string) string { + t.Helper() + tx, err := conn.BeginTx(ctx, nil) + if err != nil { + t.Fatalf("begin: %v", err) + } + defer func() { _ = tx.Rollback() }() + snap, err := issueops.GetLatestSnapshotInTx(ctx, tx, issueID) + if err != nil { + t.Fatalf("GetLatestSnapshotInTx(%s): %v", issueID, err) + } + if snap == nil { + t.Fatalf("GetLatestSnapshotInTx(%s) found no snapshot", issueID) + } + return snap.Title +} + +// compSnapDescendingColumns lists every index column in the database that +// information_schema reports as stored descending. +func compSnapDescendingColumns(t *testing.T, ctx context.Context, conn *sql.Conn) []string { + t.Helper() + rows, err := conn.QueryContext(ctx, ` +SELECT TABLE_NAME, INDEX_NAME, COLUMN_NAME +FROM INFORMATION_SCHEMA.STATISTICS +WHERE TABLE_SCHEMA = DATABASE() AND COLLATION = 'D' +ORDER BY TABLE_NAME, INDEX_NAME, SEQ_IN_INDEX`) + if err != nil { + t.Fatalf("read descending index columns: %v", err) + } + defer rows.Close() + var out []string + for rows.Next() { + var table, index, column string + if err := rows.Scan(&table, &index, &column); err != nil { + t.Fatalf("scan descending index column: %v", err) + } + out = append(out, strings.Join([]string{table, index, column}, ".")) + } + if err := rows.Err(); err != nil { + t.Fatalf("read descending index columns: %v", err) + } + return out +} diff --git a/internal/storage/embeddeddolt/version_completeness_behaviour_test.go b/internal/storage/embeddeddolt/version_completeness_behaviour_test.go index 455a196b4..94abe0bc3 100644 --- a/internal/storage/embeddeddolt/version_completeness_behaviour_test.go +++ b/internal/storage/embeddeddolt/version_completeness_behaviour_test.go @@ -309,3 +309,63 @@ func TestEmbeddedGuardedUpdateMintsOnceAfterItsPatches(t *testing.T) { p.revisionMatchesRows(child) p.revisionMatchesRows(parent) } + +// TestEmbeddedFirstMintOnEmptyHistoryIsRevisionOne pins the next-revision +// computation on an issue with no issue_versions rows yet. The ungrouped +// MAX(revision) over the empty primary-key prefix (issue_id = ?) must still +// yield one row so the first mint is revision 1: go-mysql-server's +// aggregate-over-index rewrite (dolthub/go-mysql-server#3907) returns zero rows +// for that shape, which failed every first mint with "sql: no rows in result +// set". The second mint pins that the computation still advances on a +// non-empty prefix, and a second issue's first mint pins that it counts per +// issue: without the issue_id filter it would continue the first issue's +// sequence. +func TestEmbeddedFirstMintOnEmptyHistoryIsRevisionOne(t *testing.T) { + skipUnlessEmbeddedDolt(t) + te := newTestEnv(t, "verfirst") + ctx := t.Context() + p := newVersionProbe(t, te, "verfirst") + + create := func(id string) { + t.Helper() + if err := p.kit.CreateIssue(ctx, &types.Issue{ + ID: id, Title: id, Status: types.StatusOpen, Priority: 2, IssueType: types.TypeTask, + }, "seed"); err != nil { + t.Fatalf("CreateIssue(%s) on empty history: %v", id, err) + } + } + maxRevision := func(id string) int { + t.Helper() + var rev int + if err := p.kit.QueryScalar(ctx, + "SELECT revision FROM issue_versions WHERE issue_id = ? ORDER BY revision DESC LIMIT 1", + []any{id}, &rev); err != nil { + t.Fatalf("read latest revision for %s: %v", id, err) + } + return rev + } + + id := p.kit.IssuePrefix + "-a" + create(id) + if got := maxRevision(id); got != 1 { + t.Fatalf("first mint revision = %d, want 1", got) + } + p.expect("first mint", id, 0, 1) + p.revisionMatchesRows(id) + + if err := te.store.AddLabel(ctx, id, "l1", "actor"); err != nil { + t.Fatalf("AddLabel: %v", err) + } + if got := maxRevision(id); got != 2 { + t.Fatalf("second mint revision = %d, want 2", got) + } + p.revisionMatchesRows(id) + + other := p.kit.IssuePrefix + "-b" + create(other) + if got := maxRevision(other); got != 1 { + t.Fatalf("first mint revision for a second issue = %d, want 1 (revisions count per issue)", got) + } + p.expect("second issue's first mint", other, 0, 1) + p.revisionMatchesRows(other) +} diff --git a/internal/storage/issueops/version_history.go b/internal/storage/issueops/version_history.go index cd2ae2319..8de0e67af 100644 --- a/internal/storage/issueops/version_history.go +++ b/internal/storage/issueops/version_history.go @@ -59,8 +59,8 @@ import ( // steps follow as their own PR. // // "Single writer" means one writer AT A TIME per store, not merely one -// clone. SELECT COALESCE(MAX(revision), 0) + 1 against PRIMARY KEY -// (issue_id, revision) is not a safe allocator for two concurrent +// clone. The MAX(revision) + 1 read against PRIMARY KEY (issue_id, revision) +// in RecordVersionInTx is not a safe allocator for two concurrent // transactions in one store either, and the label and dependency paths are // not serialized on the issue row the way the claim/close CAS is; the // RunDualWrite* contract cases exclude concurrent writers, so no test @@ -371,9 +371,15 @@ func recordVersionInTx(ctx context.Context, tx DBTX, issueID, actor string, isCr return err } + // The scalar-subquery form is deliberate: go-mysql-server's + // aggregate-over-index rewrite (dolthub/go-mysql-server#3907) returns zero + // rows, not one NULL row, for an ungrouped MAX over an empty primary-key + // prefix, so "SELECT COALESCE(MAX(revision), 0) + 1 FROM issue_versions + // WHERE issue_id = ?" fails every first mint. The outer SELECT has no FROM + // and yields exactly one row on every engine. var newRevision int64 if err := tx.QueryRowContext(ctx, - "SELECT COALESCE(MAX(revision), 0) + 1 FROM issue_versions WHERE issue_id = ?", issueID, + "SELECT COALESCE((SELECT MAX(revision) FROM issue_versions WHERE issue_id = ?), 0) + 1", issueID, ).Scan(&newRevision); err != nil { return fmt.Errorf("versioned history: compute next revision for %s: %w", issueID, err) } diff --git a/internal/storage/schema/BUILD.bazel b/internal/storage/schema/BUILD.bazel index 09be66e8f..29aeda875 100644 --- a/internal/storage/schema/BUILD.bazel +++ b/internal/storage/schema/BUILD.bazel @@ -120,6 +120,7 @@ go_library( "migrations/0069_widen_issue_versions_datetime_precision.up.sql", "migrations/ignored/0028_add_wisps_participation_generation.up.sql", "migrations/0070_add_participation_generation.up.sql", + "migrations/0071_replace_descending_compaction_snapshots_index.up.sql", ], importpath = "github.com/steveyegge/beads/internal/storage/schema", visibility = ["//:__subpackages__"], @@ -154,6 +155,7 @@ go_test( "migration_0068_add_attribution_status_test.go", "migration_0069_datetime_precision_test.go", "migration_0070_add_participation_generation_test.go", + "migration_0071_compaction_snapshots_index_test.go", "migration_body_drain_test.go", "migration_freeze_test.go", "migration_watchdog_test.go", diff --git a/internal/storage/schema/cli_migrations.go b/internal/storage/schema/cli_migrations.go index 8b595c17a..32129aaf1 100644 --- a/internal/storage/schema/cli_migrations.go +++ b/internal/storage/schema/cli_migrations.go @@ -18,17 +18,22 @@ package schema // this limitation does not apply. // // Dolt 2.3.0 fixed #11345, and that fix MASKS a missing override here rather -// than removing the need for one: on 2.3.x the CLI executes the prepared +// than removing the need for one: a 2.3.0-or-newer CLI executes the prepared // ALTER, so a bundle that forgot the direct statement still lands the right -// schema and TestCLIBundleMatchesRuntimeCommittedSchema goes green against a -// 2.2.0 sql-server. So every override below must be justified against the -// pre-2.3 behavior, and the string assertions in -// TestAllMigrationsSQLUsesDirectDDLForKnownCLIIncompatibilities — which need -// no Dolt binary at all — are the guard that survives a CLI version bump. +// schema. Run through a 2.3.x CLI, TestCLIBundleMatchesRuntimeCommittedSchema +// went green that way against the then-pinned 2.2.0 sql-server, and with the +// CLI now pinned at 2.4.1 it cannot catch a dropped override on any run +// (probed 2026-10-18: a prepared ADD COLUMN vanishes on the 2.2.0 CLI and +// lands on 2.4.1). So every override below must be justified against the +// pre-2.3 behavior, and the guards that still work need no Dolt binary at +// all: the string assertions in +// TestAllMigrationsSQLUsesDirectDDLForKnownCLIIncompatibilities and +// TestBundleMigrationsWithPreparedALTERAreOverriddenOrJustified +// (cli_prepared_ddl.go). // -// The measurement that check stands in for: run AllMigrationsSQL() through +// The measurement those checks stand in for: run AllMigrationsSQL() through // each CLI and diff information_schema. On 2026-08-21, with 0060's and 0065's -// overrides both in place, dolt 2.1.8, 2.2.0 (the pinned CLI) and 2.3.1 agree +// overrides both in place, dolt 2.1.8, 2.2.0 (the CLI pinned then) and 2.3.1 agree // on all 504 snapshot lines including the wisp_ tables the parity oracle // excludes — so no prepared statement the bundle still carries changes its // committed schema. Before that, 2.3.1 landed three extra columns (0060's @@ -122,7 +127,7 @@ func cliCompatibleMigrationSQL(name, sqlText string) string { // upgraded databases, and the 2.2.x CLI no-ops the prepared ALTER // (measured 2026-08-20: AllMigrationsSQL() through dolt 2.2.0 lands // bd_events_journal WITHOUT actor; 2.3.1 — and 2.2.3, which already - // carries the #11345 fix — land it; CI pins 2.2.0). The table + // carries the #11345 fix — land it; CI pinned 2.2.0 then). The table // itself is always present here: 0064's prepared RENAME executes on // 2.2.0 (same measurement), so a fresh bundle always needs the column. return cliMigration0066AddEventsJournalActor diff --git a/internal/storage/schema/cli_prepared_ddl.go b/internal/storage/schema/cli_prepared_ddl.go index 62a7d997a..92c71a014 100644 --- a/internal/storage/schema/cli_prepared_ddl.go +++ b/internal/storage/schema/cli_prepared_ddl.go @@ -33,9 +33,9 @@ import ( // execute: ALTER COLUMN ... DROP DEFAULT, RENAME COLUMN, ADD/DROP INDEX, // ADD CONSTRAINT (FK and CHECK), CREATE INDEX, RENAME TABLE, CALL // -// Flagging every prepared ALTER TABLE rather than just the first row costs one -// justified inventory entry (0050) and buys not having to guess whether some -// ALTER form nobody probed belongs in the first list. Prepared DML against a +// Flagging every prepared ALTER TABLE rather than just the first row costs two +// justified inventory entries (0050, 0071) and buys not having to guess whether +// some ALTER form nobody probed belongs in the first list. Prepared DML against a // real table vanishes too, but that hazard already has an owner in // scripts/check-migration-hygiene.sh check E, which flags it at source rather // than in the bundle. @@ -234,11 +234,13 @@ func sqlStringLiterals(text string) []string { // cliCompatibleMigrationSQL. That is what 0060 (gastownhall/beads#5903) and // 0065 needed, and neither is listed here. // -// Every entry below was measured on 2026-08-21, not argued: build the bundle -// truncated to just before migration N, snapshot information_schema, apply N's -// frozen text on dolt 2.3.1 (where prepared DDL always executes), and diff. -// 0065's un-overridden text moves that diff, which is what makes the empty -// diffs for the (a) entries mean something. Redo it before adding an entry -- +// Every entry below was measured, not argued. Through 0058 that was on +// 2026-08-21: build the bundle truncated to just before migration N, snapshot +// information_schema, apply N's frozen text on dolt 2.3.1 (where prepared DDL +// always executes), and diff. 0065's un-overridden text moves that diff, which +// is what makes the empty diffs for the (a) entries mean something. 0071 was +// measured on 2026-10-18 by building the whole bundle with dolt 2.1.8 and +// 2.4.1 and comparing the two. Redo the measurement before adding an entry -- // a wrong justification here is invisible to every test in this package. var preparedALTERSafeOnFreshBundle = map[string]string{ "0037_uuid_primary_keys.up.sql": "(a) Rekeys events/comments/issue_snapshots ids only where the column is still " + @@ -262,4 +264,9 @@ var preparedALTERSafeOnFreshBundle = map[string]string{ "0058_heal_wisp_dependencies_split_constraints.up.sql": "(a) Re-adds wisp_dependencies' target FKs and check " + "constraint only where absent; 0021 creates the table with all three. Measured: applying 0058 to the fresh " + "bundle changes nothing.", + "0071_replace_descending_compaction_snapshots_index.up.sql": "(b) Its guards DO fire on a fresh bundle -- 0010 " + + "creates idx_comp_snap_issue -- but the statements are ADD INDEX and DROP INDEX, which execute through the " + + "CLI batch path on 2.1.8 as well as 2.4.1. Measured: the bundles those two CLIs build agree on " + + "compaction_snapshots -- idx_comp_snap_issue_asc with every column ascending, no idx_comp_snap_issue, and " + + "fk_comp_snap_issue still ON DELETE/ON UPDATE CASCADE.", } diff --git a/internal/storage/schema/cli_prepared_ddl_test.go b/internal/storage/schema/cli_prepared_ddl_test.go index c51bbbd87..d607ad6e0 100644 --- a/internal/storage/schema/cli_prepared_ddl_test.go +++ b/internal/storage/schema/cli_prepared_ddl_test.go @@ -33,7 +33,7 @@ func TestBundleMigrationsWithPreparedALTERAreOverriddenOrJustified(t *testing.T) t.Errorf(`%s reaches the CLI fresh bundle with a PREPARE'd ALTER TABLE:%s The Dolt CLI batch path silently no-ops it while EXECUTE reports success -(dolthub/dolt#11345, fixed in 2.3.0 but the CLI is pinned to 2.2.0), so the +(dolthub/dolt#11345, fixed in 2.3.0 but still present in older CLIs), so the bundle would be missing this schema change while the runtime has it. Either register a direct-DDL override for %s in cliCompatibleMigrationSQL diff --git a/internal/storage/schema/migration_0070_add_participation_generation_test.go b/internal/storage/schema/migration_0070_add_participation_generation_test.go index e6d5a7369..9a5b9647f 100644 --- a/internal/storage/schema/migration_0070_add_participation_generation_test.go +++ b/internal/storage/schema/migration_0070_add_participation_generation_test.go @@ -33,21 +33,6 @@ import ( const migration0070Up = "0070_add_participation_generation.up.sql" const migration0070Down = "0070_add_participation_generation.down.sql" -// TestLatestVersionIncludesMigration0070 pins the real next free slot this -// migration claims, superseding 0069's own version of this test -// (LatestVersion() moved from 69 to 70 the moment this migration file was -// added). Deliberately a hardcoded literal for the same reason 0067's, -// 0068's, and 0069's were: LatestVersion() drifting to 70 for the wrong -// reason (an unrelated migration landing first) should still be caught by -// this test failing to explain why 70 is participation_generation-shaped, -// which the CLI test below checks. -func TestLatestVersionIncludesMigration0070(t *testing.T) { - const want = 70 - if got := LatestVersion(); got != want { - t.Fatalf("LatestVersion() = %d, want %d (issues/wisps participation_generation migration slot claimed by be-h89oq)", got, want) - } -} - // TestMigration0070AddsParticipationGeneration is the pure-Go, DB-independent // half of the pin, mirroring TestMigration0069WidensChangeAtAndRemovedAtPrecision's // shape: it checks the frozen migration bytes and the CLI-bundle override diff --git a/internal/storage/schema/migration_0071_compaction_snapshots_index_test.go b/internal/storage/schema/migration_0071_compaction_snapshots_index_test.go new file mode 100644 index 000000000..0f9c17c99 --- /dev/null +++ b/internal/storage/schema/migration_0071_compaction_snapshots_index_test.go @@ -0,0 +1,145 @@ +package schema + +import ( + "os" + "strings" + "testing" + + "github.com/steveyegge/beads/internal/testutil" +) + +// Migration 0071 (gastownhall/beads#7646 review): 0010 declares +// compaction_snapshots' idx_comp_snap_issue with created_at DESC. Dolt 2.3.3 +// and later store that column descending (dolthub/dolt#11746), and Dolt older +// than 2.3.3 cannot decode a table that holds one -- every INSERT and every +// information_schema query fails with "table has unknown fields", which takes +// released bd (Dolt 2.2.0 driver) down on open, past its schema-skew refusal +// and past BD_IGNORE_SCHEMA_SKEW=1. The DESC never helped a query, so 0071 +// replaces the index with the all-ascending twin idx_comp_snap_issue_asc. The +// real-engine half of the pin (guards firing, a resumed pass, a replay, the +// foreign key still cascading) is +// TestEmbeddedMigration0071ReplacesDescendingCompactionSnapshotsIndex in +// internal/storage/embeddeddolt. +const migration0071Up = "0071_replace_descending_compaction_snapshots_index.up.sql" +const migration0071Down = "0071_replace_descending_compaction_snapshots_index.down.sql" + +const migration0071OldIndexGuard = "@comp_snap_has_old_index" +const migration0071TwinIndexGuard = "@comp_snap_has_twin_index" + +// TestLatestVersionIncludesMigration0071 pins the slot this migration claims, +// superseding 0070's version of this test. It is a hardcoded literal for the +// reason 0067's through 0070's were: LatestVersion() reaching 71 because some +// other migration landed there first should fail here, not pass silently. +// Migrations take slots in landing order: gastownhall/beads#6943 landed 0070 +// first, so this one renumbered to 0071, and of two open PRs that both number +// 0071 the second to land renumbers again (versions must stay gap-free, see +// TestAllMigrationsSQLAppliesThroughDoltCLIAndRecordsLatestVersion). +func TestLatestVersionIncludesMigration0071(t *testing.T) { + const want = 71 + if got := LatestVersion(); got != want { + t.Fatalf("LatestVersion() = %d, want %d (compaction_snapshots ascending-index migration slot claimed by gastownhall/beads#7646)", got, want) + } +} + +// TestMigration0071ReplacesDescendingCompactionSnapshotsIndex is the pure-Go +// half of the pin: the frozen-to-be migration bytes, the absence of a CLI +// override, the inventory entry that justifies leaving the prepared DDL in +// the fresh bundle, and the down file. No `dolt` binary required. +func TestMigration0071ReplacesDescendingCompactionSnapshotsIndex(t *testing.T) { + upSQL, err := MigrationSQL(migration0071Up) + if err != nil { + t.Fatalf("MigrationSQL(%s) error = %v, want the migration file to exist", migration0071Up, err) + } + for _, want := range []string{ + // The closing quote pins the twin's column list: no DESC, the + // descending column Dolt older than 2.3.3 cannot read. + "ALTER TABLE compaction_snapshots ADD INDEX idx_comp_snap_issue_asc (issue_id, compaction_level, created_at)'", + "ALTER TABLE compaction_snapshots DROP INDEX idx_comp_snap_issue'", + migration0071OldIndexGuard, + migration0071TwinIndexGuard, + "INFORMATION_SCHEMA.STATISTICS", + } { + if !strings.Contains(upSQL, want) { + t.Errorf("0071 up migration missing %q\nfull SQL:\n%s", want, upSQL) + } + } + if add, drop := strings.Index(upSQL, "ADD INDEX idx_comp_snap_issue_asc"), strings.Index(upSQL, "DROP INDEX idx_comp_snap_issue'"); add < 0 || drop < 0 || add > drop { + t.Error("0071 up migration must add the twin before dropping idx_comp_snap_issue: fk_comp_snap_issue refuses to lose its only issue_id-leading index") + } + if !strings.Contains(strings.ToUpper(upSQL), "PREPARE STMT FROM @SQL") { + t.Error("0071 up migration must keep its guarded PREPARE blocks -- they are what make a resumed pass and a raw .up.sql replay no-ops") + } + + if got := cliCompatibleMigrationSQL(migration0071Up, upSQL); got != upSQL { + t.Error("0071 has no CLI-bundle override: its prepared ADD INDEX and DROP INDEX execute through the dolt CLI batch path, so the bundle must carry the migration text unchanged") + } + if _, ok := preparedALTERSafeOnFreshBundle[migration0071Up]; !ok { + t.Errorf("preparedALTERSafeOnFreshBundle must justify %s's prepared ALTERs staying in the fresh bundle", migration0071Up) + } + if cliSubstituteAssumesWispTables(migration0071Up) { + t.Error("0071 touches only compaction_snapshots, which has no wisps-side twin -- it must not be listed in cliSubstituteAssumesWispTables") + } + + // Only migrations/*.up.sql is //go:embed'd, so the down file is read + // from disk by package-relative path. + downBytes, err := os.ReadFile("migrations/" + migration0071Down) + if err != nil { + t.Fatalf("read %s: %v, want the migration file to exist", migration0071Down, err) + } + downSQL := string(downBytes) + for _, want := range []string{ + "ALTER TABLE compaction_snapshots ADD INDEX idx_comp_snap_issue (issue_id, compaction_level, created_at DESC)'", + "ALTER TABLE compaction_snapshots DROP INDEX idx_comp_snap_issue_asc'", + migration0071OldIndexGuard, + migration0071TwinIndexGuard, + } { + if !strings.Contains(downSQL, want) { + t.Errorf("0071 down migration missing %q\nfull SQL:\n%s", want, downSQL) + } + } + if add, drop := strings.Index(downSQL, "ADD INDEX idx_comp_snap_issue "), strings.Index(downSQL, "DROP INDEX idx_comp_snap_issue_asc"); add < 0 || drop < 0 || add > drop { + t.Error("0071 down migration must restore idx_comp_snap_issue before dropping the twin, for the same foreign-key reason as the up file") + } +} + +// TestMigration0071LeavesNoDescendingIndexThroughDoltCLI builds the fresh +// bundle with the `dolt` on PATH (skipped without one) and reads the result +// from information_schema. On a CLI that persists DESC (2.3.3 and later) this +// is the case 0071 exists for; on an older CLI it shows the prepared ADD and +// DROP INDEX really executed, which is what preparedALTERSafeOnFreshBundle's +// entry claims. +func TestMigration0071LeavesNoDescendingIndexThroughDoltCLI(t *testing.T) { + testutil.RequireDoltBinary(t) + + dir := t.TempDir() + runDoltCommand(t, dir, "init", "--name", "test", "--email", "test@example.com") + runDoltSQL(t, dir, AllMigrationsSQL()) + + rows := queryDoltCSV(t, dir, ` +SELECT index_name AS index_name, column_name AS column_name, collation AS collation +FROM information_schema.statistics +WHERE table_schema = DATABASE() AND table_name = 'compaction_snapshots' +ORDER BY index_name, seq_in_index`) + var twin []string + for _, row := range rows { + switch row["index_name"] { + case "idx_comp_snap_issue": + t.Errorf("idx_comp_snap_issue still exists after the bundle (column %s, collation %s); 0071 must drop it", row["column_name"], row["collation"]) + case "idx_comp_snap_issue_asc": + twin = append(twin, row["column_name"]+":"+row["collation"]) + } + } + if got, want := strings.Join(twin, ","), "issue_id:A,compaction_level:A,created_at:A"; got != want { + t.Errorf("idx_comp_snap_issue_asc columns = %q, want %q", got, want) + } + requireDoltFKRules(t, dir, "fk_comp_snap_issue", "CASCADE", "CASCADE") + + // The fresh schema as a whole: one descending index column anywhere makes + // the database unreadable for Dolt older than 2.3.3, which is the failure + // this migration removes. A new migration that wants DESC has to make that + // trade-off on purpose and change this assertion. + requireDoltNoRows(t, dir, ` +SELECT table_name, index_name, column_name +FROM information_schema.statistics +WHERE table_schema = DATABASE() AND collation = 'D'`, "descending index columns in the fresh schema") +} diff --git a/internal/storage/schema/migrations/0071_replace_descending_compaction_snapshots_index.down.sql b/internal/storage/schema/migrations/0071_replace_descending_compaction_snapshots_index.down.sql new file mode 100644 index 000000000..7a8d0482f --- /dev/null +++ b/internal/storage/schema/migrations/0071_replace_descending_compaction_snapshots_index.down.sql @@ -0,0 +1,38 @@ +-- Reverse of 0071: restore 0010's idx_comp_snap_issue (issue_id, +-- compaction_level, created_at DESC) and drop the ascending twin +-- idx_comp_snap_issue_asc. The order mirrors the up file: fk_comp_snap_issue +-- needs an issue_id-leading index at every step, so the restored index goes +-- in before the twin comes out. +-- +-- On Dolt 2.3.3 and later this brings back the descending storage the up +-- file removes, so Dolt older than 2.3.3 -- and every bd release that links +-- one -- again fails on this database with "table has unknown fields". +-- That is the faithful v70 schema; roll back only as far as the bd and Dolt +-- you then run can read. +-- +-- Guarded on INFORMATION_SCHEMA.STATISTICS like the up file, so a store that +-- never took 0071, or was already rolled back, no-ops. Only +-- migrations/*.up.sql is embedded into the CLI fresh bundle, so the PREPARE +-- hazard (cli_prepared_ddl.go) never reaches this file. +SET @comp_snap_has_old_index = ( + SELECT IF(COUNT(*) > 0, 1, 0) + FROM INFORMATION_SCHEMA.STATISTICS + WHERE TABLE_SCHEMA = DATABASE() + AND TABLE_NAME = 'compaction_snapshots' + AND INDEX_NAME = 'idx_comp_snap_issue' +); +SET @comp_snap_has_twin_index = ( + SELECT IF(COUNT(*) > 0, 1, 0) + FROM INFORMATION_SCHEMA.STATISTICS + WHERE TABLE_SCHEMA = DATABASE() + AND TABLE_NAME = 'compaction_snapshots' + AND INDEX_NAME = 'idx_comp_snap_issue_asc' +); +SET @sql = IF(@comp_snap_has_twin_index = 1 AND @comp_snap_has_old_index = 0, + 'ALTER TABLE compaction_snapshots ADD INDEX idx_comp_snap_issue (issue_id, compaction_level, created_at DESC)', + 'SELECT 1'); +PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt; +SET @sql = IF(@comp_snap_has_twin_index = 1, + 'ALTER TABLE compaction_snapshots DROP INDEX idx_comp_snap_issue_asc', + 'SELECT 1'); +PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt; diff --git a/internal/storage/schema/migrations/0071_replace_descending_compaction_snapshots_index.up.sql b/internal/storage/schema/migrations/0071_replace_descending_compaction_snapshots_index.up.sql new file mode 100644 index 000000000..e6062dfe6 --- /dev/null +++ b/internal/storage/schema/migrations/0071_replace_descending_compaction_snapshots_index.up.sql @@ -0,0 +1,83 @@ +-- Migration 0071: replace compaction_snapshots' idx_comp_snap_issue +-- (issue_id, compaction_level, created_at DESC), which 0010 declares, with +-- the ascending twin idx_comp_snap_issue_asc (issue_id, compaction_level, +-- created_at). +-- +-- Dolt 2.3.3 and later store a descending index column as descending +-- (dolthub/dolt#11746); earlier releases parsed the DESC and stored the +-- column ascending. bd's embedded engine is Dolt 2.4.1, so a database it +-- creates holds 0010's created_at DESC for real, and Dolt older than 2.3.3 +-- cannot decode that table's schema: a plain INSERT into any table, and any +-- information_schema query, fails with "table has unknown fields". Released +-- bd (v1.3.x links a Dolt 2.2.0 driver) hits that engine error on open +-- instead of its structured schema-skew refusal, and BD_IGNORE_SCHEMA_SKEW=1 +-- does not get past it. The same goes for a database whose schema a dolt +-- sql-server 2.3.3 or newer created, whatever the bd version. +-- +-- What 0071 cannot reach is history. bd init commits each migration on its +-- own, so on a database created by Dolt 2.3.3 or later the commits from +-- 0010's through 0070's still hold the descending column. Dolt older than +-- 2.3.3 fails the same way reading compaction_snapshots at one of them (AS +-- OF, dolt_history_compaction_snapshots, dolt_diff_compaction_snapshots) and +-- on any dolt diff with one as an endpoint. Reads and writes at the current +-- root, other tables' AS OF and dolt_history_ reads, dolt log, push, clone +-- and pull all work (measured with dolt 2.1.8 and 2.2.0 on 2026-10-18). +-- +-- The DESC buys nothing. The table's one reader, GetLatestSnapshotInTx +-- (internal/storage/issueops/compaction.go), filters on issue_id alone and +-- orders by created_at DESC LIMIT 1; compaction_level sits between the two in +-- the index, so the index cannot supply that order in either direction and +-- the plan is the same TopN over an indexed lookup with or without the DESC. +-- An index declared with no explicit order carries no order vectors, so +-- every Dolt release can read the twin. +-- +-- 0010 is frozen (scripts/check-migration-hygiene.sh check C), hence a new +-- migration. Two shapes that look simpler fail on dolt 2.4.1: +-- * Dropping idx_comp_snap_issue first, or swapping it in one ALTER, +-- fails with "cannot drop index: idx_comp_snap_issue is used by foreign +-- key fk_comp_snap_issue" -- the twin must exist before the drop, and +-- Dolt then backs the foreign key with it. +-- * Renaming the twin back to idx_comp_snap_issue fails at commit: +-- "foreign key fk_comp_snap_issue has entered an invalid state". The +-- new name stays; nothing reads the index by name. +-- +-- DDL is not transactional (migrations/README.md), so each step is guarded +-- on INFORMATION_SCHEMA.STATISTICS the way 0042 guards its foreign-key swap. +-- Run again after a pass killed between the two steps, the file skips the +-- add and does the drop, and a replay onto a store that already took this +-- migration is a no-op (internal/storage/dolt's pr4107 replay harness +-- requires that of every migration >= 0046). A missing table holds neither +-- index, so both guards take the SELECT 1 branch. +-- +-- The guards key on the index name, not on whether created_at is stored +-- descending. A database Dolt older than 2.3.3 created holds an ascending +-- idx_comp_snap_issue, and replacing that one too keeps every clone on one +-- schema, so a later merge between clones never meets two index sets. +-- +-- No CLI-bundle override: both prepared forms here, ALTER TABLE ... ADD +-- INDEX and ... DROP INDEX, execute through the dolt CLI batch path on 2.1.8 +-- as well as 2.4.1 (measured; see preparedALTERSafeOnFreshBundle in +-- cli_prepared_ddl.go). compaction_snapshots replicates -- it is main-plane, +-- not clone-local -- so there is no ignored twin either. +SET @comp_snap_has_old_index = ( + SELECT IF(COUNT(*) > 0, 1, 0) + FROM INFORMATION_SCHEMA.STATISTICS + WHERE TABLE_SCHEMA = DATABASE() + AND TABLE_NAME = 'compaction_snapshots' + AND INDEX_NAME = 'idx_comp_snap_issue' +); +SET @comp_snap_has_twin_index = ( + SELECT IF(COUNT(*) > 0, 1, 0) + FROM INFORMATION_SCHEMA.STATISTICS + WHERE TABLE_SCHEMA = DATABASE() + AND TABLE_NAME = 'compaction_snapshots' + AND INDEX_NAME = 'idx_comp_snap_issue_asc' +); +SET @sql = IF(@comp_snap_has_old_index = 1 AND @comp_snap_has_twin_index = 0, + 'ALTER TABLE compaction_snapshots ADD INDEX idx_comp_snap_issue_asc (issue_id, compaction_level, created_at)', + 'SELECT 1'); +PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt; +SET @sql = IF(@comp_snap_has_old_index = 1, + 'ALTER TABLE compaction_snapshots DROP INDEX idx_comp_snap_issue', + 'SELECT 1'); +PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt; diff --git a/internal/testutil/localdoltserver.go b/internal/testutil/localdoltserver.go index 8b7fd5c7f..8bd4e1b4f 100644 --- a/internal/testutil/localdoltserver.go +++ b/internal/testutil/localdoltserver.go @@ -369,9 +369,9 @@ func (s *localDoltServer) waitReady(port int, done chan struct{}, logStart int64 select { case <-done: tail := s.logSince(logStart) - // dolt 2.2.0 checks the port itself ("Port N already in use."); - // a bind that loses the race after that check reports the - // kernel's "address already in use". + // dolt checks the port itself ("Port N already in use.", on + // 2.2.0 and 2.4.1); a bind that loses the race after that check + // reports the kernel's "address already in use". if strings.Contains(tail, "already in use") { return fmt.Errorf("%w: port %d: %s", errLocalServerBind, port, tail) } diff --git a/internal/testutil/localdoltserver_test.go b/internal/testutil/localdoltserver_test.go index b56ade483..b0161441f 100644 --- a/internal/testutil/localdoltserver_test.go +++ b/internal/testutil/localdoltserver_test.go @@ -61,7 +61,7 @@ var wantServerFingerprint = serverFingerprint{ CurrentUser: "root@%", Version: "8.0.31", MaxConns: "151", - SQLMode: "NO_ENGINE_SUBSTITUTION,ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES", + SQLMode: "ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION", SystemTZ: "UTC", TimeZone: "SYSTEM", Autocommit: "1", diff --git a/internal/testutil/testdoltcommon.go b/internal/testutil/testdoltcommon.go index 3b8c0a959..f699aaef9 100644 --- a/internal/testutil/testdoltcommon.go +++ b/internal/testutil/testdoltcommon.go @@ -13,7 +13,7 @@ import ( ) // DoltDockerImage is the Docker image used for Dolt test containers. -const DoltDockerImage = "dolthub/dolt-sql-server:2.2.0" +const DoltDockerImage = "dolthub/dolt-sql-server:2.4.1" // EnvRequireDoltContainer, set to "1", turns an unavailable Dolt test server // (either backend, see BEADS_TEST_DOLT_SERVER) into a failure instead of a diff --git a/internal/ui/BUILD.bazel b/internal/ui/BUILD.bazel index 78e070e78..2dadb0855 100644 --- a/internal/ui/BUILD.bazel +++ b/internal/ui/BUILD.bazel @@ -20,6 +20,7 @@ go_library( go_test( name = "ui_test", srcs = [ + "init_cost_test.go", "pager_test.go", "sanitize_test.go", "styles_test.go", @@ -27,6 +28,7 @@ go_test( ], embed = [":ui"], deps = [ + "//internal/testutil/bazeltest", "//internal/types", "@land_charm_lipgloss_v2//:lipgloss", ], diff --git a/internal/ui/init_cost_test.go b/internal/ui/init_cost_test.go new file mode 100644 index 000000000..2e341d613 --- /dev/null +++ b/internal/ui/init_cost_test.go @@ -0,0 +1,86 @@ +package ui + +import ( + "os" + "os/exec" + "regexp" + "strconv" + "strings" + "testing" + + "github.com/steveyegge/beads/internal/testutil/bazeltest" +) + +// initClockBudgetMS bounds the init of any one package this test binary links, +// taken as the fastest of initTraceRuns process starts so that a scheduling +// stall in one start cannot fail the test. The starts run with GOGC=off: a +// garbage collection that happens to start inside one package's init (on a +// host with many Ps its stop-the-world alone can take several ms) would +// otherwise be billed to that package. Every package here is in bd's terminal +// rendering stack, and every bd command pays its init before main runs, +// whatever the command does. Today each one takes well under 1 ms, about 1 ms +// under the race detector. +const ( + initClockBudgetMS = 10.0 + initTraceRuns = 3 +) + +// initTraceLine matches one GODEBUG=inittrace=1 line, as documented by the +// runtime package: "init @ ms, ms clock, bytes, allocs". +var initTraceLine = regexp.MustCompile(`^init (\S+) @[0-9.]+ ms, ([0-9.]+) ms clock`) + +// TestTerminalStackPackageInitStaysUnderBudget pins the startup cost of the +// packages behind bd's terminal rendering (lipgloss, charmbracelet/x/ansi, +// go-runewidth and what they import). go-runewidth v0.0.26 and v0.0.27 +// filled a 2 MB width table eagerly in init, which added about 35 ms to every +// bd command (mattn/go-runewidth#104, fixed in v0.0.28). A dependency bump that +// brings init work like that back fails here, naming the package. +func TestTerminalStackPackageInitStaysUnderBudget(t *testing.T) { + best := map[string]float64{} + for range initTraceRuns { + cmd := exec.Command(os.Args[0], "-test.run=^$") //nolint:gosec // test binary re-exec + cmd.Env = append(bazeltest.ShardFreeEnv(os.Environ()), + "GODEBUG="+appendSetting(os.Getenv("GODEBUG"), ",", "inittrace=1"), + "GOGC=off", + // A -race build otherwise sleeps 1 s at exit; the child runs no test. + "GORACE="+appendSetting(os.Getenv("GORACE"), " ", "atexit_sleep_ms=0")) + out, err := cmd.CombinedOutput() + if err != nil { + t.Fatalf("re-exec %s with GODEBUG inittrace: %v\n%s", os.Args[0], err, out) + } + traced := 0 + for line := range strings.SplitSeq(string(out), "\n") { + m := initTraceLine.FindStringSubmatch(strings.TrimSpace(line)) + if m == nil { + continue + } + traced++ + ms, err := strconv.ParseFloat(m[2], 64) + if err != nil { + t.Fatalf("parse init clock in %q: %v", line, err) + } + if prev, ok := best[m[1]]; !ok || ms < prev { + best[m[1]] = ms + } + } + if traced == 0 { + t.Fatalf("re-exec printed no inittrace lines, so nothing was measured:\n%s", out) + } + } + for pkg, ms := range best { + if ms > initClockBudgetMS { + t.Errorf("package %s spends %.2f ms in init (fastest of %d starts), over the %.0f ms budget; every bd command pays it before main runs", + pkg, ms, initTraceRuns, initClockBudgetMS) + } + } +} + +// appendSetting adds setting to an environment value that holds a list of +// settings joined by sep (GODEBUG uses commas, GORACE spaces), keeping the +// settings already there. +func appendSetting(value, sep, setting string) string { + if value == "" { + return setting + } + return value + sep + setting +} diff --git a/scripts/ci/install-dolt.sh b/scripts/ci/install-dolt.sh index 057ba79ac..2b116d40a 100755 --- a/scripts/ci/install-dolt.sh +++ b/scripts/ci/install-dolt.sh @@ -23,7 +23,19 @@ set -euo pipefail # releases/latest moved to 2.3.x, and it also puts bd dolt compact/flatten # and the #4566 fresh-bootstrap heal at risk on 2.3.x. Raise this pin only # once a Dolt release is confirmed clean by that same measurement. -readonly version="2.2.0" +# +# 2.4.1 is that release. Measured 2026-10-10 the same way: 2.3.1 8/150 broken +# (the positive control, so the method still reproduces the regression), +# 2.4.1 0/250 over two runs, and the embedded engine via driver v2.4.1 0/60. +# The pin must also track the driver in go.mod, so the CLI and the container +# run the engine embedded mode links. Releases before 2.4.0 drop a join +# condition when an ON clause has an OR over indexed columns +# (dolthub/dolt#11886). Releases before 2.3.3 cannot read a descending index +# column ("table has unknown fields"); migration 0071 removed the one bd's +# schema declared, so dolt 2.1.8 and 2.2.0 read and write the current root of +# a database the 2.4.1 engine created, but its commits from before 0071 still +# hold it (docs/architecture/dolt.md, "Which Dolt version to install"). +readonly version="2.4.1" readonly max_attempts=3 readonly retry_delay_seconds=5 @@ -71,8 +83,8 @@ sudo install -m 0755 "$workdir/dolt-${os}-${arch}/bin/dolt" /usr/local/bin/dolt # Fail loudly if PATH resolves to some other dolt: a stale runner-image copy # earlier on PATH would silently put the suite back on an unpinned binary. # No `| head` here: pipefail turns dolt's SIGPIPE into a failed install. -# Compare the version token exactly rather than as a substring: `*"2.2.0"*` -# also matches 12.2.0 and 2.2.0-rc1, so a substring test would wave through +# Compare the version token exactly rather than as a substring: `*"2.4.1"*` +# also matches 12.4.1 and 2.4.1-rc1, so a substring test would wave through # releases the pin exists to keep out. installed="$(dolt version)" installed="${installed%%$'\n'*}" diff --git a/scripts/ci/pull-dolt-image.sh b/scripts/ci/pull-dolt-image.sh index 059bfcd92..ff1bf1fc5 100755 --- a/scripts/ci/pull-dolt-image.sh +++ b/scripts/ci/pull-dolt-image.sh @@ -2,7 +2,7 @@ set -euo pipefail # Keep this tag in sync with internal/testutil/testdoltcommon.go:DoltDockerImage. -readonly image="dolthub/dolt-sql-server:2.2.0" +readonly image="dolthub/dolt-sql-server:2.4.1" readonly max_attempts=3 readonly retry_delay_seconds=5 diff --git a/scripts/install_dolt_test.go b/scripts/install_dolt_test.go index 654632ec6..a586411ac 100644 --- a/scripts/install_dolt_test.go +++ b/scripts/install_dolt_test.go @@ -12,7 +12,7 @@ import ( // pinnedDoltCLIVersion is the version scripts/ci/install-dolt.sh pins. // TestPinnedDoltCLIMatchesContainerImage guards the pin itself; this file only // needs a value the fake dolt can report back so the drift guard is exercised. -const pinnedDoltCLIVersion = "2.2.0" +const pinnedDoltCLIVersion = "2.4.1" // TestInstallDoltPropagatesDownloadFailure is the regression net for a download // that never succeeds exiting 0. The script's whole purpose is keeping CI off an @@ -70,11 +70,11 @@ func TestInstallDoltPropagatesDownloadFailure(t *testing.T) { wantInstalls: 1, }, { - // A substring drift guard would wave this through: "12.2.0" - // contains "2.2.0". + // A substring drift guard would wave this through: "12.4.1" + // contains "2.4.1". name: "installed version merely contains the pin", curlFailures: 0, - reportedVersion: "12.2.0", + reportedVersion: "12.4.1", wantExit: 1, wantCurls: 1, wantSleeps: 0, diff --git a/scripts/repo_helpers_test.go b/scripts/repo_helpers_test.go index f01b8abdf..6b954bbe1 100644 --- a/scripts/repo_helpers_test.go +++ b/scripts/repo_helpers_test.go @@ -187,4 +187,4 @@ func exits(body *ast.BlockStmt) bool { return false } -const doltSQLServerImage = "dolthub/dolt-sql-server:2.2.0" +const doltSQLServerImage = "dolthub/dolt-sql-server:2.4.1" diff --git a/scripts/test-git-remote.sh b/scripts/test-git-remote.sh index c46d798bd..0f12d51e5 100755 --- a/scripts/test-git-remote.sh +++ b/scripts/test-git-remote.sh @@ -8,7 +8,14 @@ # ./scripts/test-git-remote.sh # Local bare git repo (default) # ./scripts/test-git-remote.sh # Push to real GitHub repo # -# Requirements: bd, dolt (>= 2.2.0), git +# Requirements: bd, dolt (>= 2.2.0; 2.4.1, the pinned release, recommended), git +# +# 2.2.0 is enough even when bd links the Dolt 2.4.1 engine: migration 0071 +# replaced the descending index column Dolt older than 2.3.3 cannot read, and +# push, clone, pull and reads at the current root never decode the older +# commits that still hold it. Measured 2026-10-18: dolt 2.2.0 writes, pushes, +# clones and pulls a database `bd init` migrated to schema version 71; with +# 0071 reverted it fails with "table has unknown fields". # # The script is self-contained: creates temp dirs, cleans up on exit. diff --git a/tools/bazel/dolt.bzl b/tools/bazel/dolt.bzl index 13b1f884c..99e20d74c 100644 --- a/tools/bazel/dolt.bzl +++ b/tools/bazel/dolt.bzl @@ -10,7 +10,7 @@ MODULE.bazel declares one repository per platform (dolt__); only the one selected by //tools/bazel:dolt for the execution platform is fetched. """ -DOLT_VERSION = "2.2.0" +DOLT_VERSION = "2.4.1" # sha256 of the upstream release tarballs dolt--.tar.gz, keyed by # version so that bumping DOLT_VERSION without adding its digests fails instead @@ -18,6 +18,12 @@ DOLT_VERSION = "2.2.0" # sha256 alone). They match the asset digests GitHub reports for the release # (`gh api repos/dolthub/dolt/releases/tags/v`). DOLT_SHA256 = { + "2.4.1": { + "darwin-amd64": "ae8757e403ed54c5a27d7b318d6e460660a2eb29aa7aedb2d8951dbe77952384", + "darwin-arm64": "1ac9b69165de774fff83eb2912f52e73167276e37ebad97b89663a5a0146bbda", + "linux-amd64": "85edfe4d307cc75d336be5c30c7601d6eaddb209b08dddf104db32979a00bdc6", + "linux-arm64": "4ec68affe22be060f008ff7135b33362a46befefc26a76df3258c82fbc9bd107", + }, # The migration corpus's external Dolt runtime (DOLT_TEST_RUNTIME_VERSION # and _SHA256 in scripts/migration-test/lib/versions.sh), linux/amd64 # only: @dolt_test_runtime_linux_amd64 in MODULE.bazel. diff --git a/tools/nogo/go.mod b/tools/nogo/go.mod index 936b993ad..0296d907c 100644 --- a/tools/nogo/go.mod +++ b/tools/nogo/go.mod @@ -10,7 +10,7 @@ require ( github.com/kisielk/errcheck v1.9.0 github.com/securego/gosec/v2 v2.23.0 go-simpler.org/sloglint v0.11.1 - golang.org/x/mod v0.40.0 + golang.org/x/mod v0.41.0 golang.org/x/tools v0.49.0 gopkg.in/yaml.v3 v3.0.1 mvdan.cc/unparam v0.0.0-20251027182757-5beb8c8f8f15 @@ -21,6 +21,6 @@ require ( github.com/ettle/strcase v0.2.0 // indirect github.com/gobwas/glob v0.2.3 // indirect github.com/google/go-cmp v0.7.0 // indirect - golang.org/x/sync v0.23.0 // indirect - golang.org/x/text v0.41.0 // indirect + golang.org/x/sync v0.24.0 // indirect + golang.org/x/text v0.42.0 // indirect ) diff --git a/tools/nogo/go.sum b/tools/nogo/go.sum index c54a38928..7b9f01e6c 100644 --- a/tools/nogo/go.sum +++ b/tools/nogo/go.sum @@ -40,16 +40,16 @@ go-simpler.org/sloglint v0.11.1 h1:xRbPepLT/MHPTCA6TS/wNfZrDzkGvCCqUv4Bdwc3H7s= go-simpler.org/sloglint v0.11.1/go.mod h1:2PowwiCOK8mjiF+0KGifVOT8ZsCNiFzvfyJeJOIt8MQ= go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -golang.org/x/mod v0.40.0 h1:hUv+3cXcdRHz08UmSiOob7sadHig73uo5bkXxQ/tvUs= -golang.org/x/mod v0.40.0/go.mod h1:0/weTWkPWGBikyTWAX3dkjVztMmBA5hM0DH6BElSupE= +golang.org/x/mod v0.41.0 h1:qJmnOUb4YB+FsEuM3HcWucdZASCPGhsX6uljO6pog0c= +golang.org/x/mod v0.41.0/go.mod h1:Ek9pY8RKWXwsWvd3rQiHYtMqkjSUV+s1Rj7j4H5Ur6o= golang.org/x/net v0.58.0 h1:ynWG7rqYi4ccpTEuPZ2QGWHktVEM9DMCj9yzDE0Q7To= golang.org/x/net v0.58.0/go.mod h1:YwCddHnFlT7eLQqVprV19OnhLGtc5xOKgE0RyqgfWAU= -golang.org/x/sync v0.23.0 h1:KameEIfc1IkluZyXWLn39Wd4tURc6GbCiISGiZm2bQk= -golang.org/x/sync v0.23.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0= +golang.org/x/sync v0.24.0 h1:iqiDrGoDgyuvAKrhLQthUEzU/R378N78gXbBjxed7oA= +golang.org/x/sync v0.24.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0= golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= -golang.org/x/text v0.41.0 h1:vz/seA0lnX87Othu2f/0L24RcgrXD9/YFTSuGjj3rH8= -golang.org/x/text v0.41.0/go.mod h1:jvf1O8ajNzZqhSrQBPbutR/EB83Cc0CFrezNQIwbb5M= +golang.org/x/text v0.42.0 h1:JbOZXgfeCPU9gacVtYliJqOhD+zhrEqK4LfdpmlUZqI= +golang.org/x/text v0.42.0/go.mod h1:ojzP1Z+2QtioaF8DTtO8K5q7JWVVYwZKenzujK0Zd0E= golang.org/x/tools v0.49.0 h1:3NI7VXzL9+1WZD52Dx2ttoPwD5DWrFGpl9mFZDlmisI= golang.org/x/tools v0.49.0/go.mod h1:SJNXV9DBKT0UbdttsQjbfJlAE/q+y36++zo3uL3N0Oo= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=