Merge #71079

71079: Added SET LOCAL syntax diagram; Updated SET SESSION syntax diagram r=ericharmeling a=ericharmeling Syntax diagram updates for cockroachdb/docs#11874 Release note: None Co-authored-by: Eric Harmeling <[email protected]>
cockroachdb · Oct 7, 2021 · f612208 · f612208
2 parents 617beac + fc2e5ca
commit f612208
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 24 deletions.
diff --git a/docs/generated/sql/bnf/BUILD.bazel b/docs/generated/sql/bnf/BUILD.bazel
@@ -176,7 +176,6 @@ genrule(
         "set_session_stmt.bnf",
         "set_transaction.bnf",
         "set_transaction_stmt.bnf",
-        "set_var.bnf",
         "show_backup.bnf",
         "show_cluster_setting.bnf",
         "show_columns_stmt.bnf",

diff --git a/docs/generated/sql/bnf/set_local_stmt.bnf b/docs/generated/sql/bnf/set_local_stmt.bnf
@@ -1,2 +1,3 @@
 set_local_stmt ::=
-	'SET' 'LOCAL' set_rest
+	'SET' 'LOCAL' var_name '=' var_value ( ( ',' var_value ) )*
+	| 'SET' 'LOCAL' var_name 'TO' var_value ( ( ',' var_value ) )*
diff --git a/docs/generated/sql/bnf/set_session_stmt.bnf b/docs/generated/sql/bnf/set_session_stmt.bnf
@@ -1,4 +1,5 @@
 set_session_stmt ::=
-	'SET' 'SESSION' set_rest_more
-	| 'SET' set_rest_more
-	| 'SET' 'SESSION' 'CHARACTERISTICS' 'AS' 'TRANSACTION' transaction_mode_list
+	'SET' 'SESSION' var_name '=' var_value ( ( ',' var_value ) )*
+	| 'SET' 'SESSION' var_name 'TO' var_value ( ( ',' var_value ) )*
+	| 'SET' var_name '=' var_value ( ( ',' var_value ) )*
+	| 'SET' var_name 'TO' var_value ( ( ',' var_value ) )*
diff --git a/docs/generated/sql/bnf/set_var.bnf b/docs/generated/sql/bnf/set_var.bnf
diff --git a/pkg/cmd/docgen/diagrams.go b/pkg/cmd/docgen/diagrams.go
@@ -1190,21 +1190,17 @@ var specs = []stmtSpec{
 		nosplit: true,
 	},
 	{
-		name:   "set_var",
-		stmt:   "preparable_set_stmt",
-		inline: []string{"set_session_stmt", "set_rest_more", "generic_set", "var_list", "to_or_eq"},
+		name: "set_session_stmt",
+		stmt: "set_session_stmt",
 		exclude: []*regexp.Regexp{
-			regexp.MustCompile(`'SET' . 'TRANSACTION'`),
-			regexp.MustCompile(`'SET' 'TRANSACTION'`),
-			regexp.MustCompile(`'SET' 'SESSION' var_name`),
-			regexp.MustCompile(`'SET' 'SESSION' 'TRANSACTION'`),
-			regexp.MustCompile(`'SET' 'SESSION' 'CHARACTERISTICS'`),
-			regexp.MustCompile("'SET' 'CLUSTER'"),
-		},
-		replace: map[string]string{
-			"'=' 'DEFAULT'":  "'=' 'DEFAULT' | 'SET' 'TIME' 'ZONE' ( var_value | 'DEFAULT' | 'LOCAL' )",
-			"'SET' var_name": "'SET' ( 'SESSION' | ) var_name",
+			regexp.MustCompile("'CHARACTERISTICS' 'AS' 'TRANSACTION' transaction_mode_list"),
 		},
+		inline: []string{"set_rest_more", "set_rest", "generic_set", "var_list", "to_or_eq"},
+	},
+	{
+		name:   "set_local_stmt",
+		stmt:   "set_local_stmt",
+		inline: []string{"set_rest", "generic_set", "var_list", "to_or_eq"},
 	},
 	{
 		name:   "set_cluster_setting",