sql: fix secondary region notice

Fix notice message to be make it clearer. Release justification: low risk changes to existing functionality Release note: None
cockroachdb · Aug 29, 2022 · 963de8f · 963de8f
1 parent f4c3de1
commit 963de8f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/pkg/ccl/logictestccl/testdata/logic_test/secondary_region b/pkg/ccl/logictestccl/testdata/logic_test/secondary_region
@@ -372,7 +372,7 @@ ALTER DATABASE db DROP SECONDARY REGION
 query T noticetrace
 ALTER DATABASE db DROP SECONDARY REGION IF EXISTS
 ----
- NOTICE: No secondary region is not defined on the database; skipping
+NOTICE: No secondary region is defined on the database; skipping
 
 
 query TT

diff --git a/pkg/sql/alter_database.go b/pkg/sql/alter_database.go
@@ -1898,7 +1898,7 @@ func (n *alterDatabaseDropSecondaryRegion) startExec(params runParams) error {
 		if n.n.IfExists {
 			params.p.BufferClientNotice(
 				params.ctx,
-				pgnotice.Newf("No secondary region is not defined on the database; skipping"),
+				pgnotice.Newf("No secondary region is defined on the database; skipping"),
 			)
 			return nil
 		}

diff --git a/pkg/sql/catalog/dbdesc/database_desc.go b/pkg/sql/catalog/dbdesc/database_desc.go
@@ -255,6 +255,10 @@ func (desc *immutable) validateMultiRegion(vea catalog.ValidationErrorAccumulato
 		vea.Report(errors.AssertionFailedf(
 			"primary region unset on a multi-region db %d", desc.GetID()))
 	}
+	if desc.RegionConfig.PrimaryRegion == desc.RegionConfig.SecondaryRegion {
+		vea.Report(errors.AssertionFailedf(
+			"primary region is same as secondary region on multi-region db %d", desc.GetID()))
+	}
 }
 
 // GetReferencedDescIDs returns the IDs of all descriptors referenced by