This is the "put parentheses around everything" approach;

diff --git a/prql-compiler/src/sql/snapshots/prql_compiler__sql__translator__test__prql_to_sql_2.snap b/prql-compiler/src/sql/snapshots/prql_compiler__sql__translator__test__prql_to_sql_2.snap
index e3f29634..1ba7e992 100644
--- a/prql-compiler/src/sql/snapshots/prql_compiler__sql__translator__test__prql_to_sql_2.snap
+++ b/prql-compiler/src/sql/snapshots/prql_compiler__sql__translator__test__prql_to_sql_2.snap
@@ -9,14 +9,14 @@ SELECT
   SUM(salary),
   AVG(salary + payroll_tax),
   SUM(salary + payroll_tax),
-  AVG(salary + payroll_tax + benefits_cost),
-  SUM(salary + payroll_tax + benefits_cost) AS sum_gross_cost,
+  AVG((salary + payroll_tax) + benefits_cost),
+  SUM((salary + payroll_tax) + benefits_cost) AS sum_gross_cost,
   COUNT(*) AS ct
 FROM
   employees
 WHERE
-  country = 'USA'
-  AND salary + payroll_tax + benefits_cost > 0
+  (country = 'USA')
+  AND (((salary + payroll_tax) + benefits_cost) > 0)
 GROUP BY
   title,
   country
diff --git a/prql-compiler/src/sql/translator.rs b/prql-compiler/src/sql/translator.rs
index 038f8578..87819cff 100644
--- a/prql-compiler/src/sql/translator.rs
+++ b/prql-compiler/src/sql/translator.rs
@@ -490,8 +490,20 @@ fn try_from(item: Item) -> Result<Self> {
                 if let Some(is_null) = try_into_is_null(&op, &left, &right)? {
                     is_null
                 } else {
+                    let left = match left.item {
+                        Item::Binary { .. } => {
+                            Box::new(Expr::Nested(Box::new(left.item.try_into()?)))
+                        }
+                        _ => Box::new(left.item.try_into()?),
+                    };
+                    let right = match right.item {
+                        Item::Binary { .. } => {
+                            Box::new(Expr::Nested(Box::new(right.item.try_into()?)))
+                        }
+                        _ => Box::new(right.item.try_into()?),
+                    };
                     Expr::BinaryOp {
-                        left: Box::new(left.item.try_into()?),
+                        left,
                         op: match op {
                             BinOp::Mul => BinaryOperator::Multiply,
                             BinOp::Div => BinaryOperator::Divide,
@@ -508,7 +520,7 @@ fn try_from(item: Item) -> Result<Self> {
                             BinOp::Or => BinaryOperator::Or,
                             BinOp::Coalesce => unreachable!(),
                         },
-                        right: Box::new(right.item.try_into()?),
+                        right,
                     }
                 }
             }
@@ -1139,6 +1151,22 @@ fn test_prql_to_sql_1() -> Result<()> {
           employees
         "###
         );
+
+        let query = parse(
+            r#"
+from cities
+select temp_c = (temp - 32) * 3
+    "#,
+        )?;
+        let sql = resolve_and_translate(query)?;
+        assert_display_snapshot!(sql,
+            @r###"
+        SELECT
+          (temp - 32) * 3 AS temp_c
+        FROM
+          cities
+        "###
+        );
         Ok(())
     }
 
@@ -1866,8 +1894,8 @@ fn test_filter() {
         FROM
           employees
         WHERE
-          age > 25
-          AND age < 40
+          (age > 25)
+          AND (age < 40)
         "###);
 
         assert_display_snapshot!((resolve_and_translate(parse(r###"
@@ -1881,8 +1909,8 @@ fn test_filter() {
         FROM
           employees
         WHERE
-          age > 25
-          AND age < 40
+          (age > 25)
+          AND (age < 40)
         "###);
     }
 
@@ -1923,8 +1951,8 @@ fn test_nulls() -> Result<()> {
         FROM
           employees
         WHERE
-          first_name IS NULL
-          AND last_name IS NULL
+          (first_name IS NULL)
+          AND (last_name IS NULL)
         "###);
 
         // IS NOT NULL
@@ -1938,8 +1966,8 @@ fn test_nulls() -> Result<()> {
         FROM
           employees
         WHERE
-          first_name IS NOT NULL
-          AND last_name IS NOT NULL
+          (first_name IS NOT NULL)
+          AND (last_name IS NOT NULL)
         "###);
 
         Ok(())

If there were a quick way of not having it quite so ugly as SUM((salary + payroll_tax) + benefits_cost) AS sum_gross_cost, then it would be good to merge something that solved the problem even if not completely / elegantly.

Precedence issue #609

Description

Metadata

Metadata

Assignees

Labels

Type

Projects

Milestone

Relationships

Development

Issue actions