Merge pull request #152522 from yuzefovich/blathers/backport-release-25.3-152476

release-25.3: sql: prohibit CITEXT as column type in 25.2-25.3 mixed version state

Author: yuzefovich

pkg/sql/catalog/colinfo/BUILD.bazel

@@ -16,11 +16,13 @@ go_library(
     importpath = "github.com/cockroachdb/cockroach/pkg/sql/catalog/colinfo",
     visibility = ["//visibility:public"],
     deps = [
+        "//pkg/clusterversion",
         "//pkg/docs",
         "//pkg/settings/cluster",
         "//pkg/sql/catalog",
         "//pkg/sql/catalog/catpb",
         "//pkg/sql/catalog/descpb",
+        "//pkg/sql/oidext",
         "//pkg/sql/pgwire/pgcode",
         "//pkg/sql/pgwire/pgerror",
         "//pkg/sql/sem/catconstants",

pkg/sql/catalog/colinfo/col_type_info.go

@@ -9,9 +9,11 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/cockroachdb/cockroach/pkg/clusterversion"
 	"github.com/cockroachdb/cockroach/pkg/docs"
 	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog"
+	"github.com/cockroachdb/cockroach/pkg/sql/oidext"
 	"github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgcode"
 	"github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgerror"
 	"github.com/cockroachdb/cockroach/pkg/sql/sem/idxtype"
@@ -71,6 +73,14 @@ func (ti ColTypeInfo) Type(idx int) *types.T {
 func ValidateColumnDefType(ctx context.Context, st *cluster.Settings, t *types.T) error {
 	switch t.Family() {
 	case types.StringFamily, types.CollatedStringFamily:
+		if t.Oid() == oidext.T_citext {
+			if !st.Version.IsActive(ctx, clusterversion.V25_3) {
+				return pgerror.Newf(
+					pgcode.FeatureNotSupported,
+					"citext not supported until version 25.3",
+				)
+			}
+		}
 		if t.Family() == types.CollatedStringFamily {
 			if _, err := language.Parse(t.Locale()); err != nil {
 				return pgerror.Newf(pgcode.Syntax, `invalid locale %s`, t.Locale())

pkg/sql/logictest/testdata/logic_test/mixed_version_citext

@@ -0,0 +1,49 @@
+# LogicTest: cockroach-go-testserver-25.2
+
+# Sanity check that CITEXT type is only allowed to be used once the cluster is
+# upgraded to 25.3.
+
+statement error pgcode 42704 type \"citext\" does not exist
+CREATE TABLE c (c CITEXT);
+
+statement error pgcode 42704 type \"citext\" does not exist
+CREATE TABLE ca (ca CITEXT[]);
+
+statement error pgcode 42704 type \"citext\" does not exist
+SELECT 'A'::CITEXT
+
+statement error pgcode 42704 type \"citext\" does not exist
+SELECT ARRAY['A', 'B']::CITEXT[]
+
+upgrade 0
+
+statement error pgcode 0A000 citext not supported until version 25.3
+CREATE TABLE c (c CITEXT);
+
+statement error pgcode 0A000 citext not supported until version 25.3
+CREATE TABLE ca (ca CITEXT[]);
+
+statement error pgcode 0A000 citext not supported until version 25.3
+SELECT 'A'::CITEXT
+
+statement error pgcode 0A000 citext\[\] not supported until version 25.3
+SELECT ARRAY['A', 'B']::CITEXT[]
+
+upgrade 1
+
+upgrade 2
+
+statement ok
+SET CLUSTER SETTING version = crdb_internal.node_executable_version()
+
+statement ok
+CREATE TABLE c (c CITEXT);
+
+statement ok
+CREATE TABLE ca (ca CITEXT[]);
+
+statement ok
+SELECT 'A'::CITEXT
+
+statement ok
+SELECT ARRAY['A', 'B']::CITEXT[]

pkg/sql/logictest/tests/cockroach-go-testserver-25.2/BUILD.bazel

@@ -11,7 +11,7 @@ go_test(
         "//pkg/sql/logictest:testdata",  # keep
     ],
     exec_properties = {"test.Pool": "heavy"},
-    shard_count = 8,
+    shard_count = 9,
     tags = ["cpu:3"],
     deps = [
         "//pkg/base",

pkg/sql/logictest/tests/cockroach-go-testserver-25.2/generated_test.go

@@ -100,6 +100,7 @@ go_test(
         "//pkg/sql/execinfrapb",
         "//pkg/sql/isql",
         "//pkg/sql/lexbase",
+        "//pkg/sql/oidext",
         "//pkg/sql/parser",
         "//pkg/sql/physicalplan",
         "//pkg/sql/randgen",

pkg/sql/ttl/ttljob/BUILD.bazel

@@ -28,6 +28,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/colinfo"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/desctestutils"
 	"github.com/cockroachdb/cockroach/pkg/sql/lexbase"
+	"github.com/cockroachdb/cockroach/pkg/sql/oidext"
 	"github.com/cockroachdb/cockroach/pkg/sql/parser"
 	"github.com/cockroachdb/cockroach/pkg/sql/randgen"
 	"github.com/cockroachdb/cockroach/pkg/sql/sem/tree"
@@ -605,11 +606,24 @@ func TestRowLevelTTLJobRandomEntries(t *testing.T) {
 	collatedStringType := types.MakeCollatedString(types.String, "en" /* locale */)
 	var indexableTyps []*types.T
 	for _, typ := range append(types.Scalar, collatedStringType) {
+		if !colinfo.ColumnTypeIsIndexable(typ) {
+			continue
+		}
+		switch typ.Family() {
+		case types.DateFamily:
 		// TODO(#76419): DateFamily has a broken `-infinity` case.
-		// TODO(#99432): JsonFamily has broken cases. This is because the test is wrapping JSON
-		//   objects in multiple single quotes which causes parsing errors.
-		if colinfo.ColumnTypeIsIndexable(typ) && typ.Family() != types.DateFamily &&
-			typ.Family() != types.JsonFamily {
+		case types.JsonFamily:
+		// TODO(#99432): JsonFamily has broken cases. This is because the
+		// test is wrapping JSON objects in multiple single quotes which
+		// causes parsing errors.
+		case types.CollatedStringFamily:
+			if typ.Oid() != oidext.T_citext && typ.Oid() != oidext.T__citext {
+				// TODO(foundations): CITEXT should only be prohibited when
+				// running with mixed 25.2 version where the type is not
+				// supported.
+				indexableTyps = append(indexableTyps, typ)
+			}
+		default:
 			indexableTyps = append(indexableTyps, typ)
 		}
 	}