ref

Author: vasilev-alex

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

@@ -1,4 +1,5 @@
-use cubesql::compile::{convert_sql_to_cube_query, get_df_batches};
+use cubesql::compile::parser::parse_sql_to_statement;
+use cubesql::compile::{convert_statement_to_cube_query, get_df_batches};
 use cubesql::config::processing_loop::ShutdownMode;
 use cubesql::transport::{SpanId, TransportService};
 use futures::StreamExt;
@@ -222,8 +223,17 @@ async fn handle_sql_query(
                 .map_err(|err| {
                     CubeError::internal(format!("Failed to get meta context: {}", err))
                 })?;
-            let query_plan =
-                convert_sql_to_cube_query(sql_query, meta_context, session, span_id_clone).await?;
+
+            let stmt =
+                parse_sql_to_statement(sql_query, session.state.protocol.clone(), &mut None)?;
+            let query_plan = convert_statement_to_cube_query(
+                stmt,
+                meta_context,
+                session,
+                &mut None,
+                span_id_clone,
+            )
+            .await?;
 
             let mut stream = get_df_batches(&query_plan).await?;
 

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

@@ -166,8 +166,7 @@ async fn handle_sql4sql_query(
             .await
             .map_err(|err| CubeError::internal(format!("Failed to get meta context: {err}")))?;
         let query_plan =
-            convert_sql_to_cube_query(sql_query, meta_context.clone(), session.clone(), None)
-                .await?;
+            convert_sql_to_cube_query(sql_query, meta_context.clone(), session.clone()).await?;
         let logical_plan = query_plan.try_as_logical_plan()?;
         get_sql(&session, meta_context, Arc::new(logical_plan.clone())).await
     })

rust/cubesql/cubesql/src/compile/router.rs

@@ -640,8 +640,7 @@ pub async fn convert_sql_to_cube_query(
     query: &str,
     meta: Arc<MetaContext>,
     session: Arc<Session>,
-    span_id: Option<Arc<SpanId>>,
 ) -> CompilationResult<QueryPlan> {
     let stmt = parse_sql_to_statement(&query, session.state.protocol.clone(), &mut None)?;
-    convert_statement_to_cube_query(stmt, meta, session, &mut None, span_id).await
+    convert_statement_to_cube_query(stmt, meta, session, &mut None, None).await
 }

rust/cubesql/cubesql/src/compile/service.rs

@@ -27,6 +27,6 @@ impl SqlService for SqlAuthDefaultImpl {
         meta: Arc<MetaContext>,
         session: Arc<Session>,
     ) -> CompilationResult<QueryPlan> {
-        convert_sql_to_cube_query(&query, meta, session, None).await
+        convert_sql_to_cube_query(&query, meta, session).await
     }
 }

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

@@ -1021,13 +1021,7 @@ impl TestContext {
 
     pub async fn convert_sql_to_cube_query(&self, query: &str) -> CompilationResult<QueryPlan> {
         // TODO push to_string() deeper
-        convert_sql_to_cube_query(
-            &query.to_string(),
-            self.meta.clone(),
-            self.session.clone(),
-            None,
-        )
-        .await
+        convert_sql_to_cube_query(&query.to_string(), self.meta.clone(), self.session.clone()).await
     }
 
     pub async fn execute_query_with_flags(
@@ -1137,7 +1131,6 @@ pub async fn convert_select_to_query_plan_with_meta(
         &query,
         meta_context.clone(),
         get_test_session(DatabaseProtocol::PostgreSQL, meta_context).await,
-        None,
     )
     .await;
 

rust/cubesql/cubesql/src/compile/test/test_cube_join.rs

@@ -503,7 +503,6 @@ async fn test_join_cubes_on_wrong_field_error() {
         .to_string(),
         meta.clone(),
         get_test_session(DatabaseProtocol::PostgreSQL, meta).await,
-        None,
     )
     .await;
 
@@ -528,7 +527,6 @@ async fn test_join_cubes_filter_from_wrong_side_error() {
             .to_string(),
         meta.clone(),
         get_test_session(DatabaseProtocol::PostgreSQL, meta).await,
-        None
     )
         .await;
 
@@ -556,7 +554,6 @@ async fn test_join_cubes_with_aggr_error() {
             .to_string(),
         meta.clone(),
         get_test_session(DatabaseProtocol::PostgreSQL, meta).await,
-        None
     )
         .await;
 

rust/cubesql/cubesql/src/compile/test/test_user_change.rs

@@ -164,7 +164,6 @@ async fn test_change_user_via_filter_or() {
             &"SELECT COUNT(*) as cnt FROM KibanaSampleDataEcommerce WHERE __user = 'gopher' OR customer_gender = 'male'".to_string(),
             meta.clone(),
             get_test_session(DatabaseProtocol::PostgreSQL, meta).await,
-            None
         ).await;
 
     // TODO: We need to propagate error to result, to assert message