chore: bump sqlparser from 0.45.0 to 0.46.0 (#4457)

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]>
PRQL · May 6, 2024 · 820b231 · 820b231
1 parent d0e6da6
commit 820b231
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/prqlc/prqlc/Cargo.toml b/prqlc/prqlc/Cargo.toml
@@ -51,7 +51,7 @@ serde = {workspace = true}
 serde_json = "1.0.116"
 serde_yaml = {version = "0.9.34"}
 sqlformat = "0.2.3"
-sqlparser = {version = "0.45.0", features = ["serde"]}
+sqlparser = {version = "0.46.0", features = ["serde"]}
 strum = {version = "0.26.2", features = ["std", "derive"]}
 strum_macros = "0.26.2"
 

diff --git a/prqlc/prqlc/src/sql/gen_expr.rs b/prqlc/prqlc/src/sql/gen_expr.rs
@@ -4,7 +4,8 @@ use itertools::Itertools;
 use regex::Regex;
 use sqlparser::ast::{
     self as sql_ast, BinaryOperator, DateTimeField, Fetch, Function, FunctionArg, FunctionArgExpr,
-    ObjectName, OrderByExpr, SelectItem, UnaryOperator, Value, WindowFrameBound, WindowSpec,
+    FunctionArgumentList, ObjectName, OrderByExpr, SelectItem, UnaryOperator, Value,
+    WindowFrameBound, WindowSpec,
 };
 use std::cmp::Ordering;
 
@@ -219,23 +220,27 @@ fn process_concat(expr: &Expr, ctx: &mut Context) -> Result<sql_ast::Expr> {
     if ctx.dialect.has_concat_function() {
         let concat_args = collect_concat_args(expr);
 
-        let args = concat_args
+        let args_list = concat_args
             .iter()
             .map(|a| {
                 translate_expr((*a).clone(), ctx)
                     .map(|x| FunctionArg::Unnamed(FunctionArgExpr::Expr(x.into_ast())))
             })
             .try_collect()?;
 
+        let args = sql_ast::FunctionArguments::List(FunctionArgumentList {
+            args: args_list,
+            clauses: vec![],
+            duplicate_treatment: None,
+        });
+
         Ok(sql_ast::Expr::Function(Function {
             name: ObjectName(vec![sql_ast::Ident::new("CONCAT")]),
             args,
             over: None,
-            distinct: false,
-            special: false,
-            order_by: vec![],
             filter: None,
             null_treatment: None,
+            within_group: vec![],
         }))
     } else {
         let concat_args = collect_concat_args(expr);
@@ -451,15 +456,19 @@ fn translate_datetime_literal_with_sqlite_function(
         _ => unreachable!(),
     };
 
+    let args = sql_ast::FunctionArguments::List(FunctionArgumentList {
+        args: vec![arg],
+        clauses: vec![],
+        duplicate_treatment: None,
+    });
+
     sql_ast::Expr::Function(Function {
         name: ObjectName(vec![sql_ast::Ident::new(func_name)]),
-        args: vec![arg],
+        args,
         over: None,
-        distinct: false,
-        special: false,
-        order_by: vec![],
         filter: None,
         null_treatment: None,
+        within_group: vec![],
     })
 }
 

diff --git a/prqlc/prqlc/src/sql/gen_query.rs b/prqlc/prqlc/src/sql/gen_query.rs
@@ -569,6 +569,8 @@ fn default_select() -> Select {
         named_window: vec![],
         qualify: None,
         value_table_mode: None,
+        window_before_qualify: false,
+        connect_by: None,
     }
 }
 

diff --git a/prqlc/prqlc/tests/integration/sql.rs b/prqlc/prqlc/tests/integration/sql.rs
@@ -1231,7 +1231,7 @@ fn test_interval() {
     assert_snapshot!((compile(query).unwrap()), @r###"
     SELECT
       *,
-      start + INTERVAL 10 DAY AS first_check_in
+      "start" + INTERVAL 10 DAY AS first_check_in
     FROM
       projects
     "###);
@@ -1245,7 +1245,7 @@ fn test_interval() {
     assert_snapshot!((compile(query).unwrap()), @r###"
     SELECT
       *,
-      start + INTERVAL '10' DAY AS first_check_in
+      "start" + INTERVAL '10' DAY AS first_check_in
     FROM
       projects
     "###);

diff --git a/...cumentation/snapshots/documentation__book__reference__syntax__literals__durations__0.snap b/...cumentation/snapshots/documentation__book__reference__syntax__literals__durations__0.snap
@@ -4,7 +4,6 @@ expression: "from projects\nderive first_check_in = start + 10days\n"
 ---
 SELECT
   *,
-  start + INTERVAL 10 DAY AS first_check_in
+  "start" + INTERVAL 10 DAY AS first_check_in
 FROM
   projects
-