name fix

Author: vasilev-alex

packages/cubejs-schema-compiler/src/scaffolding/formatters/BaseSchemaFormatter.ts

@@ -3,6 +3,7 @@ import { CubeMembers, SchemaContext } from '../ScaffoldingTemplate';
 import {
   CubeDescriptor,
   DatabaseSchema,
+  Dimension,
   MemberType,
   ScaffoldingSchema,
   TableName,
@@ -103,7 +104,7 @@ export abstract class BaseSchemaFormatter {
       : undefined;
   }
 
-  protected memberName(member) {
+  protected memberName(member: { title: string }) {
     const title = member.title.replace(/[^A-Za-z0-9]+/g, '_').toLowerCase();
 
     if (this.options.snakeCase) {
@@ -156,12 +157,12 @@ export abstract class BaseSchemaFormatter {
     const joins = tableSchema.joins
       .map((j) => {
         const thisTableColumnRef = j.thisTableColumnIncludedAsDimension
-          ? this.cubeReference(`CUBE.${j.thisTableColumn}`)
+          ? this.cubeReference(`CUBE.${this.memberName({ title: j.thisTableColumn })}`)
           : `${this.cubeReference('CUBE')}.${this.escapeName(
             j.thisTableColumn
           )}`;
         const columnToJoinRef = j.columnToJoinIncludedAsDimension
-          ? this.cubeReference(`${j.cubeToJoin}.${j.columnToJoin}`)
+          ? this.cubeReference(`${j.cubeToJoin}.${this.memberName({ title: j.columnToJoin })}`)
           : `${this.cubeReference(j.cubeToJoin)}.${this.escapeName(j.columnToJoin)}`;
 
         return ({

packages/cubejs-schema-compiler/test/unit/__snapshots__/scaffolding-template.test.ts.snap

@@ -426,7 +426,7 @@ exports[`ScaffoldingTemplate JavaScript formatter uses dimension refs instead of
     },
     
     customerkey: {
-      sql: \`customerkey\`,
+      sql: \`\${CUBE}.\\"customerKey\\"\`,
       type: \`string\`
     }
   },
@@ -674,7 +674,7 @@ exports[`ScaffoldingTemplate Yaml formatter uses dimension refs instead of table
         primary_key: true
 
       - name: customerkey
-        sql: customerkey
+        sql: \\"{CUBE}.\\\\\\"customerKey\\\\\\"\\"
         type: string
 
     measures:

packages/cubejs-schema-compiler/test/unit/scaffolding-template.test.ts

@@ -110,7 +110,7 @@ const schemasWithPrimaryAndForeignKeys = {
         attributes: []
       },
       {
-        name: 'customerkey',
+        name: 'customerKey',
         type: 'string',
         attributes: [],
         foreign_keys: [

packages/cubejs-schema-compiler/test/unit/utils.test.ts

@@ -1,6 +1,13 @@
 import { camelizeCube } from '../../src/compiler/utils';
+import { toSnakeCase } from '../../src/scaffolding/utils';
 
 describe('Test Utils', () => {
+  it('toSnakeCase', () => {
+    expect(toSnakeCase('customerkey')).toEqual('customerkey');
+    expect(toSnakeCase('customerKey')).toEqual('customer_key');
+    expect(toSnakeCase('customer_key')).toEqual('customer_key');
+  });
+
   it('camelizeObject (js)', () => {
     const res = camelizeCube({
       sql_table: 'tbl',