Skip to content

release-25.2: sql/catalog: exempt views from crdb_region validation #152679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 2, 2025
Merged

release-25.2: sql/catalog: exempt views from crdb_region validation #152679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions pkg/ccl/logictestccl/testdata/logic_test/multi_region
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1659,4 +1659,29 @@ SELECT * FROM chgme ORDER BY C1;
statement ok
DROP TABLE chgme;

# Regression test for issue #151216
# Tests that CREATE VIEW with references to crdb_region column in expressions
# (but not directly returned) should not trigger validation assertion errors.
subtest issue_151216_view_crdb_region_reference

statement ok
CREATE DATABASE bank_151216 PRIMARY REGION "us-east-1" REGIONS "us-east-1", "ca-central-1", "ap-southeast-2" SURVIVE REGION FAILURE;

statement ok
USE bank_151216;

statement ok
CREATE TABLE t1 (c1 INT) LOCALITY REGIONAL BY ROW;

statement ok
CREATE MATERIALIZED VIEW mv1 AS SELECT c1, CASE WHEN crdb_region = 'us-east-1' THEN 'east' ELSE 'other' END AS region_type FROM t1;

statement ok
CREATE VIEW v2 AS SELECT c1, crdb_region = 'us-east-1' AS is_us_east1 FROM t1;

statement ok
SET sql_safe_updates = false;
DROP DATABASE bank_151216;
SET sql_safe_updates = true

subtest end
8 changes: 5 additions & 3 deletions pkg/sql/catalog/multiregion/validate_table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@ func ValidateTableLocalityConfig(
switch lc := lc.Locality.(type) {
case *catpb.LocalityConfig_Global_:
if regionEnumIDReferenced {
if !columnTypesTypeIDs.Contains(regionsEnumID) {
// Omit views since they may reference the multi-region enum type of the base table.
if !columnTypesTypeIDs.Contains(regionsEnumID) && !desc.IsView() {
return errors.AssertionFailedf(
"expected no region Enum ID to be referenced by a GLOBAL TABLE: %q"+
" but found: %d",
Expand Down Expand Up @@ -233,8 +234,9 @@ func ValidateTableLocalityConfig(
if regionEnumIDReferenced {
// It may be the case that the multi-region type descriptor is used
// as the type of the table column. Validations should only fail if
// that is not the case.
if !columnTypesTypeIDs.Contains(regionsEnumID) {
// that is not the case. We omit views since they may reference the
// multi-region enum type of the base table.
if !columnTypesTypeIDs.Contains(regionsEnumID) && !desc.IsView() {
return errors.AssertionFailedf(
"expected no region Enum ID to be referenced by a REGIONAL BY TABLE: %q homed in the "+
"primary region, but found: %d",
Expand Down