Merge pull request #150626 from cockroachdb/blathers/backport-release-25.3-150593

yuzefovich · web-flow · commit b4abfb45820f · 2025-07-28T08:26:43.000-07:00
release-25.3: sql: remove citext from versions previous to 25.3
diff --git a/pkg/sql/logictest/testdata/logic_test/citext b/pkg/sql/logictest/testdata/logic_test/citext
@@ -1,3 +1,5 @@
+# LogicTest: !local-mixed-25.2
+
 query T
 SELECT pg_typeof(CITEXT 'Foo')
 ----
diff --git a/pkg/sql/logictest/tests/local-mixed-25.2/generated_test.go b/pkg/sql/logictest/tests/local-mixed-25.2/generated_test.go
diff --git a/pkg/sql/sem/eval/unsupported_types.go b/pkg/sql/sem/eval/unsupported_types.go
@@ -52,5 +52,11 @@ func (tc *unsupportedTypeChecker) CheckType(ctx context.Context, typ *types.T) e
 			"%s not supported until version 25.2", typ.String(),
 		)
 	}
+	if (typ.Oid() == oidext.T_citext || typ.Oid() == oidext.T__citext) &&
+		!tc.version.IsActive(ctx, clusterversion.V25_3) {
+		return pgerror.Newf(pgcode.FeatureNotSupported,
+			"%s not supported until version 25.3", typ.String(),
+		)
+	}
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -52,5 +52,11 @@ func (tc unsupportedTypeChecker) CheckType(ctx context.Context, typ types.T) e`
`52`	`52`	`"%s not supported until version 25.2", typ.String(),`
`53`	`53`	`)`
`54`	`54`	`}`
	`55`	`+ if (typ.Oid() == oidext.T_citext \|\| typ.Oid() == oidext.T__citext) &&`
	`56`	`+ !tc.version.IsActive(ctx, clusterversion.V25_3) {`
	`57`	`+ return pgerror.Newf(pgcode.FeatureNotSupported,`
	`58`	`+ "%s not supported until version 25.3", typ.String(),`
	`59`	`+ )`
	`60`	`+ }`
`55`	`61`	`return nil`
`56`	`62`	`}`