Skip to content
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

Add support for PostgreSQL LISTEN/NOTIFY syntax #1485

Merged
merged 1 commit into from
Nov 6, 2024
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
28 changes: 28 additions & 0 deletions src/ast/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3295,6 +3295,23 @@ pub enum Statement {
include_final: bool,
deduplicate: Option<Deduplicate>,
},
/// ```sql
/// LISTEN
/// ```
/// listen for a notification channel
///
/// See Postgres <https://www.postgresql.org/docs/current/sql-listen.html>
LISTEN { channel: Ident },
/// ```sql
/// NOTIFY channel [ , payload ]
/// ```
/// send a notification event together with an optional “payload” string to channel
///
/// See Postgres <https://www.postgresql.org/docs/current/sql-notify.html>
NOTIFY {
channel: Ident,
payload: Option<String>,
},
}

impl fmt::Display for Statement {
Expand Down Expand Up @@ -4839,6 +4856,17 @@ impl fmt::Display for Statement {
}
Ok(())
}
Statement::LISTEN { channel } => {
write!(f, "LISTEN {channel}")?;
Ok(())
}
Statement::NOTIFY { channel, payload } => {
write!(f, "NOTIFY {channel}")?;
if let Some(payload) = payload {
write!(f, ", '{payload}'")?;
}
Ok(())
}
}
}
}
Expand Down
10 changes: 10 additions & 0 deletions src/dialect/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -590,6 +590,16 @@ pub trait Dialect: Debug + Any {
fn supports_try_convert(&self) -> bool {
false
}

/// Returns true if the dialect supports the `LISTEN` statement
fn supports_listen(&self) -> bool {
false
}

/// Returns true if the dialect supports the `NOTIFY` statement
fn supports_notify(&self) -> bool {
false
}
}

/// This represents the operators for which precedence must be defined
Expand Down
10 changes: 10 additions & 0 deletions src/dialect/postgresql.rs
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,16 @@ impl Dialect for PostgreSqlDialect {
fn supports_explain_with_utility_options(&self) -> bool {
true
}

/// see <https://www.postgresql.org/docs/current/sql-listen.html>
wugeer marked this conversation as resolved.
Show resolved Hide resolved
fn supports_listen(&self) -> bool {
true
}

/// see <https://www.postgresql.org/docs/current/sql-notify.html>
fn supports_notify(&self) -> bool {
true
}
}

pub fn parse_comment(parser: &mut Parser) -> Result<Statement, ParserError> {
Expand Down
2 changes: 2 additions & 0 deletions src/keywords.rs
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,7 @@ define_keywords!(
LIKE_REGEX,
LIMIT,
LINES,
LISTEN,
LN,
LOAD,
LOCAL,
Expand Down Expand Up @@ -513,6 +514,7 @@ define_keywords!(
NOSUPERUSER,
NOT,
NOTHING,
NOTIFY,
NOWAIT,
NO_WRITE_TO_BINLOG,
NTH_VALUE,
Expand Down
19 changes: 19 additions & 0 deletions src/parser/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -532,6 +532,10 @@ impl<'a> Parser<'a> {
Keyword::EXECUTE => self.parse_execute(),
Keyword::PREPARE => self.parse_prepare(),
Keyword::MERGE => self.parse_merge(),
// `LISTEN` and `NOTIFY` are Postgres-specific
// syntaxes. They are used for Postgres statement.
Keyword::LISTEN if self.dialect.supports_listen() => self.parse_listen(),
Keyword::NOTIFY if self.dialect.supports_notify() => self.parse_notify(),
// `PRAGMA` is sqlite specific https://www.sqlite.org/pragma.html
Keyword::PRAGMA => self.parse_pragma(),
Keyword::UNLOAD => self.parse_unload(),
Expand Down Expand Up @@ -946,6 +950,21 @@ impl<'a> Parser<'a> {
Ok(Statement::ReleaseSavepoint { name })
}

pub fn parse_listen(&mut self) -> Result<Statement, ParserError> {
let channel = self.parse_identifier(false)?;
Ok(Statement::LISTEN { channel })
}

pub fn parse_notify(&mut self) -> Result<Statement, ParserError> {
let channel = self.parse_identifier(false)?;
let payload = if self.consume_token(&Token::Comma) {
Some(self.parse_literal_string()?)
} else {
None
};
Ok(Statement::NOTIFY { channel, payload })
}

/// Parse an expression prefix.
pub fn parse_prefix(&mut self) -> Result<Expr, ParserError> {
// allow the dialect to override prefix parsing
Expand Down
76 changes: 76 additions & 0 deletions tests/sqlparser_common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11399,3 +11399,79 @@ fn test_show_dbs_schemas_tables_views() {
verified_stmt("SHOW MATERIALIZED VIEWS FROM db1");
verified_stmt("SHOW MATERIALIZED VIEWS FROM db1 'abc'");
}

#[test]
fn parse_listen_channel() {
let dialects = all_dialects_where(|d| d.supports_listen());

match dialects.verified_stmt("LISTEN test1") {
Statement::LISTEN { channel } => {
assert_eq!(Ident::new("test1"), channel);
}
_ => unreachable!(),
};

assert_eq!(
dialects.parse_sql_statements("LISTEN *").unwrap_err(),
ParserError::ParserError("Expected: identifier, found: *".to_string())
);

let dialects = all_dialects_where(|d| !d.supports_listen());

assert_eq!(
dialects.parse_sql_statements("LISTEN test1").unwrap_err(),
ParserError::ParserError("Expected: an SQL statement, found: LISTEN".to_string())
);
}

#[test]
fn parse_notify_channel() {
let dialects = all_dialects_where(|d| d.supports_notify());

match dialects.verified_stmt("NOTIFY test1") {
Statement::NOTIFY { channel, payload } => {
assert_eq!(Ident::new("test1"), channel);
assert_eq!(payload, None);
}
_ => unreachable!(),
};

match dialects.verified_stmt("NOTIFY test1, 'this is a test notification'") {
Statement::NOTIFY {
channel,
payload: Some(payload),
} => {
assert_eq!(Ident::new("test1"), channel);
assert_eq!("this is a test notification", payload);
}
_ => unreachable!(),
};

assert_eq!(
dialects.parse_sql_statements("NOTIFY *").unwrap_err(),
ParserError::ParserError("Expected: identifier, found: *".to_string())
);
assert_eq!(
dialects
.parse_sql_statements("NOTIFY test1, *")
.unwrap_err(),
ParserError::ParserError("Expected: literal string, found: *".to_string())
);

let sql_statements = [
"NOTIFY test1",
"NOTIFY test1, 'this is a test notification'",
];
let dialects = all_dialects_where(|d| !d.supports_notify());

for &sql in &sql_statements {
assert_eq!(
dialects.parse_sql_statements(sql).unwrap_err(),
ParserError::ParserError("Expected: an SQL statement, found: NOTIFY".to_string())
);
assert_eq!(
dialects.parse_sql_statements(sql).unwrap_err(),
ParserError::ParserError("Expected: an SQL statement, found: NOTIFY".to_string())
);
}
}
Loading