add tests for named time shifts

Author: KSDaemon

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

@@ -73,6 +73,20 @@ cubes:
           - interval: 1 year
             type: prior
 
+      - name: count_shifted_y_named
+        type: number
+        multi_stage: true
+        sql: "{count}"
+        time_shift:
+          - name: one_year
+
+      - name: count_shifted_y1d_named
+        type: number
+        multi_stage: true
+        sql: "{count}"
+        time_shift:
+          - name: one_year_and_one_day
+
       - name: count_shifted_calendar_m
         type: number
         multi_stage: true
@@ -244,6 +258,12 @@ cubes:
             type: prior
             sql: "{CUBE}.retail_date_prev_year"
 
+          - name: one_year
+            sql: "{CUBE}.retail_date_prev_year"
+
+          - name: one_year_and_one_day
+            sql: "({CUBE}.retail_date_prev_year + interval '1 day')"
+
       ##### Retail Dates ####
       - name: retail_date
         sql: retail_date
@@ -282,6 +302,12 @@ cubes:
             type: prior
             sql: "{CUBE}.retail_date_prev_year"
 
+          - name: one_year
+            sql: "{CUBE}.retail_date_prev_year"
+
+          - name: one_year_and_one_day
+            sql: "({CUBE}.retail_date_prev_year + interval '1 day')"
+
       - name: retail_year
         sql: "{CUBE}.retail_year_name"
         type: string
@@ -576,6 +602,22 @@ cubes:
         },
       ]));
 
+      it('Count shifted by retail year (custom named shift + custom granularity)', async () => runQueryTest({
+        measures: ['calendar_orders.count', 'calendar_orders.count_shifted_y_named'],
+        timeDimensions: [{
+          dimension: 'custom_calendar.retail_date',
+          granularity: 'year',
+          dateRange: ['2025-02-02', '2026-02-01']
+        }],
+        order: [{ id: 'custom_calendar.retail_date' }]
+      }, [
+        {
+          calendar_orders__count: '37',
+          calendar_orders__count_shifted_y_named: '39',
+          custom_calendar__retail_date_year: '2025-02-02T00:00:00.000Z',
+        },
+      ]));
+
       it('Count shifted by retail month (custom shift + common granularity)', async () => runQueryTest({
         measures: ['calendar_orders.count', 'calendar_orders.count_shifted_calendar_m'],
         timeDimensions: [{
@@ -677,6 +719,23 @@ cubes:
           custom_calendar__retail_date_week: '2025-04-06T00:00:00.000Z',
         },
       ]));
+
+      it('Count shifted by retail year and another custom calendar year (2 custom named shifts + custom granularity)', async () => runQueryTest({
+        measures: ['calendar_orders.count', 'calendar_orders.count_shifted_y_named', 'calendar_orders.count_shifted_y1d_named'],
+        timeDimensions: [{
+          dimension: 'custom_calendar.retail_date',
+          granularity: 'year',
+          dateRange: ['2025-02-02', '2026-02-01']
+        }],
+        order: [{ id: 'custom_calendar.retail_date' }]
+      }, [
+        {
+          calendar_orders__count: '37',
+          calendar_orders__count_shifted_y_named: '39',
+          calendar_orders__count_shifted_y1d_named: '39',
+          custom_calendar__retail_date_year: '2025-02-02T00:00:00.000Z',
+        },
+      ]));
     });
 
     describe('PK dimension time-shifts', () => {
@@ -696,6 +755,22 @@ cubes:
         },
       ]));
 
+      it.skip('Count shifted by retail year (custom named shift + custom granularity)1', async () => runQueryTest({
+        measures: ['calendar_orders.count', 'calendar_orders.count_shifted_y_named'],
+        timeDimensions: [{
+          dimension: 'custom_calendar.date_val',
+          granularity: 'year',
+          dateRange: ['2025-02-02', '2026-02-01']
+        }],
+        order: [{ id: 'custom_calendar.date_val' }]
+      }, [
+        {
+          calendar_orders__count: '37',
+          calendar_orders__count_shifted_y_named: '39',
+          custom_calendar__date_val_year: '2025-02-02T00:00:00.000Z',
+        },
+      ]));
+
       it.skip('Count shifted by retail month (custom shift + common granularity)', async () => runQueryTest({
         measures: ['calendar_orders.count', 'calendar_orders.count_shifted_calendar_m'],
         timeDimensions: [{
@@ -797,6 +872,23 @@ cubes:
           custom_calendar__date_val_week: '2025-04-06T00:00:00.000Z',
         },
       ]));
+
+      it.skip('Count shifted by retail year and another custom calendar year (2 custom named shifts + custom granularity)', async () => runQueryTest({
+        measures: ['calendar_orders.count', 'calendar_orders.count_shifted_y_named', 'calendar_orders.count_shifted_y1d_named'],
+        timeDimensions: [{
+          dimension: 'custom_calendar.date_val',
+          granularity: 'year',
+          dateRange: ['2025-02-02', '2026-02-01']
+        }],
+        order: [{ id: 'custom_calendar.date_val' }]
+      }, [
+        {
+          calendar_orders__count: '37',
+          calendar_orders__count_shifted_y_named: '39',
+          calendar_orders__count_shifted_y1d_named: '39',
+          custom_calendar__date_val_year: '2025-02-02T00:00:00.000Z',
+        },
+      ]));
     });
   });
 });