Skip to content

Transaction support #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 9, 2019
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
11 changes: 11 additions & 0 deletions src/dialect/keywords.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ define_keywords!(
CAST,
CEIL,
CEILING,
CHAIN,
CHAR,
CHAR_LENGTH,
CHARACTER,
Expand All @@ -89,6 +90,7 @@ define_keywords!(
COLLECT,
COLUMN,
COMMIT,
COMMITTED,
CONDITION,
CONNECT,
CONSTRAINT,
Expand Down Expand Up @@ -194,6 +196,7 @@ define_keywords!(
INTERVAL,
INTO,
IS,
ISOLATION,
JOIN,
KEY,
LAG,
Expand All @@ -204,6 +207,7 @@ define_keywords!(
LEAD,
LEADING,
LEFT,
LEVEL,
LIKE,
LIKE_REGEX,
LIMIT,
Expand Down Expand Up @@ -277,6 +281,7 @@ define_keywords!(
PROCEDURE,
RANGE,
RANK,
READ,
READS,
REAL,
RECURSIVE,
Expand All @@ -294,6 +299,7 @@ define_keywords!(
REGR_SXY,
REGR_SYY,
RELEASE,
REPEATABLE,
RESTRICT,
RESULT,
RETURN,
Expand All @@ -312,6 +318,7 @@ define_keywords!(
SECOND,
SELECT,
SENSITIVE,
SERIALIZABLE,
SESSION_USER,
SET,
SIMILAR,
Expand Down Expand Up @@ -350,6 +357,7 @@ define_keywords!(
TIMEZONE_MINUTE,
TO,
TRAILING,
TRANSACTION,
TRANSLATE,
TRANSLATE_REGEX,
TRANSLATION,
Expand All @@ -361,6 +369,7 @@ define_keywords!(
TRUE,
UESCAPE,
UNBOUNDED,
UNCOMMITTED,
UNION,
UNIQUE,
UNKNOWN,
Expand Down Expand Up @@ -388,6 +397,8 @@ define_keywords!(
WITH,
WITHIN,
WITHOUT,
WRITE,
WORK,
YEAR,
ZONE,
END_EXEC = "END-EXEC"
Expand Down
82 changes: 82 additions & 0 deletions src/sqlast/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,14 @@ pub enum SQLStatement {
names: Vec<SQLObjectName>,
cascade: bool,
},
/// { BEGIN [ TRANSACTION | WORK ] | START TRANSACTION } ...
SQLStartTransaction { modes: Vec<TransactionMode> },
/// SET TRANSACTION ...
SQLSetTransaction { modes: Vec<TransactionMode> },
/// COMMIT [ TRANSACTION | WORK ] [ AND [ NO ] CHAIN ]
SQLCommit { chain: bool },
/// ROLLBACK [ TRANSACTION | WORK ] [ AND [ NO ] CHAIN ]
SQLRollback { chain: bool },
}

impl ToString for SQLStatement {
Expand Down Expand Up @@ -553,6 +561,28 @@ impl ToString for SQLStatement {
comma_separated_string(names),
if *cascade { " CASCADE" } else { "" },
),
SQLStatement::SQLStartTransaction { modes } => format!(
"START TRANSACTION{}",
if modes.is_empty() {
"".into()
} else {
format!(" {}", comma_separated_string(modes))
}
),
SQLStatement::SQLSetTransaction { modes } => format!(
"SET TRANSACTION{}",
if modes.is_empty() {
"".into()
} else {
format!(" {}", comma_separated_string(modes))
}
),
SQLStatement::SQLCommit { chain } => {
format!("COMMIT{}", if *chain { " AND CHAIN" } else { "" },)
}
SQLStatement::SQLRollback { chain } => {
format!("ROLLBACK{}", if *chain { " AND CHAIN" } else { "" },)
}
}
}
}
Expand Down Expand Up @@ -734,3 +764,55 @@ impl ToString for SQLOption {
format!("{} = {}", self.name.to_string(), self.value.to_string())
}
}

#[derive(Debug, Clone, PartialEq, Hash)]
pub enum TransactionMode {
AccessMode(TransactionAccessMode),
IsolationLevel(TransactionIsolationLevel),
}

impl ToString for TransactionMode {
fn to_string(&self) -> String {
use TransactionMode::*;
match self {
AccessMode(access_mode) => access_mode.to_string(),
IsolationLevel(iso_level) => format!("ISOLATION LEVEL {}", iso_level.to_string()),
}
}
}

#[derive(Debug, Clone, PartialEq, Hash)]
pub enum TransactionAccessMode {
ReadOnly,
ReadWrite,
}

impl ToString for TransactionAccessMode {
fn to_string(&self) -> String {
use TransactionAccessMode::*;
match self {
ReadOnly => "READ ONLY".into(),
ReadWrite => "READ WRITE".into(),
}
}
}

#[derive(Debug, Clone, PartialEq, Hash)]
pub enum TransactionIsolationLevel {
ReadUncommitted,
ReadCommitted,
RepeatableRead,
Serializable,
}

impl ToString for TransactionIsolationLevel {
fn to_string(&self) -> String {
use TransactionIsolationLevel::*;
match self {
ReadUncommitted => "READ UNCOMMITTED".into(),
ReadCommitted => "READ COMMITTED".into(),
RepeatableRead => "REPEATABLE READ".into(),
Serializable => "SERIALIZABLE".into(),
}
}
}
88 changes: 88 additions & 0 deletions src/sqlparser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,14 @@ impl Parser {
"UPDATE" => Ok(self.parse_update()?),
"ALTER" => Ok(self.parse_alter()?),
"COPY" => Ok(self.parse_copy()?),
"START" => Ok(self.parse_start_transaction()?),
"SET" => Ok(self.parse_set_transaction()?),
// `BEGIN` is a nonstandard but common alias for the
// standard `START TRANSACTION` statement. It is supported
// by at least PostgreSQL and MySQL.
"BEGIN" => Ok(self.parse_begin()?),
"COMMIT" => Ok(self.parse_commit()?),
"ROLLBACK" => Ok(self.parse_rollback()?),
_ => parser_err!(format!(
"Unexpected keyword {:?} at the beginning of a statement",
w.to_string()
Expand Down Expand Up @@ -1832,6 +1840,86 @@ impl Parser {
}
Ok(SQLValues(values))
}

pub fn parse_start_transaction(&mut self) -> Result<SQLStatement, ParserError> {
self.expect_keyword("TRANSACTION")?;
Ok(SQLStatement::SQLStartTransaction {
modes: self.parse_transaction_modes()?,
})
}

pub fn parse_begin(&mut self) -> Result<SQLStatement, ParserError> {
let _ = self.parse_one_of_keywords(&["TRANSACTION", "WORK"]);
Ok(SQLStatement::SQLStartTransaction {
modes: self.parse_transaction_modes()?,
})
}

pub fn parse_set_transaction(&mut self) -> Result<SQLStatement, ParserError> {
self.expect_keyword("TRANSACTION")?;
Ok(SQLStatement::SQLSetTransaction {
modes: self.parse_transaction_modes()?,
})
}

pub fn parse_transaction_modes(&mut self) -> Result<Vec<TransactionMode>, ParserError> {
let mut modes = vec![];
let mut required = false;
loop {
let mode = if self.parse_keywords(vec!["ISOLATION", "LEVEL"]) {
let iso_level = if self.parse_keywords(vec!["READ", "UNCOMMITTED"]) {
TransactionIsolationLevel::ReadUncommitted
} else if self.parse_keywords(vec!["READ", "COMMITTED"]) {
TransactionIsolationLevel::ReadCommitted
} else if self.parse_keywords(vec!["REPEATABLE", "READ"]) {
TransactionIsolationLevel::RepeatableRead
} else if self.parse_keyword("SERIALIZABLE") {
TransactionIsolationLevel::Serializable
} else {
self.expected("isolation level", self.peek_token())?
};
TransactionMode::IsolationLevel(iso_level)
} else if self.parse_keywords(vec!["READ", "ONLY"]) {
TransactionMode::AccessMode(TransactionAccessMode::ReadOnly)
} else if self.parse_keywords(vec!["READ", "WRITE"]) {
TransactionMode::AccessMode(TransactionAccessMode::ReadWrite)
} else if required || self.peek_token().is_some() {
self.expected("transaction mode", self.peek_token())?
} else {
break;
};
modes.push(mode);
// ANSI requires a comma after each transaction mode, but
// PostgreSQL, for historical reasons, does not. We follow
// PostgreSQL in making the comma optional, since that is strictly
// more general.
required = self.consume_token(&Token::Comma);
}
Ok(modes)
}

pub fn parse_commit(&mut self) -> Result<SQLStatement, ParserError> {
Ok(SQLStatement::SQLCommit {
chain: self.parse_commit_rollback_chain()?,
})
}

pub fn parse_rollback(&mut self) -> Result<SQLStatement, ParserError> {
Ok(SQLStatement::SQLRollback {
chain: self.parse_commit_rollback_chain()?,
})
}

pub fn parse_commit_rollback_chain(&mut self) -> Result<bool, ParserError> {
let _ = self.parse_one_of_keywords(&["TRANSACTION", "WORK"]);
if self.parse_keyword("AND") {
let chain = !self.parse_keyword("NO");
self.expect_keyword("CHAIN")?;
Ok(chain)
} else {
Ok(false)
}
}
}

impl SQLWord {
Expand Down
Loading