[pull] master from cube-js:master

packages/cubejs-backend-native/src/node_export.rs

@@ -446,7 +446,7 @@ async fn handle_sql_query(
                             },
                             "apiType": "sql",
                             "duration": span_id.as_ref().unwrap().duration(),
-                            "isDataQuery": true
+                            "isDataQuery": span_id.as_ref().unwrap().is_data_query().await,
                         }),
                     )
                     .await?;

rust/cubesql/cubesql/Cargo.toml

@@ -10,7 +10,7 @@ homepage = "https://cube.dev"
 
 [dependencies]
 arc-swap = "1"
-datafusion = { git = 'https://github.com/cube-js/arrow-datafusion.git', rev = "03e683e5967b9fe60eece7e7d469d87621e25439", default-features = false, features = [
+datafusion = { git = 'https://github.com/cube-js/arrow-datafusion.git', rev = "fc9fa63d78671bf38f31c3319302579f7c3961de", default-features = false, features = [
     "regex_expressions",
     "unicode_expressions",
 ] }

rust/cubesql/cubesql/src/compile/mod.rs

@@ -18697,4 +18697,19 @@ LIMIT {{ limit }}{% endif %}"#.to_string(),
             }
         )
     }
+
+    #[tokio::test]
+    async fn test_window_aggr_empty() -> Result<(), CubeError> {
+        insta::assert_snapshot!(
+            "window_aggr_empty",
+            execute_query(
+                "SELECT oid, COUNT(*) OVER() AS c FROM pg_class WHERE oid < 0 GROUP BY 1"
+                    .to_string(),
+                DatabaseProtocol::PostgreSQL
+            )
+            .await?
+        );
+
+        Ok(())
+    }
 }

rust/cubesql/cubesql/src/compile/snapshots/cubesql__compile__tests__window_aggr_empty.snap

@@ -0,0 +1,8 @@
+---
+source: cubesql/src/compile/mod.rs
+expression: "execute_query(\"SELECT oid, COUNT(*) OVER() AS c FROM pg_class WHERE oid < 0 GROUP BY 1\".to_string(),\nDatabaseProtocol::PostgreSQL).await?"
+---
++-----+---+
+| oid | c |
++-----+---+
++-----+---+