Bump sqlparser from 0.18.0 to 0.19.0 (#882)

* Bump sqlparser from 0.18.0 to 0.19.0 Bumps [sqlparser](https://github.com/sqlparser-rs/sqlparser-rs) from 0.18.0 to 0.19.0. - [Release notes](https://github.com/sqlparser-rs/sqlparser-rs/releases) - [Changelog](https://github.com/sqlparser-rs/sqlparser-rs/blob/main/CHANGELOG.md) - [Commits](apache/datafusion-sqlparser-rs@v0.18.0...v0.19.0) --- updated-dependencies: - dependency-name: sqlparser dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * . Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Maximilian Roos <[email protected]> Co-authored-by: Maximilian Roos <[email protected]>
PRQL · Jul 29, 2022 · 5b4cbd6 · 5b4cbd6
1 parent 7c2014c
commit 5b4cbd6
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/book/tests/snapshots/snapshot__run_reference_prql@dates_and_times-3.prql.snap b/book/tests/snapshots/snapshot__run_reference_prql@dates_and_times-3.prql.snap
@@ -5,6 +5,6 @@ input_file: book/tests/prql/language-features/dates_and_times-3.prql
 ---
 SELECT
   projects.*,
-  start + INTERVAL '10' DAY AS first_check_in
+  start + INTERVAL 10 DAY AS first_check_in
 FROM
   projects
diff --git a/prql-compiler/Cargo.toml b/prql-compiler/Cargo.toml
@@ -38,7 +38,7 @@ version = "3.2.3"
 
 [dependencies.sqlparser]
 features = ["serde"]
-version = "0.18.0"
+version = "0.19.0"
 
 [dependencies.serde]
 features = ["derive"]

diff --git a/prql-compiler/src/lib.rs b/prql-compiler/src/lib.rs
@@ -339,7 +339,7 @@ select `first name`
         assert_display_snapshot!((compile(query)?), @r###"
         SELECT
           projects.*,
-          start + INTERVAL '10' DAY AS first_check_in
+          start + INTERVAL 10 DAY AS first_check_in
         FROM
           projects
         "###);

diff --git a/prql-compiler/src/sql/translator.rs b/prql-compiler/src/sql/translator.rs
@@ -229,7 +229,7 @@ fn sql_query_of_atomic_table(
     let distinct = transforms.iter().any(|t| matches!(t, Transform::Unique));
 
     Ok(sql_ast::Query {
-        body: SetExpr::Select(Box::new(Select {
+        body: Box::new(SetExpr::Select(Box::new(Select {
             distinct,
             top: if dialect.use_top() {
                 limit.map(|l| top_of_i64(l, dialect))
@@ -249,7 +249,7 @@ fn sql_query_of_atomic_table(
             sort_by: vec![],
             having,
             qualify: None,
-        })),
+        }))),
         order_by,
         with: None,
         limit: if dialect.use_top() {
@@ -584,7 +584,10 @@ fn translate_item(item: Item, dialect: &dyn DialectHandler) -> Result<Expr> {
                 _ => bail!("Unsupported interval unit: {}", interval.unit),
             };
             Expr::Value(Value::Interval {
-                value: interval.n.to_string(),
+                value: Box::new(translate_item(
+                    Item::Literal(Literal::Integer(interval.n)),
+                    dialect,
+                )?),
                 leading_field: Some(sql_parser_datetime),
                 leading_precision: None,
                 last_field: None,