feat(cubesql): Support Date32 to Timestamp coercion

cube-js · Aug 31, 2023 · 54bdfee · 54bdfee
1 parent 3301e71
commit 54bdfee
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 7 deletions.
diff --git a/rust/cubesql/Cargo.lock b/rust/cubesql/Cargo.lock
diff --git a/rust/cubesql/cubesql/Cargo.toml b/rust/cubesql/cubesql/Cargo.toml
@@ -9,7 +9,7 @@ documentation = "https://cube.dev/docs"
 homepage = "https://cube.dev"
 
 [dependencies]
-datafusion = { git = 'https://github.com/cube-js/arrow-datafusion.git', rev = "90f0168023bce6b7fa44d3473dd052afd444ca54", default-features = false, features = ["regex_expressions", "unicode_expressions"] }
+datafusion = { git = 'https://github.com/cube-js/arrow-datafusion.git', rev = "915a600ea4d3b66161cd77ff94747960f840816e", default-features = false, features = ["regex_expressions", "unicode_expressions"] }
 anyhow = "1.0"
 thiserror = "1.0"
 cubeclient = { path = "../cubeclient" }

diff --git a/rust/cubesql/cubesql/src/compile/mod.rs b/rust/cubesql/cubesql/src/compile/mod.rs
@@ -12912,6 +12912,33 @@ ORDER BY \"COUNT(count)\" DESC"
         Ok(())
     }
 
+    #[tokio::test]
+    async fn test_holistics_date_trunc_date32() -> Result<(), CubeError> {
+        insta::assert_snapshot!(
+            "holistics_date_trunc_date32",
+            execute_query(
+                "
+                with \"h__dates\" AS (
+                    SELECT
+                        CAST ('2023-02-01' AS date) as \"start_range\",
+                        CAST ( '2023-02-28' AS date ) as \"end_range\",
+                        28 as \"length\"
+                )
+                SELECT
+                    DATE_TRUNC( 'month', \"start_range\") AS \"dm_ddt_d_6e2110\",
+                    MAX(\"length\") AS \"h_dates_length\"
+                FROM \"h__dates\"
+                GROUP BY 1
+                "
+                .to_string(),
+                DatabaseProtocol::PostgreSQL
+            )
+            .await?
+        );
+
+        Ok(())
+    }
+
     #[tokio::test]
     async fn test_holistics_group_by_date() {
         init_logger();

diff --git a/...l/cubesql/src/compile/snapshots/cubesql__compile__tests__holistics_date_trunc_date32.snap b/...l/cubesql/src/compile/snapshots/cubesql__compile__tests__holistics_date_trunc_date32.snap
@@ -0,0 +1,9 @@
+---
+source: cubesql/src/compile/mod.rs
+expression: "execute_query(\"\n                with \\\"h__dates\\\" AS (\n                    SELECT\n                        CAST ('2023-02-01' AS date) as \\\"start_range\\\",\n                        CAST ( '2023-02-28' AS date ) as \\\"end_range\\\",\n                        28 as \\\"length\\\"\n                )\n                SELECT\n                    DATE_TRUNC( 'month', \\\"start_range\\\") AS \\\"dm_ddt_d_6e2110\\\",\n                    MAX(\\\"length\\\") AS \\\"h_dates_length\\\"\n                FROM \\\"h__dates\\\"\n                GROUP BY 1\n                \".to_string(),\n            DatabaseProtocol::PostgreSQL).await?"
+---
++-------------------------+----------------+
+| dm_ddt_d_6e2110         | h_dates_length |
++-------------------------+----------------+
+| 2023-02-01T00:00:00.000 | 28             |
++-------------------------+----------------+