in work

cube-js · Nov 6, 2024 · e4c9680 · e4c9680
1 parent 4adb658
commit e4c9680
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 40 deletions.
diff --git a/packages/cubejs-schema-compiler/src/adapter/BaseQuery.js b/packages/cubejs-schema-compiler/src/adapter/BaseQuery.js
@@ -628,30 +628,6 @@ export class BaseQuery {
     return res;
   }
 
-  buildSqlAndParamsTest(exportAnnotatedSql) {
-    if (!this.options.preAggregationQuery && !this.options.disableExternalPreAggregations && this.externalQueryClass) {
-      if (this.externalPreAggregationQuery()) { // TODO performance
-        return this.externalQuery().buildSqlAndParams(exportAnnotatedSql);
-      }
-    }
-    const js_res = this.compilers.compiler.withQuery(
-      this,
-      () => this.cacheValue(
-        ['buildSqlAndParams', exportAnnotatedSql],
-        () => this.paramAllocator.buildSqlAndParams(
-          this.buildParamAnnotatedSql(),
-          exportAnnotatedSql,
-          this.shouldReuseParams
-        ),
-        { cache: this.queryCache }
-      )
-    );
-    const rust = this.buildSqlAndParamsRust(exportAnnotatedSql);
-    console.log('js result: ', js_res[0]);
-    console.log('rust result: ', rust[0]);
-    return js_res;
-  }
-
   get shouldReuseParams() {
     return false;
   }

diff --git a/packages/cubejs-schema-compiler/test/integration/postgres/sql-generation.test.ts b/packages/cubejs-schema-compiler/test/integration/postgres/sql-generation.test.ts
@@ -538,7 +538,7 @@ describe('SQL Generation', () => {
     });
     `);
 
-  it('simple join 1', async () => {
+  it('simple join', async () => {
     await compiler.compile();
 
     console.log(joinGraph.buildJoin(['visitor_checkins', 'visitors']));
@@ -2372,7 +2372,7 @@ describe('SQL Generation', () => {
     }]
   ));
 
-  it('multi stage measure with multiple dependencies 1', async () => runQueryTest(
+  it('multi stage measure with multiple dependencies', async () => runQueryTest(
     {
       measures: ['visitors.second_rank_sum', 'visitors.visitor_revenue', 'visitors.revenue_rank'],
       dimensions: ['visitors.source'],

diff --git a/rust/cubesqlplanner/cubesqlplanner/src/plan/expression.rs b/rust/cubesqlplanner/cubesqlplanner/src/plan/expression.rs
@@ -21,9 +21,8 @@ impl MemberExpression {
         context: Rc<VisitorContext>,
         schema: Rc<Schema>,
     ) -> Result<String, CubeError> {
-        if let Some(reference_column) = context
-            .source_schema()
-            .find_column_for_member(&self.member.full_name(), &self.source)
+        if let Some(reference_column) =
+            schema.find_column_for_member(&self.member.full_name(), &self.source)
         {
             templates.column_reference(&reference_column.table_name, &reference_column.alias)
         } else {

diff --git a/rust/cubesqlplanner/cubesqlplanner/src/plan/join.rs b/rust/cubesqlplanner/cubesqlplanner/src/plan/join.rs
@@ -78,7 +78,10 @@ impl DimensionJoinCondition {
             format!("")
         };
 
-        Ok(format!("{} = {}{}", left_column, right_column, null_check))
+        Ok(format!(
+            "({} = {}{})",
+            left_column, right_column, null_check
+        ))
     }
 
     fn resolve_member_alias(

diff --git a/rust/cubesqlplanner/cubesqlplanner/src/planner/visitor_context.rs b/rust/cubesqlplanner/cubesqlplanner/src/planner/visitor_context.rs
@@ -8,7 +8,6 @@ use cubenativeutils::CubeError;
 use std::rc::Rc;
 
 pub struct VisitorContext {
-    source_schema: Rc<Schema>,
     cube_alias_prefix: Option<String>,
     node_processor: Rc<dyn SqlNode>,
 }
@@ -18,7 +17,6 @@ impl VisitorContext {
         Self {
             cube_alias_prefix,
             node_processor,
-            source_schema: Rc::new(Schema::empty()),
         }
     }
 
@@ -52,14 +50,6 @@ impl VisitorContext {
     pub fn cube_alias_prefix(&self) -> &Option<String> {
         &self.cube_alias_prefix
     }
-
-    pub fn source_schema(&self) -> &Rc<Schema> {
-        &self.source_schema
-    }
-
-    pub fn set_source_schema(&mut self, schema: Rc<Schema>) {
-        self.source_schema = schema
-    }
 }
 
 pub fn evaluate_with_context(