fix: Make interval summing dialect-specific

Recheck this after rebase on commit 57083a0 "Fix interval parsing logic and precedence (apache#705)", first released in 0.28.0
cube-js · Sep 2, 2024 · c40a3b9 · c40a3b9
1 parent 5fc1434
commit c40a3b9
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 54 deletions.
diff --git a/src/parser.rs b/src/parser.rs
@@ -1095,7 +1095,12 @@ impl<'a> Parser<'a> {
 
         // The first token in an interval is a string literal which specifies
         // the duration of the interval.
-        let value = self.parse_subexpr(Self::PLUS_MINUS_PREC)?;
+        let value = if dialect_of!(self is PostgreSqlDialect | RedshiftSqlDialect | GenericDialect)
+        {
+            self.parse_subexpr(Self::PLUS_MINUS_PREC)
+        } else {
+            self.parse_expr()
+        }?;
 
         // Following the string literal is a qualifier which indicates the units
         // of the duration specified in the string literal.

diff --git a/tests/sqlparser_common.rs b/tests/sqlparser_common.rs
@@ -2864,59 +2864,6 @@ fn parse_literal_interval() {
     );
 }
 
-#[test]
-fn parse_interval_math() {
-    let sql = "SELECT INTERVAL '1 DAY' + INTERVAL '2 DAY'";
-    let select = verified_only_select(sql);
-    assert_eq!(
-        &Expr::BinaryOp {
-            left: Box::new(Expr::Value(Value::Interval {
-                value: Box::new(Expr::Value(Value::SingleQuotedString("1 DAY".to_string()))),
-                leading_field: None,
-                leading_precision: None,
-                last_field: None,
-                fractional_seconds_precision: None,
-            })),
-            op: BinaryOperator::Plus,
-            right: Box::new(Expr::Value(Value::Interval {
-                value: Box::new(Expr::Value(Value::SingleQuotedString("2 DAY".to_string()))),
-                leading_field: None,
-                leading_precision: None,
-                last_field: None,
-                fractional_seconds_precision: None,
-            })),
-        },
-        expr_from_projection(only(&select.projection)),
-    );
-
-    let sql = "SELECT INTERVAL '1' || ' DAY' + INTERVAL '2 DAY'";
-    let select = verified_only_select(sql);
-    assert_eq!(
-        &Expr::BinaryOp {
-            left: Box::new(Expr::Value(Value::Interval {
-                value: Box::new(Expr::BinaryOp {
-                    left: Box::new(Expr::Value(Value::SingleQuotedString("1".to_string()))),
-                    op: BinaryOperator::StringConcat,
-                    right: Box::new(Expr::Value(Value::SingleQuotedString(" DAY".to_string()))),
-                }),
-                leading_field: None,
-                leading_precision: None,
-                last_field: None,
-                fractional_seconds_precision: None,
-            })),
-            op: BinaryOperator::Plus,
-            right: Box::new(Expr::Value(Value::Interval {
-                value: Box::new(Expr::Value(Value::SingleQuotedString("2 DAY".to_string()))),
-                leading_field: None,
-                leading_precision: None,
-                last_field: None,
-                fractional_seconds_precision: None,
-            })),
-        },
-        expr_from_projection(only(&select.projection)),
-    );
-}
-
 #[test]
 fn parse_at_timezone() {
     let zero = Expr::Value(number("0"));

diff --git a/tests/sqlparser_postgres.rs b/tests/sqlparser_postgres.rs
@@ -1683,3 +1683,56 @@ fn parse_fetch() {
     pg_and_generic()
         .verified_stmt("FETCH BACKWARD ALL IN \"SQL_CUR0x7fa44801bc00\" INTO \"new_table\"");
 }
+
+#[test]
+fn parse_interval_math() {
+    let sql = "SELECT INTERVAL '1 DAY' + INTERVAL '2 DAY'";
+    let select = pg_and_generic().verified_only_select(sql);
+    assert_eq!(
+        &Expr::BinaryOp {
+            left: Box::new(Expr::Value(Value::Interval {
+                value: Box::new(Expr::Value(Value::SingleQuotedString("1 DAY".to_string()))),
+                leading_field: None,
+                leading_precision: None,
+                last_field: None,
+                fractional_seconds_precision: None,
+            })),
+            op: BinaryOperator::Plus,
+            right: Box::new(Expr::Value(Value::Interval {
+                value: Box::new(Expr::Value(Value::SingleQuotedString("2 DAY".to_string()))),
+                leading_field: None,
+                leading_precision: None,
+                last_field: None,
+                fractional_seconds_precision: None,
+            })),
+        },
+        expr_from_projection(only(&select.projection)),
+    );
+
+    let sql = "SELECT INTERVAL '1' || ' DAY' + INTERVAL '2 DAY'";
+    let select = pg_and_generic().verified_only_select(sql);
+    assert_eq!(
+        &Expr::BinaryOp {
+            left: Box::new(Expr::Value(Value::Interval {
+                value: Box::new(Expr::BinaryOp {
+                    left: Box::new(Expr::Value(Value::SingleQuotedString("1".to_string()))),
+                    op: BinaryOperator::StringConcat,
+                    right: Box::new(Expr::Value(Value::SingleQuotedString(" DAY".to_string()))),
+                }),
+                leading_field: None,
+                leading_precision: None,
+                last_field: None,
+                fractional_seconds_precision: None,
+            })),
+            op: BinaryOperator::Plus,
+            right: Box::new(Expr::Value(Value::Interval {
+                value: Box::new(Expr::Value(Value::SingleQuotedString("2 DAY".to_string()))),
+                leading_field: None,
+                leading_precision: None,
+                last_field: None,
+                fractional_seconds_precision: None,
+            })),
+        },
+        expr_from_projection(only(&select.projection)),
+    );
+}