mirror of
https://github.com/apache/datafusion-sqlparser-rs.git
synced 2025-09-26 23:49:10 +00:00
Support wildcard metrics for SEMANTIC_VIEW
(#2016)
Some checks are pending
license / Release Audit Tool (RAT) (push) Waiting to run
Rust / codestyle (push) Waiting to run
Rust / lint (push) Waiting to run
Rust / benchmark-lint (push) Waiting to run
Rust / compile (push) Waiting to run
Rust / docs (push) Waiting to run
Rust / compile-no-std (push) Waiting to run
Rust / test (beta) (push) Waiting to run
Rust / test (nightly) (push) Waiting to run
Rust / test (stable) (push) Waiting to run
Some checks are pending
license / Release Audit Tool (RAT) (push) Waiting to run
Rust / codestyle (push) Waiting to run
Rust / lint (push) Waiting to run
Rust / benchmark-lint (push) Waiting to run
Rust / compile (push) Waiting to run
Rust / docs (push) Waiting to run
Rust / compile-no-std (push) Waiting to run
Rust / test (beta) (push) Waiting to run
Rust / test (nightly) (push) Waiting to run
Rust / test (stable) (push) Waiting to run
This commit is contained in:
parent
bc478b0531
commit
ee707c72a7
3 changed files with 7 additions and 4 deletions
|
@ -1429,7 +1429,7 @@ pub enum TableFactor {
|
||||||
/// List of dimensions or expression referring to dimensions (e.g. DATE_PART('year', col))
|
/// List of dimensions or expression referring to dimensions (e.g. DATE_PART('year', col))
|
||||||
dimensions: Vec<Expr>,
|
dimensions: Vec<Expr>,
|
||||||
/// List of metrics (references to objects like orders.value, value, orders.*)
|
/// List of metrics (references to objects like orders.value, value, orders.*)
|
||||||
metrics: Vec<ObjectName>,
|
metrics: Vec<Expr>,
|
||||||
/// List of facts or expressions referring to facts or dimensions.
|
/// List of facts or expressions referring to facts or dimensions.
|
||||||
facts: Vec<Expr>,
|
facts: Vec<Expr>,
|
||||||
/// WHERE clause for filtering
|
/// WHERE clause for filtering
|
||||||
|
|
|
@ -13958,7 +13958,7 @@ impl<'a> Parser<'a> {
|
||||||
"METRICS clause can only be specified once".to_string(),
|
"METRICS clause can only be specified once".to_string(),
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
metrics = self.parse_comma_separated(|parser| parser.parse_object_name(true))?;
|
metrics = self.parse_comma_separated(Parser::parse_wildcard_expr)?;
|
||||||
} else if self.parse_keyword(Keyword::FACTS) {
|
} else if self.parse_keyword(Keyword::FACTS) {
|
||||||
if !facts.is_empty() {
|
if !facts.is_empty() {
|
||||||
return Err(ParserError::ParserError(
|
return Err(ParserError::ParserError(
|
||||||
|
@ -13975,7 +13975,10 @@ impl<'a> Parser<'a> {
|
||||||
where_clause = Some(self.parse_expr()?);
|
where_clause = Some(self.parse_expr()?);
|
||||||
} else {
|
} else {
|
||||||
return parser_err!(
|
return parser_err!(
|
||||||
"Expected one of DIMENSIONS, METRICS, FACTS or WHERE",
|
format!(
|
||||||
|
"Expected one of DIMENSIONS, METRICS, FACTS or WHERE, got {}",
|
||||||
|
self.peek_token().token
|
||||||
|
),
|
||||||
self.peek_token().span.start
|
self.peek_token().span.start
|
||||||
)?;
|
)?;
|
||||||
}
|
}
|
||||||
|
|
|
@ -16951,6 +16951,7 @@ fn test_parse_semantic_view_table_factor() {
|
||||||
"SELECT * FROM SEMANTIC_VIEW(model METRICS orders.col, orders.col2)",
|
"SELECT * FROM SEMANTIC_VIEW(model METRICS orders.col, orders.col2)",
|
||||||
None,
|
None,
|
||||||
),
|
),
|
||||||
|
("SELECT * FROM SEMANTIC_VIEW(model METRICS orders.*)", None),
|
||||||
// We can parse in any order but will always produce a result in a fixed order.
|
// We can parse in any order but will always produce a result in a fixed order.
|
||||||
(
|
(
|
||||||
"SELECT * FROM SEMANTIC_VIEW(model WHERE x > 0 DIMENSIONS dim1)",
|
"SELECT * FROM SEMANTIC_VIEW(model WHERE x > 0 DIMENSIONS dim1)",
|
||||||
|
@ -16980,7 +16981,6 @@ fn test_parse_semantic_view_table_factor() {
|
||||||
let invalid_sqls = [
|
let invalid_sqls = [
|
||||||
"SELECT * FROM SEMANTIC_VIEW(model DIMENSIONS dim1 INVALID inv1)",
|
"SELECT * FROM SEMANTIC_VIEW(model DIMENSIONS dim1 INVALID inv1)",
|
||||||
"SELECT * FROM SEMANTIC_VIEW(model DIMENSIONS dim1 DIMENSIONS dim2)",
|
"SELECT * FROM SEMANTIC_VIEW(model DIMENSIONS dim1 DIMENSIONS dim2)",
|
||||||
"SELECT * FROM SEMANTIC_VIEW(model METRICS SUM(met1.avg))",
|
|
||||||
];
|
];
|
||||||
|
|
||||||
for sql in invalid_sqls {
|
for sql in invalid_sqls {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue