Merge #87650

87650: docgen: fix missing backup diagram r=dt a=dt Release note: none. Co-authored-by: David Taylor <tinystatemachine@gmail.com>
cockroachdb · Sep 9, 2022 · 2b5d87f · 2b5d87f
2 parents 203c078 + be5d26f
commit 2b5d87f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/docs/generated/sql/bnf/backup.bnf b/docs/generated/sql/bnf/backup.bnf
@@ -1 +1,7 @@
 backup_stmt ::=
+	'BACKUP' ( | 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'INTO' ( | subdirectory 'IN' | 'LATEST' 'IN') ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp 'WITH' backup_options ( ( ',' backup_options ) )*
+	| 'BACKUP' ( | 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'INTO' ( | subdirectory 'IN' | 'LATEST' 'IN') ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp 'WITH' 'OPTIONS' '(' backup_options ( ( ',' backup_options ) )* ')'
+	| 'BACKUP' ( | 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'INTO' ( | subdirectory 'IN' | 'LATEST' 'IN') ( collectionURI | '(' localityURI ( ',' localityURI )* ')' ) 'AS' 'OF' 'SYSTEM' 'TIME' timestamp 
+	| 'BACKUP' ( | 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'INTO' ( | subdirectory 'IN' | 'LATEST' 'IN') ( collectionURI | '(' localityURI ( ',' localityURI )* ')' )  'WITH' backup_options ( ( ',' backup_options ) )*
+	| 'BACKUP' ( | 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'INTO' ( | subdirectory 'IN' | 'LATEST' 'IN') ( collectionURI | '(' localityURI ( ',' localityURI )* ')' )  'WITH' 'OPTIONS' '(' backup_options ( ( ',' backup_options ) )* ')'
+	| 'BACKUP' ( | 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* ) 'INTO' ( | subdirectory 'IN' | 'LATEST' 'IN') ( collectionURI | '(' localityURI ( ',' localityURI )* ')' )  
diff --git a/pkg/cmd/docgen/diagrams.go b/pkg/cmd/docgen/diagrams.go
@@ -559,7 +559,7 @@ var specs = []stmtSpec{
 		name:   "backup",
 		stmt:   "backup_stmt",
 		inline: []string{"opt_backup_targets", "opt_with_backup_options", "opt_as_of_clause", "as_of_clause", "backup_options_list"},
-		match:  []*regexp.Regexp{regexp.MustCompile("'BACKUP' targets 'INTO'")},
+		match:  []*regexp.Regexp{regexp.MustCompile("'BACKUP' backup_targets 'INTO'")},
 		replace: map[string]string{
 			"grant_targets":                  "( | 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* )",
 			"backup_targets":                 "( | 'TABLE' table_pattern ( ( ',' table_pattern ) )* | 'DATABASE' database_name ( ( ',' database_name ) )* )",