docgen: update BEGIN and SET TRANSACTION diagrams without iso level

cockroachdb · Dec 13, 2024 · 7802e4b · 7802e4b
1 parent 76b37d7
commit 7802e4b
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 16 deletions.
diff --git a/docs/generated/sql/bnf/BUILD.bazel b/docs/generated/sql/bnf/BUILD.bazel
@@ -68,7 +68,6 @@ FILES = [
     "analyze_stmt",
     "backup",
     "backup_options",
-    "begin_stmt",
     "begin_transaction",
     "cancel_all_jobs_stmt",
     "cancel_job",
@@ -156,6 +155,7 @@ FILES = [
     "like_table_option_list",
     "limit_clause",
     "move_cursor_stmt",
+    "nonpreparable_set_stmt",
     "not_null_column_level",
     "offset_clause",
     "on_conflict",
@@ -210,7 +210,6 @@ FILES = [
     "set_rest_more",
     "set_session_stmt",
     "set_transaction",
-    "set_transaction_stmt",
     "show_backup",
     "show_cluster_setting",
     "show_columns_stmt",

diff --git a/docs/generated/sql/bnf/nonpreparable_set_stmt.bnf b/docs/generated/sql/bnf/nonpreparable_set_stmt.bnf
@@ -0,0 +1,2 @@
+nonpreparable_set_stmt ::=
+	set_transaction_stmt
diff --git a/pkg/cmd/docgen/diagrams.go b/pkg/cmd/docgen/diagrams.go
@@ -614,24 +614,19 @@ var specs = []stmtSpec{
 		exclude: []*regexp.Regexp{regexp.MustCompile("'IN'")},
 	},
 	{
-		name: "begin_stmt",
+		name: "legacy_begin_stmt",
 		inline: []string{
 			"opt_transaction",
 			"begin_transaction",
-			"transaction_mode",
-			"transaction_user_priority",
-			"user_priority",
-			"iso_level",
 			"transaction_mode_list",
 			"opt_comma",
+			"transaction_mode",
+			"transaction_user_priority",
 			"transaction_read_mode",
 			"as_of_clause",
 			"transaction_deferrable_mode",
 			"user_priority",
 		},
-		exclude: []*regexp.Regexp{
-			regexp.MustCompile("'START'"),
-		},
 	},
 	{
 		name:    "check_column_level",
@@ -1330,7 +1325,7 @@ var specs = []stmtSpec{
 	},
 	{
 		name: "set_transaction",
-		stmt: "nonpreparable_set_stmt",
+		stmt: "set_transaction_stmt",
 		inline: []string{
 			"set_transaction_stmt",
 			"transaction_mode",

diff --git a/pkg/gen/bnf.bzl b/pkg/gen/bnf.bzl
@@ -68,7 +68,6 @@ BNF_SRCS = [
     "//docs/generated/sql/bnf:analyze_stmt.bnf",
     "//docs/generated/sql/bnf:backup.bnf",
     "//docs/generated/sql/bnf:backup_options.bnf",
-    "//docs/generated/sql/bnf:begin_stmt.bnf",
     "//docs/generated/sql/bnf:begin_transaction.bnf",
     "//docs/generated/sql/bnf:cancel_all_jobs_stmt.bnf",
     "//docs/generated/sql/bnf:cancel_job.bnf",
@@ -156,6 +155,7 @@ BNF_SRCS = [
     "//docs/generated/sql/bnf:like_table_option_list.bnf",
     "//docs/generated/sql/bnf:limit_clause.bnf",
     "//docs/generated/sql/bnf:move_cursor_stmt.bnf",
+    "//docs/generated/sql/bnf:nonpreparable_set_stmt.bnf",
     "//docs/generated/sql/bnf:not_null_column_level.bnf",
     "//docs/generated/sql/bnf:offset_clause.bnf",
     "//docs/generated/sql/bnf:on_conflict.bnf",
@@ -210,7 +210,6 @@ BNF_SRCS = [
     "//docs/generated/sql/bnf:set_rest_more.bnf",
     "//docs/generated/sql/bnf:set_session_stmt.bnf",
     "//docs/generated/sql/bnf:set_transaction.bnf",
-    "//docs/generated/sql/bnf:set_transaction_stmt.bnf",
     "//docs/generated/sql/bnf:show_backup.bnf",
     "//docs/generated/sql/bnf:show_cluster_setting.bnf",
     "//docs/generated/sql/bnf:show_columns_stmt.bnf",

diff --git a/pkg/gen/diagrams.bzl b/pkg/gen/diagrams.bzl
@@ -68,7 +68,6 @@ DIAGRAMS_SRCS = [
     "//docs/generated/sql/bnf:analyze.html",
     "//docs/generated/sql/bnf:backup.html",
     "//docs/generated/sql/bnf:backup_options.html",
-    "//docs/generated/sql/bnf:begin.html",
     "//docs/generated/sql/bnf:begin_transaction.html",
     "//docs/generated/sql/bnf:cancel.html",
     "//docs/generated/sql/bnf:cancel_all_jobs.html",
@@ -156,6 +155,7 @@ DIAGRAMS_SRCS = [
     "//docs/generated/sql/bnf:like_table_option_list.html",
     "//docs/generated/sql/bnf:limit_clause.html",
     "//docs/generated/sql/bnf:move_cursor.html",
+    "//docs/generated/sql/bnf:nonpreparable_set.html",
     "//docs/generated/sql/bnf:not_null_column_level.html",
     "//docs/generated/sql/bnf:offset_clause.html",
     "//docs/generated/sql/bnf:on_conflict.html",

diff --git a/pkg/gen/docs.bzl b/pkg/gen/docs.bzl
@@ -80,7 +80,6 @@ DOCS_SRCS = [
     "//docs/generated/sql/bnf:analyze_stmt.bnf",
     "//docs/generated/sql/bnf:backup.bnf",
     "//docs/generated/sql/bnf:backup_options.bnf",
-    "//docs/generated/sql/bnf:begin_stmt.bnf",
     "//docs/generated/sql/bnf:begin_transaction.bnf",
     "//docs/generated/sql/bnf:cancel_all_jobs_stmt.bnf",
     "//docs/generated/sql/bnf:cancel_job.bnf",
@@ -168,6 +167,7 @@ DOCS_SRCS = [
     "//docs/generated/sql/bnf:like_table_option_list.bnf",
     "//docs/generated/sql/bnf:limit_clause.bnf",
     "//docs/generated/sql/bnf:move_cursor_stmt.bnf",
+    "//docs/generated/sql/bnf:nonpreparable_set_stmt.bnf",
     "//docs/generated/sql/bnf:not_null_column_level.bnf",
     "//docs/generated/sql/bnf:offset_clause.bnf",
     "//docs/generated/sql/bnf:on_conflict.bnf",
@@ -222,7 +222,6 @@ DOCS_SRCS = [
     "//docs/generated/sql/bnf:set_rest_more.bnf",
     "//docs/generated/sql/bnf:set_session_stmt.bnf",
     "//docs/generated/sql/bnf:set_transaction.bnf",
-    "//docs/generated/sql/bnf:set_transaction_stmt.bnf",
     "//docs/generated/sql/bnf:show_backup.bnf",
     "//docs/generated/sql/bnf:show_cluster_setting.bnf",
     "//docs/generated/sql/bnf:show_columns_stmt.bnf",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		nonpreparable_set_stmt ::=
		set_transaction_stmt