[WIP] fix(schema-compiler): Support member alias for TD with granularity

Author: mcheshkov

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

@@ -3103,7 +3103,8 @@ export class BaseQuery {
           const outputColumnTypes = [
             ...(query.dimensions || []).map(d => findSchemaType(d.dimension)),
             ...(query.timeDimensions || []).map(t => ({
-              name: `${this.aliasName(t.dimension)}_${t.granularity}`,
+              // TODO is it ok to do so?
+              name: this.aliasName(`${t.dimension}.${t.granularity}`),
               type: 'TIMESTAMP'
             })),
             ...(query.measures || []).map(m => findSchemaType(m.measure)),

packages/cubejs-schema-compiler/src/adapter/BaseTimeDimension.ts

@@ -70,11 +70,13 @@ export class BaseTimeDimension extends BaseFilter {
     return super.aliasName();
   }
 
-  // @ts-ignore
-  public unescapedAliasName(granularity: string) {
-    const actualGranularity = granularity || this.granularityObj?.granularity || 'day';
+  public unescapedAliasName(granularity?: string) {
+    const actualGranularity = granularity ?? this.granularityObj?.granularity ?? 'day';
 
-    return `${this.query.aliasName(this.dimension)}_${actualGranularity}`; // TODO date here for rollups
+    const fullName = `${this.dimension}.${actualGranularity}`;
+
+    // TODO date here for rollups
+    return this.query.aliasName(fullName);
   }
 
   public dateSeriesAliasName() {

packages/cubejs-schema-compiler/test/unit/base-query.test.ts

@@ -121,7 +121,7 @@ describe('SQL Generation', () => {
 
       const queryAndParams = query.buildSqlAndParams();
 
-      expect(queryAndParams[0]).toContain('"cards".type "cards__type", date_trunc(\'day\', ("cards".created_at::timestamptz AT TIME ZONE \'America/Los_Angeles\')) "cards__created_at_day"');
+      expect(queryAndParams[0]).toContain('"cards".type "cards__type", date_trunc(\'day\', ("cards".created_at::timestamptz AT TIME ZONE \'America/Los_Angeles\')) "cards__created_at__day"');
       expect(queryAndParams[0]).toContain('GROUP BY 1, 2');
       expect(queryAndParams[0]).toContain('ORDER BY 2');
     });
@@ -1104,10 +1104,10 @@ describe('SQL Generation', () => {
 
       const queryAndParams = query.buildSqlAndParams();
       const queryString = queryAndParams[0];
-      expect(queryString.includes('date_trunc(\'quarter\'')).toBeTruthy();
-      expect(queryString.includes('cards__created_at_quarter')).toBeTruthy();
-      expect(queryString.includes('date_trunc(\'month\'')).toBeTruthy();
-      expect(queryString.includes('cards__created_at_month')).toBeTruthy();
+      expect(queryString).toContain('date_trunc(\'quarter\'');
+      expect(queryString).toContain('cards__created_at__quarter');
+      expect(queryString).toContain('date_trunc(\'month\'');
+      expect(queryString).toContain('cards__created_at__month');
     });
 
     it('Test for everyRefreshKeySql', async () => {