backupccl: update TestRestoreOldVersions subtest for system.privileges

This patch updates the TestRestoreOldVersions subtest for the system.privileges table to also test that a row for the public role is correctly restored. Release note: None
cockroachdb · Mar 25, 2023 · 3b3b573 · 3b3b573
1 parent 0865a54
commit 3b3b573
Show file tree

Hide file tree

Showing 20 changed files with 6 additions and 3 deletions.
diff --git a/pkg/ccl/backupccl/restore_old_versions_test.go b/pkg/ccl/backupccl/restore_old_versions_test.go
@@ -366,6 +366,7 @@ func fullClusterRestoreSystemPrivilegesWithoutIDs(exportDir string) func(t *test
 		sqlDB.Exec(t, fmt.Sprintf("RESTORE FROM '%s' WITH UNSAFE_RESTORE_INCOMPATIBLE_VERSION", localFoo))
 
 		sqlDB.CheckQueryResults(t, "SELECT * FROM system.privileges", [][]string{
+			{"public", "/vtable/crdb_internal/tables", "{}", "{}", "4"},
 			{"testuser1", "/global/", "{VIEWACTIVITY}", "{}", "100"},
 			{"testuser2", "/global/", "{MODIFYCLUSTERSETTING}", "{}", "101"},
 		})

diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/create-system-privileges.sql b/pkg/ccl/backupccl/testdata/restore_old_versions/create-system-privileges.sql
@@ -14,3 +14,5 @@ CREATE USER testuser2;
 GRANT SYSTEM VIEWACTIVITY TO testuser1;
 
 GRANT SYSTEM MODIFYCLUSTERSETTING TO testuser2;
+
+REVOKE SELECT ON crdb_internal.tables FROM public;
diff --git a/...re/v22.2.6/BACKUP-LOCK-849140163936059393 → ...re/v22.2.6/BACKUP-LOCK-850743482728284161 b/...re/v22.2.6/BACKUP-LOCK-849140163936059393 → ...re/v22.2.6/BACKUP-LOCK-850743482728284161
diff --git a/...ckupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/BACKUP-STATISTICS b/...ckupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/BACKUP-STATISTICS
diff --git a/...backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/BACKUP_MANIFEST b/...backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/BACKUP_MANIFEST
diff --git a/.../testdata/restore_old_versions/system-privileges-restore/v22.2.6/BACKUP_MANIFEST-CHECKSUM b/.../testdata/restore_old_versions/system-privileges-restore/v22.2.6/BACKUP_MANIFEST-CHECKSUM
@@ -1 +1 @@
-U�IS
+����
diff --git a/...stdata/restore_old_versions/system-privileges-restore/v22.2.6/data/849140167931461633.sst b/...stdata/restore_old_versions/system-privileges-restore/v22.2.6/data/849140167931461633.sst
diff --git a/...stdata/restore_old_versions/system-privileges-restore/v22.2.6/data/849140168228208642.sst b/...stdata/restore_old_versions/system-privileges-restore/v22.2.6/data/849140168228208642.sst
diff --git a/...stdata/restore_old_versions/system-privileges-restore/v22.2.6/data/849140168235778051.sst b/...stdata/restore_old_versions/system-privileges-restore/v22.2.6/data/849140168235778051.sst
diff --git a/...stdata/restore_old_versions/system-privileges-restore/v22.2.6/data/850743486781980673.sst b/...stdata/restore_old_versions/system-privileges-restore/v22.2.6/data/850743486781980673.sst
diff --git a/...stdata/restore_old_versions/system-privileges-restore/v22.2.6/data/850743487039143939.sst b/...stdata/restore_old_versions/system-privileges-restore/v22.2.6/data/850743487039143939.sst
diff --git a/...stdata/restore_old_versions/system-privileges-restore/v22.2.6/data/850743487047237634.sst b/...stdata/restore_old_versions/system-privileges-restore/v22.2.6/data/850743487047237634.sst
diff --git a/...bdfcdcdc5cdcac5cfc7d1cdc8c9cdcac6dfd4cfcfcfcfdfaaabbcdf92c2d4c6c6d1c7c6c7c6cec6c8cecffffe b/...bdfcdcdc5cdcac5cfc7d1cdc8c9cdcac6dfd4cfcfcfcfdfaaabbcdf92c2d4c6c6d1c7c6c7c6cec6c8cecffffe
diff --git a/...cdcac5cfc7d1cdc8c9cdcac6dfd4cfcfcfcfdfaaabbcdf92c2d4c6c6d1c7c6c7c6cec6c8cecffffe-CHECKSUM b/...cdcac5cfc7d1cdc8c9cdcac6dfd4cfcfcfcfdfaaabbcdf92c2d4c6c6d1c7c6c7c6cec6c8cecffffe-CHECKSUM
@@ -0,0 +1 @@
+B:�|
diff --git a/...bdfcdcdc5cdcac5cfc8d1c6c7cfcbc7cedfd4cfcfcfcfdfaaabbcdf92c2d4c6c6d1c9cfcccecbcdcccccafffe b/...bdfcdcdc5cdcac5cfc8d1c6c7cfcbc7cedfd4cfcfcfcfdfaaabbcdf92c2d4c6c6d1c9cfcccecbcdcccccafffe
diff --git a/...cdcac5cfc8d1c6c7cfcbc7cedfd4cfcfcfcfdfaaabbcdf92c2d4c6c6d1c9cfcccecbcdcccccafffe-CHECKSUM b/...cdcac5cfc8d1c6c7cfcbc7cedfd4cfcfcfcfdfaaabbcdf92c2d4c6c6d1c9cfcccecbcdcccccafffe-CHECKSUM
@@ -0,0 +1 @@
+�w 
diff --git a/...fcfc9c5cccfc5cecbd1cdcdc7cbcbcbdfd4cfcfcfcfdfaaabbcdf92c2d4cccecbd1cccfcccbcbccc7c8c9fffe b/...fcfc9c5cccfc5cecbd1cdcdc7cbcbcbdfd4cfcfcfcfdfaaabbcdf92c2d4cccecbd1cccfcccbcbccc7c8c9fffe
diff --git a/...cfc5cecbd1cdcdc7cbcbcbdfd4cfcfcfcfdfaaabbcdf92c2d4cccecbd1cccfcccbcbccc7c8c9fffe-CHECKSUM b/...cfc5cecbd1cdcdc7cbcbcbdfd4cfcfcfcfdfaaabbcdf92c2d4cccecbd1cccfcccbcbccc7c8c9fffe-CHECKSUM
diff --git a/...fcfc9c5cccfc5ceccd1c6cfcbcbc9cddfd4cfcfcfcfdfaaabbcdf92c2d4ccceccd1c6c8c6cbcac7c9cdc9fffe b/...fcfc9c5cccfc5ceccd1c6cfcbcbc9cddfd4cfcfcfcfdfaaabbcdf92c2d4ccceccd1c6c8c6cbcac7c9cdc9fffe
diff --git a/...cfc5ceccd1c6cfcbcbc9cddfd4cfcfcfcfdfaaabbcdf92c2d4ccceccd1c6c8c6cbcac7c9cdc9fffe-CHECKSUM b/...cfc5ceccd1c6cfcbcbc9cddfd4cfcfcfcfdfaaabbcdf92c2d4ccceccd1c6c8c6cbcac7c9cdc9fffe-CHECKSUM