commit 2bb38c9b277b72f1d384ce83cb7377b1bf0225c3
author gaffneyk <kgaff33@gmail.com> Fri Sep 13 13:36:35 2019 -0500
committer Nikhil Benesch <nikhil.benesch@gmail.com> Fri Sep 13 22:54:21 2019 -0400
tree 2e499610ea8786e09292af28b7a04272cd2eca03
parent abf68c6af6a90794d6cb06d19db09afd15df1a5d

Parse START TRANSACTION when followed by a semicolon

Co-authored-by: Nikhil Benesch <nikhil.benesch@gmail.com>

src/parser.rs

diff --git a/src/parser.rs b/src/parser.rs
index f771915..38bf4ef 100644
--- a/src/parser.rs
+++ b/src/parser.rs
@@ -2026,7 +2026,7 @@
                 TransactionMode::AccessMode(TransactionAccessMode::ReadOnly)
             } else if self.parse_keywords(vec!["READ", "WRITE"]) {
                 TransactionMode::AccessMode(TransactionAccessMode::ReadWrite)
-            } else if required || self.peek_token().is_some() {
+            } else if required {
                 self.expected("transaction mode", self.peek_token())?
             } else {
                 break;

tests/sqlparser_common.rs

diff --git a/tests/sqlparser_common.rs b/tests/sqlparser_common.rs
index abe6e8f..ba5bd97 100644
--- a/tests/sqlparser_common.rs
+++ b/tests/sqlparser_common.rs
@@ -2455,6 +2455,17 @@
     verified_stmt("START TRANSACTION ISOLATION LEVEL REPEATABLE READ");
     verified_stmt("START TRANSACTION ISOLATION LEVEL SERIALIZABLE");
 
+    // Regression test for https://github.com/andygrove/sqlparser-rs/pull/139,
+    // in which START TRANSACTION would fail to parse if followed by a statement
+    // terminator.
+    assert_eq!(
+        parse_sql_statements("START TRANSACTION; SELECT 1"),
+        Ok(vec![
+            verified_stmt("START TRANSACTION"),
+            verified_stmt("SELECT 1"),
+        ])
+    );
+
     let res = parse_sql_statements("START TRANSACTION ISOLATION LEVEL BAD");
     assert_eq!(
         ParserError::ParserError("Expected isolation level, found: BAD".to_string()),
@@ -2463,7 +2474,7 @@
 
     let res = parse_sql_statements("START TRANSACTION BAD");
     assert_eq!(
-        ParserError::ParserError("Expected transaction mode, found: BAD".to_string()),
+        ParserError::ParserError("Expected end of statement, found: BAD".to_string()),
         res.unwrap_err()
     );