Skip to content
Open
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
1 change: 1 addition & 0 deletions fuzz/fuzz_seeds/postgres_2778_row_lock_strengths.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SELECT id FROM t FOR NO KEY UPDATE OF t SKIP LOCKED FOR KEY SHARE NOWAIT
6 changes: 6 additions & 0 deletions src/ast/query.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3665,13 +3665,19 @@ pub enum LockType {
Share,
/// `UPDATE` lock (exclusive/update lock).
Update,
/// `NO KEY UPDATE` lock (PostgreSQL).
NoKeyUpdate,
/// `KEY SHARE` lock (PostgreSQL).
KeyShare,
}

impl fmt::Display for LockType {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
let select_lock = match self {
LockType::Share => "SHARE",
LockType::Update => "UPDATE",
LockType::NoKeyUpdate => "NO KEY UPDATE",
LockType::KeyShare => "KEY SHARE",
};
write!(f, "{select_lock}")
}
Expand Down
25 changes: 18 additions & 7 deletions src/parser/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21013,14 +21013,25 @@ impl<'a> Parser<'a> {
})
}

/// Parse a FOR UPDATE/FOR SHARE clause
/// Parse a `FOR` row-locking clause
pub fn parse_lock(&mut self) -> Result<LockClause, ParserError> {
let lock_type = match self.expect_one_of_keywords(&[Keyword::UPDATE, Keyword::SHARE])? {
Keyword::UPDATE => LockType::Update,
Keyword::SHARE => LockType::Share,
unexpected_keyword => return Err(ParserError::ParserError(
format!("Internal parser error: expected any of {{UPDATE, SHARE}}, got {unexpected_keyword:?}"),
)),
let lock_type = match self.parse_one_of_keywords(&[
Keyword::UPDATE,
Keyword::SHARE,
Keyword::NO,
Keyword::KEY,
]) {
Some(Keyword::UPDATE) => LockType::Update,
Some(Keyword::SHARE) => LockType::Share,
Some(Keyword::NO) => {
self.expect_keywords(&[Keyword::KEY, Keyword::UPDATE])?;
LockType::NoKeyUpdate
}
Some(Keyword::KEY) => {
self.expect_keyword(Keyword::SHARE)?;
LockType::KeyShare
}
_ => return self.expected_ref("one of UPDATE or SHARE", self.peek_token_ref()),
};
let of = if self.parse_keyword(Keyword::OF) {
Some(self.parse_object_name(false)?)
Expand Down
41 changes: 41 additions & 0 deletions tests/sqlparser_postgres.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13518,3 +13518,44 @@ fn parse_case_ending_in_end_keyword_is_not_silently_dropped() {
ParserError::ParserError("Expected: end of statement, found: END".to_string())
);
}

#[test]
fn parse_select_for_key_lock_strengths() {
for (sql, lock_type) in [
("SELECT id FROM t FOR NO KEY UPDATE", LockType::NoKeyUpdate),
(
"SELECT id FROM t FOR NO KEY UPDATE OF t SKIP LOCKED",
LockType::NoKeyUpdate,
),
("SELECT id FROM t FOR KEY SHARE", LockType::KeyShare),
(
"SELECT id FROM t FOR KEY SHARE OF t NOWAIT",
LockType::KeyShare,
),
] {
let query = pg_and_generic().verified_query(sql);
assert_eq!(query.locks.len(), 1, "{sql}");
assert_eq!(query.locks[0].lock_type, lock_type, "{sql}");
}

for (sql, expected) in [
(
"SELECT id FROM t FOR NO KEY",
"Expected: UPDATE, found: EOF",
),
(
"SELECT id FROM t FOR NO KEY SHARE",
"Expected: UPDATE, found: SHARE",
),
(
"SELECT id FROM t FOR KEY UPDATE",
"Expected: SHARE, found: UPDATE",
),
] {
assert_eq!(
pg_and_generic().parse_sql_statements(sql).unwrap_err(),
ParserError::ParserError(expected.to_string()),
"{sql}"
);
}
}
Loading