mirrors/datafusion-sqlparse
1
0
Fork 0
mirror of https://github.com/apache/datafusion-sqlparser-rs.git synced 2025-10-07 04:30:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix column definition COLLATE parsing (#1986)
Some checks failed
Rust / lint (push) Has been cancelled
Details
license / Release Audit Tool (RAT) (push) Has been cancelled
Details
Rust / codestyle (push) Has been cancelled
Details
Rust / test (beta) (push) Has been cancelled
Details
Rust / test (nightly) (push) Has been cancelled
Details
Rust / test (stable) (push) Has been cancelled
Details
Rust / benchmark-lint (push) Has been cancelled
Details
Rust / compile (push) Has been cancelled
Details
Rust / docs (push) Has been cancelled
Details
Rust / compile-no-std (push) Has been cancelled
Details

Browse source
This commit is contained in:
Michael Victor Zink 2025-08-13 02:05:15 -07:00 • committed by GitHub
parent b2f977384c
commit 60a5c8d42a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 64 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/parser/mod.rs
View file

@ -1722,7 +1722,7 @@ impl<'a> Parser<'a> {
_ => self.expected_at("an expression", next_token_index),
}?;
if self.parse_keyword(Keyword::COLLATE) {
if !self.in_column_definition_state() && self.parse_keyword(Keyword::COLLATE) {
Ok(Expr::Collate {
expr: Box::new(expr),
collation: self.parse_object_name(false)?,
@ -3372,6 +3372,7 @@ impl<'a> Parser<'a> {
self.advance_token();
let tok = self.get_current_token();
debug!("infix: {tok:?}");
let tok_index = self.get_current_index();
let span = tok.span;
let regular_binary_operator = match &tok.token {
@ -17822,30 +17823,6 @@ mod tests {
assert!(Parser::parse_sql(&MySqlDialect {}, sql).is_err());
}
#[test]
fn test_parse_not_null_in_column_options() {
let canonical = concat!(
"CREATE TABLE foo (",
"abc INT DEFAULT (42 IS NOT NULL) NOT NULL,",
" def INT,",
" def_null BOOL GENERATED ALWAYS AS (def IS NOT NULL) STORED,",
" CHECK (abc IS NOT NULL)",
")"
);
all_dialects().verified_stmt(canonical);
all_dialects().one_statement_parses_to(
concat!(
"CREATE TABLE foo (",
"abc INT DEFAULT (42 NOT NULL) NOT NULL,",
" def INT,",
" def_null BOOL GENERATED ALWAYS AS (def NOT NULL) STORED,",
" CHECK (abc NOT NULL)",
")"
),
canonical,
);
}
#[test]
fn test_placeholder_invalid_whitespace() {
for w in [" ", "/*invalid*/"] {