sql,backupccl: add more tests for user ID migrations

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"},
 		})

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;

pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/BACKUP_MANIFEST-CHECKSUM

@@ -1 +1 @@
-U�IS
+����

pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cdcbdfcdcdc5cdcac5cfc7d1cdc8c9cdcac6dfd4cfcfcfcfdfaaabbcdf92c2d4c6c6d1c7c6c7c6cec6c8cecffffe-CHECKSUM

@@ -0,0 +1 @@
+B:�|

pkg/ccl/backupccl/testdata/restore_old_versions/system-privileges-restore/v22.2.6/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cdcbdfcdcdc5cdcac5cfc8d1c6c7cfcbc7cedfd4cfcfcfcfdfaaabbcdf92c2d4c6c6d1c9cfcccecbcdcccccafffe-CHECKSUM

@@ -0,0 +1 @@
+�w 

pkg/sql/logictest/testdata/logic_test/mixed_version_database_role_settings_role_id

@@ -0,0 +1,27 @@
+# LogicTest: cockroach-go-testserver-upgrade-to-master
+
+# Set default session variables in a mixed version cluster.
+
+statement ok
+CREATE USER testuser1
+
+upgrade 1
+
+user root nodeidx=1
+
+statement ok
+ALTER ROLE ALL SET timezone = 'America/New_York'
+
+statement ok
+ALTER ROLE testuser1 SET application_name = 'my app'
+
+user root nodeidx=2
+
+statement ok
+ALTER ROLE testuser1 SET index_recommendations_enabled = false
+
+query TT
+SELECT role_name, settings FROM system.database_role_settings
+----
+·          {timezone=America/New_York}
+testuser1  {"application_name=my app",index_recommendations_enabled=false}

pkg/sql/logictest/testdata/logic_test/mixed_version_system_privileges_user_id

@@ -0,0 +1,27 @@
+# LogicTest: cockroach-go-testserver-upgrade-to-master
+
+# Grant system privileges in a mixed version cluster.
+
+statement ok
+CREATE USER testuser1
+
+upgrade 1
+
+user root nodeidx=1
+
+statement ok
+REVOKE SELECT ON crdb_internal.tables FROM public
+
+statement ok
+GRANT SYSTEM MODIFYCLUSTERSETTING TO testuser1
+
+user root nodeidx=2
+
+statement ok
+GRANT SYSTEM CANCELQUERY TO testuser1
+
+query TTTT
+SELECT username, path, privileges, grant_options FROM system.privileges
+----
+public     /vtable/crdb_internal/tables  {}                                  {}
+testuser1  /global/                      {CANCELQUERY,MODIFYCLUSTERSETTING}  {}

pkg/sql/logictest/tests/cockroach-go-testserver-upgrade-to-master/BUILD.bazel

@@ -11,7 +11,7 @@ go_test(
         "//pkg/cmd/cockroach-short",  # keep
         "//pkg/sql/logictest:testdata",  # keep
     ],
-    shard_count = 4,
+    shard_count = 6,
     tags = [
         "cpu:2",
     ],