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.

Sign up for GitHub

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

Jump to bottom

feat: Add WITH OFFSET Alias #528

Merged
merged 2 commits into from Jun 29, 2022
Merged

feat: Add WITH OFFSET Alias #528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9a17d9
feat: Add WITH OFFSET Alias
sivchari Jun 25, 2022
508bbe9
update: fix with_offset_alias type
sivchari Jun 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/ast/query.rs
View file
Open in desktop
Expand Up @@ -367,6 +367,7 @@ pub enum TableFactor {
alias: Option<TableAlias>,
array_expr: Box<Expr>,
with_offset: bool,
with_offset_alias: Option<Ident>,
},
/// Represents a parenthesized table factor. The SQL spec only allows a
/// join expression (`(foo <JOIN> bar [ <JOIN> baz ... ])`) to be nested,
Expand Down Expand Up @@ -423,6 +424,7 @@ impl fmt::Display for TableFactor {
alias,
array_expr,
with_offset,
with_offset_alias,
} => {
write!(f, "UNNEST({})", array_expr)?;
if let Some(alias) = alias {
Expand All @@ -431,6 +433,9 @@ impl fmt::Display for TableFactor {
if *with_offset {
write!(f, " WITH OFFSET")?;
}
if let Some(alias) = with_offset_alias {
write!(f, " AS {}", alias)?;
}
Ok(())
}
TableFactor::NestedJoin(table_reference) => write!(f, "({})", table_reference),
Expand Down
8 changes: 8 additions & 0 deletions src/parser.rs
View file
Open in desktop
Expand Up @@ -3839,10 +3839,18 @@ impl<'a> Parser<'a> {
Err(_) => false,
};

let with_offset_alias =
match self.parse_optional_alias(keywords::RESERVED_FOR_COLUMN_ALIAS) {
Ok(Some(alias)) => Some(alias),
Ok(None) => None,
Err(e) => return Err(e),
};

Ok(TableFactor::UNNEST {
alias,
array_expr: Box::new(expr),
with_offset,
with_offset_alias,
})
} else {
let name = self.parse_object_name()?;
Expand Down
42 changes: 40 additions & 2 deletions tests/sqlparser_common.rs
View file
Open in desktop
Expand Up @@ -2837,11 +2837,22 @@ fn parse_table_function() {

#[test]
fn parse_unnest() {
fn chk(alias: bool, with_offset: bool, dialects: &TestedDialects, want: Vec<TableWithJoins>) {
fn chk(
alias: bool,
with_offset: bool,
with_offset_alias: bool,
dialects: &TestedDialects,
want: Vec<TableWithJoins>,
) {
let sql = &format!(
"SELECT * FROM UNNEST(expr){}{}",
"SELECT * FROM UNNEST(expr){}{}{}",
if alias { " AS numbers" } else { "" },
if with_offset { " WITH OFFSET" } else { "" },
if with_offset_alias {
" AS with_offset_alias"
} else {
""
},
);
let select = dialects.verified_only_select(sql);
assert_eq!(select.from, want);
Expand All @@ -2853,6 +2864,7 @@ fn parse_unnest() {
chk(
true,
true,
false,
&dialects,
vec![TableWithJoins {
relation: TableFactor::UNNEST {
Expand All @@ -2862,12 +2874,14 @@ fn parse_unnest() {
}),
array_expr: Box::new(Expr::Identifier(Ident::new("expr"))),
with_offset: true,
with_offset_alias: None,
},
joins: vec![],
}],
);
// 2. neither Alias nor WITH OFFSET clause.
chk(
false,
false,
false,
&dialects,
Expand All @@ -2876,6 +2890,7 @@ fn parse_unnest() {
alias: None,
array_expr: Box::new(Expr::Identifier(Ident::new("expr"))),
with_offset: false,
with_offset_alias: None,
},
joins: vec![],
}],
Expand All @@ -2884,12 +2899,14 @@ fn parse_unnest() {
chk(
false,
true,
false,
&dialects,
vec![TableWithJoins {
relation: TableFactor::UNNEST {
alias: None,
array_expr: Box::new(Expr::Identifier(Ident::new("expr"))),
with_offset: true,
with_offset_alias: None,
},
joins: vec![],
}],
Expand All @@ -2898,6 +2915,26 @@ fn parse_unnest() {
chk(
true,
false,
false,
&dialects,
vec![TableWithJoins {
relation: TableFactor::UNNEST {
alias: Some(TableAlias {
name: Ident::new("numbers"),
columns: vec![],
}),
array_expr: Box::new(Expr::Identifier(Ident::new("expr"))),
with_offset: false,
with_offset_alias: None,
},
joins: vec![],
}],
);
// 5. WITH OFFSET and WITH OFFSET Alias
chk(
true,
false,
true,
&dialects,
vec![TableWithJoins {
relation: TableFactor::UNNEST {
Expand All @@ -2907,6 +2944,7 @@ fn parse_unnest() {
}),
array_expr: Box::new(Expr::Identifier(Ident::new("expr"))),
with_offset: false,
with_offset_alias: Some(Ident::new("with_offset_alias")),
},
joins: vec![],
}],
Expand Down