Merge pull request #106376 from knz/backport23.1-106110-106116-106121…

…-106298

release-23.1: sql: emphasize "virtual cluster" for tenant management in user-facing UX

docs/generated/sql/bnf/BUILD.bazel

@@ -67,6 +67,7 @@ FILES = [
     "alter_zone_table_stmt",
     "analyze_stmt",
     "backup",
+    "backup_options",
     "begin_stmt",
     "begin_transaction",
     "cancel_all_jobs_stmt",
@@ -126,7 +127,6 @@ FILES = [
     "drop_sequence_stmt",
     "drop_stmt",
     "drop_table",
-    "drop_tenant_stmt",
     "drop_type",
     "drop_view",
     "execute_stmt",
@@ -162,7 +162,6 @@ FILES = [
     "opt_frame_clause",
     "opt_locality",
     "opt_persistence_temp_table",
-    "opt_show_tenant_options",
     "opt_with_storage_parameter_list",
     "pause_all_jobs_stmt",
     "pause_job",
@@ -185,6 +184,7 @@ FILES = [
     "reset_session_stmt",
     "reset_stmt",
     "restore",
+    "restore_options",
     "resume_all_jobs_stmt",
     "resume_job",
     "resume_schedule",
@@ -228,7 +228,6 @@ FILES = [
     "show_indexes_stmt",
     "show_jobs",
     "show_keys",
-    "show_local_or_tenant_csettings_stmt",
     "show_locality",
     "show_locality_stmt",
     "show_partitions_stmt",
@@ -246,7 +245,6 @@ FILES = [
     "show_stats",
     "show_survival_goal_stmt",
     "show_tables",
-    "show_tenant_stmt",
     "show_trace",
     "show_transactions_stmt",
     "show_transfer_stmt",
@@ -264,8 +262,6 @@ FILES = [
     "table_clause",
     "table_constraint",
     "table_ref",
-    "tenant_capability",
-    "tenant_capability_list",
     "transaction_stmt",
     "truncate_stmt",
     "unique_column_level",

docs/generated/sql/bnf/backup_options.bnf

@@ -0,0 +1,11 @@
+backup_options ::=
+	'ENCRYPTION_PASSPHRASE' '=' string_or_placeholder
+	| 'REVISION_HISTORY'
+	| 'REVISION_HISTORY' '=' a_expr
+	| 'DETACHED'
+	| 'DETACHED' '=' 'TRUE'
+	| 'DETACHED' '=' 'FALSE'
+	| 'KMS' '=' string_or_placeholder_opt_list
+	| 'INCREMENTAL_LOCATION' '=' string_or_placeholder_opt_list
+	| 'EXECUTION' 'LOCALITY' '=' string_or_placeholder
+	| 'INCLUDE_ALL_VIRTUAL_CLUSTERS' '=' a_expr

docs/generated/sql/bnf/drop_stmt.bnf

@@ -10,4 +10,3 @@ drop_stmt ::=
 	| drop_role_stmt
 	| drop_schedule_stmt
 	| drop_external_connection_stmt
-	| drop_tenant_stmt

docs/generated/sql/bnf/restore_options.bnf

@@ -0,0 +1,21 @@
+restore_options ::=
+	'ENCRYPTION_PASSPHRASE' '=' string_or_placeholder
+	| 'KMS' '=' string_or_placeholder_opt_list
+	| 'INTO_DB' '=' string_or_placeholder
+	| 'SKIP_MISSING_FOREIGN_KEYS'
+	| 'SKIP_MISSING_SEQUENCES'
+	| 'SKIP_MISSING_SEQUENCE_OWNERS'
+	| 'SKIP_MISSING_VIEWS'
+	| 'SKIP_MISSING_UDFS'
+	| 'DETACHED'
+	| 'SKIP_LOCALITIES_CHECK'
+	| 'DEBUG_PAUSE_ON' '=' string_or_placeholder
+	| 'NEW_DB_NAME' '=' string_or_placeholder
+	| 'INCLUDE_ALL_VIRTUAL_CLUSTERS'
+	| 'INCLUDE_ALL_VIRTUAL_CLUSTERS' '=' a_expr
+	| 'INCREMENTAL_LOCATION' '=' string_or_placeholder_opt_list
+	| 'VIRTUAL_CLUSTER_NAME' '=' string_or_placeholder
+	| 'VIRTUAL_CLUSTER' '=' string_or_placeholder
+	| 'SCHEMA_ONLY'
+	| 'VERIFY_BACKUP_TABLE_DATA'
+	| 'UNSAFE_RESTORE_INCOMPATIBLE_VERSION'

docs/generated/sql/bnf/show_var.bnf

@@ -5,7 +5,6 @@ show_stmt ::=
 	| show_create_stmt
 	| show_create_schedules_stmt
 	| show_create_external_connections_stmt
-	| show_local_or_tenant_csettings_stmt
 	| show_databases_stmt
 	| show_enums_stmt
 	| show_types_stmt
@@ -29,7 +28,6 @@ show_stmt ::=
 	| show_sessions_stmt
 	| show_stats_stmt
 	| show_tables_stmt
-	| show_tenant_stmt
 	| show_trace_stmt
 	| show_transactions_stmt
 	| show_transfer_stmt