Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 35 additions & 1 deletion crates/pgt_statement_splitter/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ mod tests {
assert_eq!(
self.result.ranges.len(),
expected.len(),
"Expected {} statements for input {}, got {}: {:?}",
"Expected {} statements for input\n{}\ngot {}:\n{:?}",
expected.len(),
self.input,
self.result.ranges.len(),
Expand Down Expand Up @@ -133,6 +133,40 @@ mod tests {
}
}

#[test]
fn begin_commit() {
Tester::from(
"BEGIN;
SELECT 1;
COMMIT;",
)
.expect_statements(vec!["BEGIN;", "SELECT 1;", "COMMIT;"]);
}

#[test]
fn begin_atomic() {
Tester::from(
"CREATE OR REPLACE FUNCTION public.test_fn(some_in TEXT)
RETURNS TEXT
LANGUAGE sql
IMMUTABLE
STRICT
BEGIN ATOMIC
SELECT $1 || 'foo';
END;",
)
.expect_statements(vec![
"CREATE OR REPLACE FUNCTION public.test_fn(some_in TEXT)
RETURNS TEXT
LANGUAGE sql
IMMUTABLE
STRICT
BEGIN ATOMIC
SELECT $1 || 'foo';
END;",
]);
}

#[test]
fn ts_with_timezone() {
Tester::from("alter table foo add column bar timestamp with time zone;").expect_statements(
Expand Down
38 changes: 37 additions & 1 deletion crates/pgt_statement_splitter/src/splitter/common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,33 @@ pub(crate) fn statement(p: &mut Splitter) {
p.close_stmt();
}

pub(crate) fn begin_end(p: &mut Splitter) {
p.expect(SyntaxKind::BEGIN_KW);

let mut depth = 1;

loop {
match p.current() {
SyntaxKind::BEGIN_KW => {
p.advance();
depth += 1;
}
SyntaxKind::END_KW | SyntaxKind::EOF => {
if p.current() == SyntaxKind::END_KW {
p.advance();
}
depth -= 1;
if depth == 0 {
break;
}
}
_ => {
p.advance();
}
}
}
}

pub(crate) fn parenthesis(p: &mut Splitter) {
p.expect(SyntaxKind::L_PAREN);

Expand Down Expand Up @@ -163,6 +190,14 @@ pub(crate) fn unknown(p: &mut Splitter, exclude: &[SyntaxKind]) {
SyntaxKind::L_PAREN => {
parenthesis(p);
}
SyntaxKind::BEGIN_KW => {
if p.look_ahead(true) != SyntaxKind::SEMICOLON {
// BEGIN; should be treated as a statement terminator
begin_end(p);
} else {
p.advance();
}
}
t => match at_statement_start(t, exclude) {
Some(SyntaxKind::SELECT_KW) => {
let prev = p.look_back(true);
Expand All @@ -188,6 +223,8 @@ pub(crate) fn unknown(p: &mut Splitter, exclude: &[SyntaxKind]) {
// for revoke
SyntaxKind::REVOKE_KW,
SyntaxKind::COMMA,
// for BEGIN ATOMIC
SyntaxKind::ATOMIC_KW,
]
.iter()
.all(|x| Some(x) != prev.as_ref())
Expand Down Expand Up @@ -255,7 +292,6 @@ pub(crate) fn unknown(p: &mut Splitter, exclude: &[SyntaxKind]) {
}
p.advance();
}

Some(SyntaxKind::CREATE_KW) => {
let prev = p.look_back(true);
if [
Expand Down