Skip to content

Spark, Databricks: allow an interval string without a unit #2614

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
moshap-firebolt wants to merge 1 commit into
base: main
Choose a base branch
from
+46 −2
Open

Spark, Databricks: allow an interval string without a unit #2614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/dialect/databricks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,9 @@ impl Dialect for DatabricksDialect {
true
}

/// See <https://docs.databricks.com/aws/en/sql/language-manual/data-types/interval-type>
fn require_interval_qualifier(&self) -> bool {
true
false
}

// See https://docs.databricks.com/en/sql/language-manual/functions/struct.html
Expand Down
3 changes: 2 additions & 1 deletion src/dialect/spark.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,9 @@ impl Dialect for SparkSqlDialect {
true
}

/// See <https://spark.apache.org/docs/latest/sql-ref-literals.html#interval-literal>
fn require_interval_qualifier(&self) -> bool {
true
false
}

fn supports_bang_not_operator(&self) -> bool {
Expand Down
21 changes: 21 additions & 0 deletions tests/sqlparser_databricks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,3 +769,24 @@ fn parse_databricks_collated_data_types() {
.parse_sql_statements("CREATE TABLE t (c ARRAY<STRING COLLATE UTF8_LCASE>)")
.is_err());
}

#[test]
fn test_interval_literals() {
// A string carries its own units; a unit after it is still read.
for sql in [
"SELECT INTERVAL '2 months'",
"SELECT INTERVAL '-1 day 1 hour'",
"SELECT INTERVAL '1' DAY",
"SELECT INTERVAL 3 DAY",
"SELECT INTERVAL '1-2' YEAR TO MONTH",
"SELECT -INTERVAL '1 year'",
"SELECT INTERVAL '2 seconds' * 2",
"SELECT d + INTERVAL '1' DAY FROM t",
] {
databricks().verified_stmt(sql);
}
match databricks().verified_expr("INTERVAL '2 months'") {
Expr::Interval(i) => assert!(i.leading_field.is_none()),
other => panic!("Expected an interval, got {other:?}"),
}
}

@LucaCappelletti94 LucaCappelletti94 Oct 6, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
}
}
#[test]
fn test_interval_numeric_requires_unit() {
assert_eq!(
databricks()
.parse_sql_statements("SELECT INTERVAL 1")
.unwrap_err()
.to_string(),
"sql parser error: INTERVAL requires a unit after the literal value"
);
}
#[test]
fn test_interval_rejects_value_arithmetic() {
assert!(databricks()
.parse_sql_statements("SELECT INTERVAL 1 + 1 DAY")
.is_err());
}
#[test]
fn test_interval_preserves_column_query() {
let query = databricks()
.run_parser_method("SELECT interval FROM t", |parser| parser.parse_query())
.unwrap();
let SetExpr::Select(select) = *query.body else {
panic!("Expected SELECT");
};
assert_eq!(
select.from,
vec![TableWithJoins {
relation: table("t"),
joins: vec![],
}]
);
assert_eq!(
select.projection,
vec![SelectItem::UnnamedExpr(Expr::Identifier(Ident::new(
"interval"
)))]
);
}

21 changes: 21 additions & 0 deletions tests/sqlparser_spark.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,3 +362,24 @@ fn test_substring() {
fn test_pipe_operator() {
spark().verified_stmt("SELECT * FROM t |> WHERE x > 1 |> SELECT x AS y |> ORDER BY y");
}

#[test]
fn test_interval_literals() {
// A string carries its own units; a unit after it is still read.
for sql in [
"SELECT INTERVAL '2 months'",
"SELECT INTERVAL '-1 day 1 hour'",
"SELECT INTERVAL '1' DAY",
"SELECT INTERVAL 3 DAY",
"SELECT INTERVAL '1-2' YEAR TO MONTH",
"SELECT -INTERVAL '1 year'",
"SELECT INTERVAL '2 seconds' * 2",
"SELECT d + INTERVAL '1' DAY FROM t",
] {
spark().verified_stmt(sql);
}
match spark().verified_expr("INTERVAL '2 months'") {
Expr::Interval(i) => assert!(i.leading_field.is_none()),
other => panic!("Expected an interval, got {other:?}"),
}
}

@LucaCappelletti94 LucaCappelletti94 Oct 6, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
}
}
#[test]
fn test_interval_numeric_requires_unit() {
assert_eq!(
spark()
.parse_sql_statements("SELECT INTERVAL 1")
.unwrap_err()
.to_string(),
"sql parser error: INTERVAL requires a unit after the literal value"
);
}
#[test]
fn test_interval_rejects_value_arithmetic() {
assert!(spark()
.parse_sql_statements("SELECT INTERVAL 1 + 1 DAY")
.is_err());
}
#[test]
fn test_interval_preserves_column_query() {
let query = spark()
.run_parser_method("SELECT interval FROM t", |parser| parser.parse_query())
.unwrap();
let SetExpr::Select(select) = *query.body else {
panic!("Expected SELECT");
};
assert_eq!(
select.from,
vec![TableWithJoins {
relation: table("t"),
joins: vec![],
}]
);
assert_eq!(
select.projection,
vec![SelectItem::UnnamedExpr(Expr::Identifier(Ident::new(
"interval"
)))]
);
}

Loading