Add tests for proxying predefined granularities

cube-js · Sep 9, 2024 · 079f64d · 079f64d
1 parent b805061
commit 079f64d
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 2 deletions.
diff --git a/packages/cubejs-schema-compiler/test/unit/base-query.test.ts b/packages/cubejs-schema-compiler/test/unit/base-query.test.ts
@@ -313,6 +313,44 @@ describe('SQL Generation', () => {
         filters: [],
         timezone: 'Europe/Kyiv'
       },
+      {
+        measures: [
+          'orders.count'
+        ],
+        timeDimensions: [
+          {
+            dimension: 'orders.createdAt',
+            dateRange: [
+              '2020-01-01',
+              '2021-12-31'
+            ]
+          }
+        ],
+        dimensions: [
+          'orders.createdAtPredefinedYear'
+        ],
+        filters: [],
+        timezone: 'Europe/Kyiv'
+      },
+      {
+        measures: [
+          'orders.count'
+        ],
+        timeDimensions: [
+          {
+            dimension: 'orders.createdAt',
+            dateRange: [
+              '2020-01-01',
+              '2021-12-31'
+            ]
+          }
+        ],
+        dimensions: [
+          'orders.createdAtPredefinedQuarter'
+        ],
+        filters: [],
+        timezone: 'Europe/Kyiv'
+      },
     ];
 
     it('Test time series with different granularities', async () => {
@@ -375,8 +413,14 @@ describe('SQL Generation', () => {
           const queryString = queryAndParams[0];
           console.log('Generated query: ', queryString);
 
-          expect(queryString.includes('INTERVAL \'6 months\'')).toBeTruthy();
-          expect(queryString.includes('count("orders".id')).toBeTruthy();
+          if (q.dimensions[0].includes('PredefinedYear')) {
+            expect(queryString.includes('date_trunc(\'year\'')).toBeTruthy();
+          } else if (q.dimensions[0].includes('PredefinedQuarter')) {
+            expect(queryString.includes('date_trunc(\'quarter\'')).toBeTruthy();
+          } else {
+            expect(queryString.includes('INTERVAL \'6 months\'')).toBeTruthy();
+            expect(queryString.includes('count("orders".id')).toBeTruthy();
+          }
         });
       });
     });

diff --git a/packages/cubejs-schema-compiler/test/unit/utils.ts b/packages/cubejs-schema-compiler/test/unit/utils.ts
@@ -103,6 +103,16 @@ export function createCubeSchemaWithCustomGranularities(name: string): string {
               }
             }
           },
+          createdAtPredefinedYear: {
+            public: true,
+            sql: \`\${createdAt.year}\`,
+            type: 'string',
+          },
+          createdAtPredefinedQuarter: {
+            public: true,
+            sql: \`\${createdAt.quarter}\`,
+            type: 'string',
+          },
           createdAtHalfYear: {
             public: true,
             sql: \`\${createdAt.half_year}\`,