Skip to content

fix(schema-compiler): Fix view queries for measure with single timeshift reference without time dimension #9565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 13, 2025
Merged

fix(schema-compiler): Fix view queries for measure with single timeshift reference without time dimension #9565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions packages/cubejs-schema-compiler/src/adapter/BaseQuery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1428,10 +1428,15 @@ export class BaseQuery {
if (memberDef.timeShiftReferences?.length) {
let mapFn;

const allBackAliasMembers = this.allBackAliasTimeDimensions();

if (memberDef.timeShiftReferences.length === 1 && !memberDef.timeShiftReferences[0].timeDimension) {
const timeShift = memberDef.timeShiftReferences[0];
mapFn = (td) => {
if (td.shiftInterval) {
// We need to ignore aliased td, because it will match and insert shiftInterval on first
// occurrence, but later during recursion it will hit the original td but shiftInterval will be
// present and simple check for td.shiftInterval will always result in error.
if (td.shiftInterval && !td.dimension === allBackAliasMembers[timeShift.timeDimension]) {
throw new UserError(`Hierarchical time shift is not supported but was provided for '${td.dimension}'. Parent time shift is '${td.shiftInterval}' and current is '${timeShift.interval}'`);
}
return {
Expand All @@ -1440,7 +1445,6 @@ export class BaseQuery {
};
};
} else {
const allBackAliasMembers = this.allBackAliasTimeDimensions();
mapFn = (td) => {
const timeShift = memberDef.timeShiftReferences.find(r => r.timeDimension === td.dimension || td.dimension === allBackAliasMembers[r.timeDimension]);
if (timeShift) {
Expand Down
27 changes: 27 additions & 0 deletions packages/cubejs-schema-compiler/test/integration/postgres/sql-generation.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1444,6 +1444,33 @@ SELECT 1 AS revenue, cast('2024-01-01' AS timestamp) as time UNION ALL
{ visitors_multi_stage__create_date_created_at_day: '2017-01-06T00:00:00.000Z', visitors_multi_stage__revenue: '900', visitors_multi_stage__revenue_day_ago_via_join: '300' }
]));

it('CAGR (no td in time_shift via view)', async () => runQueryTest({
measures: [
'visitors_multi_stage.revenue',
'visitors_multi_stage.revenue_day_ago_no_td',
],
timeDimensions: [{
dimension: 'visitors_multi_stage.create_date_created_at',
granularity: 'day',
dateRange: ['2016-12-01', '2017-01-31']
}],
order: [{
id: 'visitors_multi_stage.create_date_created_at'
}],
timezone: 'America/Los_Angeles'
}, [
{
visitors_multi_stage__create_date_created_at_day: '2017-01-05T00:00:00.000Z',
visitors_multi_stage__revenue: '300',
visitors_multi_stage__revenue_day_ago_no_td: '200',
},
{
visitors_multi_stage__create_date_created_at_day: '2017-01-06T00:00:00.000Z',
visitors_multi_stage__revenue: '900',
visitors_multi_stage__revenue_day_ago_no_td: '300',
}
]));

it('sql utils', async () => runQueryTest({
measures: [
'visitors.visitor_count'
Expand Down
Loading