merge with main

dolthub · Nov 26, 2024 · 1737839 · 1737839
2 parents 8a9c469 + 88972ec
commit 1737839
Show file tree

Hide file tree

Showing 4 changed files with 10,982 additions and 11,058 deletions.
diff --git a/go/vt/sqlparser/keywords.go b/go/vt/sqlparser/keywords.go
@@ -148,6 +148,7 @@ var keywords = map[string]int{
 	"condition":                     CONDITION,
 	"connection":                    CONNECTION,
 	"connection_admin":              CONNECTION_ADMIN,
+	"consistent":                    CONSISTENT,
 	"constraint":                    CONSTRAINT,
 	"constraint_catalog":            CONSTRAINT_CATALOG,
 	"constraint_name":               CONSTRAINT_NAME,
@@ -564,6 +565,7 @@ var keywords = map[string]int{
 	"slave":                         SLAVE,
 	"slow":                          SLOW,
 	"smallint":                      SMALLINT,
+	"snapshot":                      SNAPSHOT,
 	"source":                        SOURCE,
 	"source_auto_position":          SOURCE_AUTO_POSITION,
 	"source_connect_retry":          SOURCE_CONNECT_RETRY,

diff --git a/go/vt/sqlparser/parse_test.go b/go/vt/sqlparser/parse_test.go
@@ -2791,6 +2791,9 @@ var (
 		}, {
 			input:  "start transaction read write",
 			output: "start transaction read write",
+		}, {
+			input:  "start transaction with consistent snapshot",
+			output: "start transaction",
 		}, {
 			input: "commit",
 		}, {