in work

Author: waralexrom

packages/cubejs-schema-compiler/test/integration/postgres/sql-generation-logic.test.ts

@@ -382,7 +382,7 @@ describe('SQL Generation', () => {
     })
   `);
 
-  it('filter with operator OR', async () => {
+  it('filter with operator OR 1', async () => {
     await compiler.compile();
 
     const query = new PostgresQuery({ joinGraph, cubeEvaluator, compiler }, {

packages/cubejs-schema-compiler/test/integration/postgres/sql-generation.test.ts

@@ -2556,7 +2556,7 @@ SELECT 1 AS revenue,  cast('2024-01-01' AS timestamp) as time UNION ALL
     });
   });
 
-  it('subquery', async () => {
+  it('subquery 1', async () => {
     await compiler.compile();
 
     const query = new PostgresQuery({ joinGraph, cubeEvaluator, compiler }, {
@@ -3114,7 +3114,7 @@ SELECT 1 AS revenue,  cast('2024-01-01' AS timestamp) as time UNION ALL
     );
   });
 
-  it('security context', async () => {
+  it('security context 1', async () => {
     await compiler.compile();
 
     const query = new PostgresQuery({ joinGraph, cubeEvaluator, compiler }, {

rust/cubesqlplanner/cubesqlplanner/src/plan/filter.rs

@@ -161,10 +161,7 @@ impl FilterItem {
     /// Returns Some(FilterItem) with the subtree containing only filters for target members
     ///
     /// This only processes AND groups - OR groups are not supported and will return None
-    pub fn find_subtree_for_members(
-        &self,
-        target_members: &[Rc<MemberSymbol>],
-    ) -> Option<FilterItem> {
+    pub fn find_subtree_for_members(&self, target_members: &[&String]) -> Option<FilterItem> {
         match self {
             FilterItem::Group(group) => {
                 // Empty groups return None
@@ -178,9 +175,7 @@ impl FilterItem {
                 // Check if all members in this filter are in the target set
                 let all_members_match = filter_members.iter().all(|member| {
                     target_members.iter().any(|target| {
-                        // Compare by resolved reference chains
-                        member.clone().resolve_reference_chain()
-                            == target.clone().resolve_reference_chain()
+                        &&member.clone().resolve_reference_chain().full_name() == target
                     })
                 });
 
@@ -220,10 +215,10 @@ impl FilterItem {
                 let member = item.member_evaluator();
 
                 // Check if this item's member is in the target set
-                if target_members.iter().any(|target| {
-                    member.clone().resolve_reference_chain()
-                        == target.clone().resolve_reference_chain()
-                }) {
+                if target_members
+                    .iter()
+                    .any(|target| &&member.clone().resolve_reference_chain().full_name() == target)
+                {
                     Some(self.clone())
                 } else {
                     None

rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/collectors/join_hints_collector.rs

@@ -121,6 +121,7 @@ pub fn collect_join_hints_for_measures(
     for meas in measures.iter() {
         visitor.apply(&meas, &())?;
     }
+
     let res = visitor.extract_result();
     Ok(res)
 }

rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/compiler.rs

@@ -134,21 +134,12 @@ impl Compiler {
         cube_name: &String,
         member_sql: Rc<dyn MemberSql>,
     ) -> Result<Rc<SqlCall>, CubeError> {
-        {
-            let call_builder = SqlCallBuilder::new(
-                self,
-                self.cube_evaluator.clone(),
-                self.security_context.clone(),
-            );
-            let sql_call = call_builder.build(&cube_name, member_sql.clone())?;
-        }
-        let dep_builder = DependenciesBuilder::new(
+        let call_builder = SqlCallBuilder::new(
             self,
             self.cube_evaluator.clone(),
             self.security_context.clone(),
         );
-        let deps = dep_builder.build(cube_name.clone(), member_sql.clone())?;
-        let sql_call = SqlCall::new(member_sql, deps);
+        let sql_call = call_builder.build(&cube_name, member_sql.clone())?;
         Ok(Rc::new(sql_call))
     }
 

rust/cubesqlplanner/cubesqlplanner/src/planner/sql_evaluator/mod.rs

@@ -4,7 +4,6 @@ mod dependency;
 pub mod references_builder;
 pub mod sql_call;
 mod sql_call_builder;
-pub mod sql_call_new;
 pub mod sql_nodes;
 pub mod sql_visitor;
 pub mod symbols;
@@ -13,8 +12,7 @@ pub mod visitor;
 pub use compiler::Compiler;
 pub use dependency::{CubeDepProperty, Dependency};
 pub use references_builder::ReferencesBuilder;
-pub use sql_call::SqlCall;
-pub use sql_call_new::*;
+pub use sql_call::*;
 pub use sql_visitor::SqlEvaluatorVisitor;
 pub use symbols::*;
 pub use visitor::TraversalVisitor;