fix tests and remove unneeded magic

Author: KSDaemon

packages/cubejs-schema-compiler/src/adapter/BaseQuery.js

@@ -2497,26 +2497,6 @@ export class BaseQuery {
         joinHints = joinHints.filter(e => e !== targetCube);
         joinHints.push(targetCube);
         this.safeEvaluateSymbolContext().joinHints = joinHints;
-
-        // Special processing is required when one cube extends another, because in this case
-        // cube names collected during joins evaluation might belong to ancestors which are out of scope of
-        // the current query and thus will lead to `Can't find join path to join cubes` error.
-        // To work around this we change the all ancestors cube names in collected join hints to the original one.
-        if (s.cube().extends) {
-          const cubeName = s.cube().name;
-          let parentCube = this.cubeEvaluator.resolveSymbolsCall(s.cube().extends, (name) => this.cubeEvaluator.cubeFromPath(name));
-          while (parentCube) {
-            // eslint-disable-next-line no-loop-func
-            joinHints.forEach((item, index, array) => {
-              if (item === parentCube.name) {
-                array[index] = cubeName;
-              }
-            });
-            parentCube = parentCube.extends ?
-              this.cubeEvaluator.resolveSymbolsCall(parentCube.extends, (name) => this.cubeEvaluator.cubeFromPath(name))
-              : null;
-          }
-        }
       }
       return res;
     }

packages/cubejs-schema-compiler/test/integration/postgres/pre-aggregations.test.ts

@@ -26,7 +26,7 @@ describe('PreAggregations', () => {
 
         cards: {
           relationship: 'hasMany',
-          sql: \`\${visitors.id} = \${cards.visitorId}\`
+          sql: \`\${CUBE.id} = \${cards.visitorId}\`
         }
       },
 

packages/cubejs-testing/birdbox-fixtures/postgresql/schema/PreAggregationTest.js

@@ -12,7 +12,7 @@ cube(`visitors`, {
 
     cards: {
       relationship: 'hasMany',
-      sql: `${visitors.id} = ${cards.visitorId}`
+      sql: `${CUBE.id} = ${cards.visitorId}`
     }
   },