fix: join_path for JS schemas and * includes with prefix (#6555)

* fix: join_path for JS schemas and * includes with preif

* fix: whitespace

* fix: whitespace

* fix: whitespace

Author: keydunov

packages/cubejs-schema-compiler/src/compiler/CubeEvaluator.js

@@ -198,17 +198,17 @@ export class CubeEvaluator extends CubeSymbols {
       const cubeReference = split[split.length - 1];
       const cubeName = cubeInclude.alias || cubeReference;
       let includes;
+      const fullMemberName = (memberName) => (cubeInclude.prefix ? `${cubeName}_${memberName}` : memberName);
       if (cubeInclude.includes === '*') {
         const membersObj = this.symbols[cubeReference]?.cubeObj()?.[type] || {};
-        includes = Object.keys(membersObj).map(memberName => ({ member: `${fullPath}.${memberName}` }));
+        includes = Object.keys(membersObj).map(memberName => ({ member: `${fullPath}.${memberName}`, name: fullMemberName(memberName) }));
       } else {
         includes = cubeInclude.includes.map(include => {
           const member = include.alias || include;
           if (member.indexOf('.') !== -1) {
             errorReporter.error(`Paths aren't allowed in cube includes but '${member}' provided as include member`);
           }
-          let name = include.alias || member;
-          name = cubeInclude.prefix ? `${cubeName}_${name}` : name;
+          const name = fullMemberName(include.alias || member);
           if (include.name) {
             const resolvedMember = this.symbols[cubeReference]?.cubeObj()?.[type]?.[include.name];
             return resolvedMember ? {

packages/cubejs-schema-compiler/src/compiler/transpilers/CubePropContextTranspiler.ts

@@ -17,7 +17,7 @@ export const transpiledFieldsPatterns: Array<RegExp> = [
   /^contextMembers$/,
   /^includes$/,
   /^excludes$/,
-  /^cubes\.[0-9]+\.joinPath$/,
+  /^cubes\.[0-9]+\.(joinPath|join_path)$/,
 ];
 
 export const transpiledFields: Set<String> = new Set<String>();

packages/cubejs-schema-compiler/test/integration/postgres/views.test.ts

@@ -0,0 +1,104 @@
+import { PostgresQuery } from '../../../src/adapter/PostgresQuery';
+// import { prepareYamlCompiler } from '../../unit/PrepareCompiler';
+import { prepareCompiler } from '../../unit/PrepareCompiler';
+import { dbRunner } from './PostgresDBRunner';
+
+// TODO: move into utils
+async function runQueryTest(prepareCompilerResult, { cubeQuery, expectedResult }) {
+  await prepareCompilerResult.compiler.compile();
+  const query = new PostgresQuery(prepareCompilerResult, cubeQuery);
+
+  console.log(query.buildSqlAndParams());
+
+  const res = await dbRunner.testQuery(query.buildSqlAndParams());
+  console.log(JSON.stringify(res));
+
+  expect(res).toEqual(
+    expectedResult
+  );
+}
+
+describe('Views in YAML', () => {
+  jest.setTimeout(200000);
+});
+
+describe('Views in JS', () => {
+  jest.setTimeout(200000);
+
+  const prepareCompilerResult = prepareCompiler(`
+    cube(\`orders\`, {
+      sql: \`SELECT 1 as id, 1 as customer_id, '2022-01-01' as timestamp\`,
+
+      joins: {
+        customers: {
+          relationship: \`many_to_one\`,
+          sql: \`\${CUBE}.customer_id = \${customers}.id\`
+        }
+      },
+
+      dimensions: {
+        id: {
+          sql: \`id\`,
+          type: \`number\`,
+          primary_key: true,
+          public: true
+        },
+
+        time: {
+          sql: \`timestamp\`,
+          type: \`time\`
+        }
+      },
+
+      measures: {
+        count: {
+          type: \`count\`
+        }
+      }
+    });
+
+    cube(\`customers\`, {
+      sql: \`SELECT 1 as id, 'Foo' as name\`,
+
+      dimensions: {
+        id: {
+          sql: \`id\`,
+          type: \`number\`,
+          primary_key: true,
+          public: true
+        },
+
+        name: {
+          sql: \`name\`,
+          type: \`string\`
+        }
+      }
+    });
+
+    view(\`ecommerce\`, {
+      cubes: [
+        {
+          join_path: orders,
+          prefix: true,
+          includes: \`*\`
+        },
+        {
+          join_path: orders.customers,
+          prefix: true,
+          includes: [\`name\`]
+        }
+      ]
+    });
+
+  `);
+
+  it('join_path', async () => runQueryTest(prepareCompilerResult, {
+    cubeQuery: {
+      measures: ['ecommerce.orders_count'],
+      dimensions: ['ecommerce.customers_name']
+    },
+    expectedResult: [
+      { ecommerce__customers_name: 'Foo', ecommerce__orders_count: '1' }
+    ]
+  }));
+});

packages/cubejs-schema-compiler/test/integration/postgres/yaml-compiler.test.ts

@@ -375,12 +375,8 @@ views:
       preAggregationsSchema: ''
     });
 
-    console.log(query.buildSqlAndParams());
-
     const res = await dbRunner.evaluateQueryWithPreAggregations(query);
 
-    console.log(JSON.stringify(res));
-
     expect(res).toEqual(
       [{
         orders_view__orders_count: '1',