From 9f8b923093f8125603b20bd05a77d82883dde78a Mon Sep 17 00:00:00 2001 From: Radu Berinde Date: Fri, 15 Nov 2024 06:22:08 -0800 Subject: [PATCH] schemachanger: switch check to V25_1 --- pkg/cmd/release/update_releases.go | 2 +- .../internal/scbuildstmt/alter_table_alter_column_type.go | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/cmd/release/update_releases.go b/pkg/cmd/release/update_releases.go index cfcbbc7e46b6..de22b38861fd 100644 --- a/pkg/cmd/release/update_releases.go +++ b/pkg/cmd/release/update_releases.go @@ -340,7 +340,7 @@ func generateRepositoriesFile(versions ...string) error { return fmt.Errorf("could not download cockroach release: %w", err) } if resp.StatusCode != http.StatusOK { - return fmt.Errorf("unexpected status code %d when downloading %s; consider turning off NetSkope", resp.StatusCode, url) + return fmt.Errorf("unexpected status code %d when downloading %s", resp.StatusCode, url) } var blob bytes.Buffer if _, err := io.Copy(&blob, resp.Body); err != nil { diff --git a/pkg/sql/schemachanger/scbuild/internal/scbuildstmt/alter_table_alter_column_type.go b/pkg/sql/schemachanger/scbuild/internal/scbuildstmt/alter_table_alter_column_type.go index a34de65a447c..7d9879944594 100644 --- a/pkg/sql/schemachanger/scbuild/internal/scbuildstmt/alter_table_alter_column_type.go +++ b/pkg/sql/schemachanger/scbuild/internal/scbuildstmt/alter_table_alter_column_type.go @@ -270,8 +270,7 @@ func handleGeneralColumnConversion( // general path works. Without these rules, we encounter failures during the // ALTER operation. To avoid this, we revert to legacy handling if not running // on version 25.1. - // TODO(25.1): Update V24_3 here once V25_1 is defined. - if !b.EvalCtx().Settings.Version.ActiveVersion(b).IsActive(clusterversion.V24_3) { + if !b.EvalCtx().Settings.Version.ActiveVersion(b).IsActive(clusterversion.V25_1) { panic(scerrors.NotImplementedErrorf(t, "old active version; ALTER COLUMN TYPE requires backfill. Reverting to legacy handling")) }