fix: Merge back sqlAlias support

Author: paveltiunov

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

@@ -1017,13 +1017,6 @@ class BaseQuery {
     return this.evaluateSymbolSqlWithContext(fn, { cubeAliasPrefix });
   }
 
-  // TODO merge fail. Remove sqlAlias us unused?
-  /*
-  cubeAlias(cube) {
-    return this.cubeAlias(this.cubeEvaluator.cubeFromPath(cube).sqlAlias || cube);
-  }
-  */
-
   cubeAlias(cubeName) {
     const prefix = this.safeEvaluateSymbolContext().cubeAliasPrefix || this.cubeAliasPrefix;
     return this.escapeColumnName(this.aliasName(`${prefix ? prefix + '__' : ''}${cubeName}`));
@@ -1239,6 +1232,13 @@ class BaseQuery {
   }
 
   aliasName(name) {
+    const path = name.split('.');
+    if (path[0] && this.cubeEvaluator.cubeExists(path[0]) && this.cubeEvaluator.cubeFromPath(path[0]).sqlAlias) {
+      const cubeName = path[0];
+      path.splice(0, 1);
+      path.unshift(this.cubeEvaluator.cubeFromPath(cubeName).sqlAlias);
+      name = this.cubeEvaluator.pathFromArray(path);
+    }
     return inflection.underscore(name).replace(/\./g, '__');
   }
 

packages/cubejs-schema-compiler/test/ClickHouseGraphBuilderTest.js

@@ -28,8 +28,6 @@ describe('ClickHouse JoinGraph', function test() {
       \${USER_CONTEXT.sourceArray.filter(sourceArray => \`source in (\${sourceArray.join(',')})\`)}
       \`,
       
-      sqlAlias: 'visitors_table',
-      
       refreshKey: {
         sql: 'SELECT 1',
       },

packages/cubejs-schema-compiler/test/SQLGenerationTest.js

@@ -28,8 +28,6 @@ describe('SQL Generation', function test() {
       \${USER_CONTEXT.sourceArray.filter(sourceArray => \`source in (\${sourceArray.join(',')})\`)}
       \`,
       
-      sqlAlias: 'visitors_table',
-      
       refreshKey: {
         sql: 'SELECT 1',
       },
@@ -288,6 +286,20 @@ describe('SQL Generation', function test() {
         }
       }
     })
+    
+    cube('CubeWithVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongName', {
+      sql: \`
+      select * from cards
+      \`,
+      
+      sqlAlias: 'cube_with_long_name',
+
+      measures: {
+        count: {
+          type: 'count'
+        }
+      }
+    });
     `);
 
   it('simple join', () => {
@@ -1400,4 +1412,18 @@ describe('SQL Generation', function test() {
   }, {
     "visitors__created_at_date": "2017-01-06T00:00:00.000Z"
   }]));
+
+  it(
+    'sqlAlias',
+    () => runQueryTest({
+      measures: ['CubeWithVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongName.count'],
+      dimensions: [],
+      timeDimensions: [],
+      timezone: 'America/Los_Angeles',
+      filters: [],
+      order: []
+    }, [
+      { "cube_with_long_name__count": '3' }
+    ])
+  );
 });