Skip to content

feat: support multi value column unpivot & alias in unpivot #1969

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+152 −30
Open

feat: support multi value column unpivot & alias in unpivot #1969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fad46e3
feat: support multi value column unpivot
chenkovsky Jul 23, 2025
68d5cbd
update
chenkovsky Jul 29, 2025
9ccbd73
fmt
chenkovsky Jul 29, 2025
7ef9db9
add test & use parse_expr
chenkovsky Jul 31, 2025
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
5 changes: 3 additions & 2 deletions src/ast/query.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1349,11 +1349,12 @@ pub enum TableFactor {
/// ```
///
/// See <https://docs.snowflake.com/en/sql-reference/constructs/unpivot>.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we include the link to the databricks documentation here as well?

/// See <https://docs.databricks.com/aws/en/sql/language-manual/sql-ref-syntax-qry-select-unpivot>.
Unpivot {
table: Box<TableFactor>,
value: Ident,
value: Expr,
name: Ident,
columns: Vec<Ident>,
columns: Vec<ExprWithAlias>,
null_inclusion: Option<NullInclusion>,
alias: Option<TableAlias>,
},
Expand Down
4 changes: 2 additions & 2 deletions src/ast/spans.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1985,9 +1985,9 @@ impl Spanned for TableFactor {
alias,
} => union_spans(
core::iter::once(table.span())
.chain(core::iter::once(value.span))
.chain(core::iter::once(value.span()))
.chain(core::iter::once(name.span))
.chain(columns.iter().map(|i| i.span))
.chain(columns.iter().map(|ilist| ilist.span()))
.chain(alias.as_ref().map(|alias| alias.span())),
),
TableFactor::MatchRecognize {
Expand Down
14 changes: 12 additions & 2 deletions src/parser/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10810,6 +10810,16 @@ impl<'a> Parser<'a> {
}
}

pub fn parse_parenthesized_columns_with_alias_list(
&mut self,
optional: IsOptional,
allow_empty: bool,
) -> Result<Vec<ExprWithAlias>, ParserError> {
self.parse_parenthesized_column_list_inner(optional, allow_empty, |p| {
p.parse_expr_with_alias()
})
}

/// Parses a parenthesized comma-separated list of unqualified, possibly quoted identifiers.
/// For example: `(col1, "col 2", ...)`
pub fn parse_parenthesized_column_list(
Expand Down Expand Up @@ -13882,11 +13892,11 @@ impl<'a> Parser<'a> {
None
};
self.expect_token(&Token::LParen)?;
let value = self.parse_identifier()?;
let value = self.parse_expr()?;
self.expect_keyword_is(Keyword::FOR)?;
let name = self.parse_identifier()?;
self.expect_keyword_is(Keyword::IN)?;
let columns = self.parse_parenthesized_column_list(Mandatory, false)?;
let columns = self.parse_parenthesized_columns_with_alias_list(Mandatory, false)?;
self.expect_token(&Token::RParen)?;
let alias = self.maybe_parse_table_alias()?;
Ok(TableFactor::Unpivot {
Expand Down
159 changes: 135 additions & 24 deletions tests/sqlparser_common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10947,20 +10947,14 @@ fn parse_unpivot_table() {
index_hints: vec![],
}),
null_inclusion: None,
value: Ident {
value: "quantity".to_string(),
quote_style: None,
span: Span::empty(),
},

name: Ident {
value: "quarter".to_string(),
quote_style: None,
span: Span::empty(),
},
value: Expr::Identifier(Ident::new("quantity")),
name: Ident::new("quarter"),
columns: ["Q1", "Q2", "Q3", "Q4"]
.into_iter()
.map(Ident::new)
.map(|col| ExprWithAlias {
expr: Expr::Identifier(Ident::new(col)),
alias: None,
})
.collect(),
alias: Some(TableAlias {
name: Ident::new("u"),
Expand Down Expand Up @@ -11022,6 +11016,129 @@ fn parse_unpivot_table() {
verified_stmt(sql_unpivot_include_nulls).to_string(),
sql_unpivot_include_nulls
);

let sql_unpivot_with_alias = concat!(
"SELECT * FROM sales AS s ",
"UNPIVOT INCLUDE NULLS ",
"(quantity FOR quarter IN ",
"(Q1 AS Quater1, Q2 AS Quater2, Q3 AS Quater3, Q4 AS Quater4)) ",
"AS u (product, quarter, quantity)"
);

if let Unpivot { value, columns, .. } =
&verified_only_select(sql_unpivot_with_alias).from[0].relation
{
assert_eq!(
*columns,
vec![
ExprWithAlias {
expr: Expr::Identifier(Ident::new("Q1")),
alias: Some(Ident::new("Quater1")),
},
ExprWithAlias {
expr: Expr::Identifier(Ident::new("Q2")),
alias: Some(Ident::new("Quater2")),
},
ExprWithAlias {
expr: Expr::Identifier(Ident::new("Q3")),
alias: Some(Ident::new("Quater3")),
},
ExprWithAlias {
expr: Expr::Identifier(Ident::new("Q4")),
alias: Some(Ident::new("Quater4")),
},
]
);
assert_eq!(*value, Expr::Identifier(Ident::new("quantity")));
}

assert_eq!(
verified_stmt(sql_unpivot_with_alias).to_string(),
sql_unpivot_with_alias
);

let sql_unpivot_with_alias_and_multi_value = concat!(
"SELECT * FROM sales AS s ",
"UNPIVOT INCLUDE NULLS ((first_quarter, second_quarter) ",
"FOR half_of_the_year IN (",
"(Q1, Q2) AS H1, ",
"(Q3, Q4) AS H2",
"))"
);

if let Unpivot { value, columns, .. } =
&verified_only_select(sql_unpivot_with_alias_and_multi_value).from[0].relation
{
assert_eq!(
*columns,
vec![
ExprWithAlias {
expr: Expr::Tuple(vec![
Expr::Identifier(Ident::new("Q1")),
Expr::Identifier(Ident::new("Q2")),
]),
alias: Some(Ident::new("H1")),
},
ExprWithAlias {
expr: Expr::Tuple(vec![
Expr::Identifier(Ident::new("Q3")),
Expr::Identifier(Ident::new("Q4")),
]),
alias: Some(Ident::new("H2")),
},
]
);
assert_eq!(
*value,
Expr::Tuple(vec![
Expr::Identifier(Ident::new("first_quarter")),
Expr::Identifier(Ident::new("second_quarter")),
])
);
}

assert_eq!(
verified_stmt(sql_unpivot_with_alias_and_multi_value).to_string(),
sql_unpivot_with_alias_and_multi_value
);

let sql_unpivot_with_alias_and_multi_value_and_qualifier = concat!(
"SELECT * FROM sales AS s ",
"UNPIVOT INCLUDE NULLS ((first_quarter, second_quarter) ",
"FOR half_of_the_year IN (",
"(sales.Q1, sales.Q2) AS H1, ",
"(sales.Q3, sales.Q4) AS H2",
"))"
);

if let Unpivot { columns, .. } =
&verified_only_select(sql_unpivot_with_alias_and_multi_value_and_qualifier).from[0].relation
{
assert_eq!(
*columns,
vec![
ExprWithAlias {
expr: Expr::Tuple(vec![
Expr::CompoundIdentifier(vec![Ident::new("sales"), Ident::new("Q1"),]),
Expr::CompoundIdentifier(vec![Ident::new("sales"), Ident::new("Q2"),]),
]),
alias: Some(Ident::new("H1")),
},
ExprWithAlias {
expr: Expr::Tuple(vec![
Expr::CompoundIdentifier(vec![Ident::new("sales"), Ident::new("Q3"),]),
Expr::CompoundIdentifier(vec![Ident::new("sales"), Ident::new("Q4"),]),
]),
alias: Some(Ident::new("H2")),
},
]
);
}

assert_eq!(
verified_stmt(sql_unpivot_with_alias_and_multi_value_and_qualifier).to_string(),
sql_unpivot_with_alias_and_multi_value_and_qualifier
);
}

#[test]
Expand Down Expand Up @@ -11119,20 +11236,14 @@ fn parse_pivot_unpivot_table() {
index_hints: vec![],
}),
null_inclusion: None,
value: Ident {
value: "population".to_string(),
quote_style: None,
span: Span::empty()
},

name: Ident {
value: "year".to_string(),
quote_style: None,
span: Span::empty()
},
value: Expr::Identifier(Ident::new("population")),
name: Ident::new("year"),
columns: ["population_2000", "population_2010"]
.into_iter()
.map(Ident::new)
.map(|col| ExprWithAlias {
expr: Expr::Identifier(Ident::new(col)),
alias: None,
})
.collect(),
alias: Some(TableAlias {
name: Ident::new("u"),
Expand Down