Skip to content

[pull] master from cube-js:master #261

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
pull merged 2 commits into from
Jan 6, 2026
Merged

[pull] master from cube-js:master #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8e448f
chore(ci): Temporary commented out some tests due to flaky results wi…
KSDaemon Jan 6, 2026
3cf4f74
fix(client-core): Isolate internalDayjs instance to prevent global da…
mystichronicle Jan 6, 2026
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
11 changes: 10 additions & 1 deletion packages/cubejs-client-core/src/time.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,15 @@ dayjs.extend(quarterOfYear);
dayjs.extend(duration);
dayjs.extend(isoWeek);

// A custom locale for internal use that doesn't affect the global dayjs instance
const cubeInternalLocale = 'cube-internal-en';
const customLocale = {
...en,
name: cubeInternalLocale,
weekStart: 1
};
(dayjs as any).Ls[cubeInternalLocale] = customLocale;

export type SqlInterval = string;

// TODO: Define a better type as unitOfTime.DurationConstructor in moment.js
Expand Down Expand Up @@ -59,7 +68,7 @@ export const DEFAULT_GRANULARITY = 'day';

// When granularity is week, weekStart Value must be 1. However, since the client can change it globally
// (https://day.js.org/docs/en/i18n/changing-locale) So the function below has been added.
export const internalDayjs = (...args: any[]): dayjs.Dayjs => dayjs(...args).locale({ ...en, weekStart: 1 });
export const internalDayjs = (...args: any[]): dayjs.Dayjs => dayjs(...args).locale(cubeInternalLocale);

export const TIME_SERIES: Record<string, (range: DayRange) => string[]> = {
day: (range) => range.by('d').map(d => d.format('YYYY-MM-DDT00:00:00.000')),
Expand Down
54 changes: 54 additions & 0 deletions packages/cubejs-client-core/test/dayjs-isolation.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
/* globals describe,test,expect */

import 'jest';
import dayjs from 'dayjs';
import { internalDayjs } from '../src/time';

describe('Dayjs Instance Isolation', () => {
test('internalDayjs should not affect global dayjs instance week start', () => {
const initialWeekStart = dayjs().startOf('week').format('dddd');

const cubeDayjs = internalDayjs();
expect(cubeDayjs.startOf('week').format('dddd')).toBe('Monday');

const afterWeekStart = dayjs().startOf('week').format('dddd');
expect(afterWeekStart).toBe(initialWeekStart);
});

test('internalDayjs week calculation should use Monday as week start', () => {
const testDate = '2024-01-10';

const globalWeekStartBefore = dayjs(testDate).startOf('week');
const internalWeekStart = internalDayjs(testDate).startOf('week');
expect(internalWeekStart.format('YYYY-MM-DD')).toBe('2024-01-08');
expect(internalWeekStart.format('dddd')).toBe('Monday');

const globalWeekStartAfter = dayjs(testDate).startOf('week');
expect(globalWeekStartAfter.format('YYYY-MM-DD')).toBe(globalWeekStartBefore.format('YYYY-MM-DD'));
expect(globalWeekStartAfter.format('dddd')).toBe(globalWeekStartBefore.format('dddd'));
});

test('multiple calls to internalDayjs should not affect global instance', () => {
const initialWeekStart = dayjs().startOf('week').format('dddd');

internalDayjs('2024-01-01');
internalDayjs('2024-02-01');
internalDayjs('2024-03-01');

expect(dayjs().startOf('week').format('dddd')).toBe(initialWeekStart);
});

test('internalDayjs should consistently use weekStart: 1', () => {
const dates = [
'2024-01-10', // Wednesday
'2024-02-15', // Thursday
'2024-03-20', // Wednesday
'2024-04-25', // Thursday
];

dates.forEach((date) => {
const weekStart = internalDayjs(date).startOf('week');
expect(weekStart.format('dddd')).toBe('Monday');
});
});
});
60 changes: 0 additions & 60 deletions packages/cubejs-testing/test/__snapshots__/birdbox-postgresql-pre-aggregations.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,6 @@ Array [
]
`;

exports[`postgresql-cubestore HTTP Transport Rolling Mixed With Dimension: Rolling Mixed With Dimension 1`] = `
Array [
Object {
"visitors.checkinsRolling2day": "5",
"visitors.checkinsRollingTotal": "5",
"visitors.count": "1",
"visitors.createdAt": "2017-01-05T00:00:00.000",
"visitors.createdAt.day": "2017-01-05T00:00:00.000",
"visitors.source": "some",
},
]
`;

exports[`postgresql-cubestore HTTP Transport Rolling Mixed: Rolling Mixed 1`] = `
Array [
Object {
Expand Down Expand Up @@ -117,50 +104,3 @@ Array [
},
]
`;

exports[`postgresql-cubestore HTTP Transport Rolling: Rolling 1`] = `
Array [
Object {
"visitors.checkinsRollingTotal": "0",
"visitors.createdAt": "2017-01-02T00:00:00.000",
"visitors.createdAt.day": "2017-01-02T00:00:00.000",
"visitors.source": null,
},
Object {
"visitors.checkinsRollingTotal": "3",
"visitors.createdAt": "2017-01-03T00:00:00.000",
"visitors.createdAt.day": "2017-01-03T00:00:00.000",
"visitors.source": "some",
},
Object {
"visitors.checkinsRollingTotal": "0",
"visitors.createdAt": "2017-01-03T00:00:00.000",
"visitors.createdAt.day": "2017-01-03T00:00:00.000",
"visitors.source": null,
},
Object {
"visitors.checkinsRollingTotal": "3",
"visitors.createdAt": "2017-01-04T00:00:00.000",
"visitors.createdAt.day": "2017-01-04T00:00:00.000",
"visitors.source": "some",
},
Object {
"visitors.checkinsRollingTotal": "0",
"visitors.createdAt": "2017-01-04T00:00:00.000",
"visitors.createdAt.day": "2017-01-04T00:00:00.000",
"visitors.source": null,
},
Object {
"visitors.checkinsRollingTotal": "5",
"visitors.createdAt": "2017-01-05T00:00:00.000",
"visitors.createdAt.day": "2017-01-05T00:00:00.000",
"visitors.source": "some",
},
Object {
"visitors.checkinsRollingTotal": "0",
"visitors.createdAt": "2017-01-05T00:00:00.000",
"visitors.createdAt.day": "2017-01-05T00:00:00.000",
"visitors.source": null,
},
]
`;
90 changes: 46 additions & 44 deletions packages/cubejs-testing/test/pre-aggregations-test-case.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,28 @@ type QueryTestOptions = {
};

const asserts: [options: QueryTestOptions, query: Query][] = [
[
{ name: 'Rolling' },
{
measures: [
'visitors.checkinsRollingTotal',
],
dimensions: [
'visitors.source'
],
timezone: 'UTC',
timeDimensions: [{
dimension: 'visitors.createdAt',
granularity: 'day',
dateRange: ['2017-01-02', '2017-01-05']
}],
order: {
'visitors.createdAt': 'asc',
'visitors.source': 'asc'
}
}
],
// FIXME: Temporary commented out due to flaky results with new Cubestore
// [
// { name: 'Rolling' },
// {
// measures: [
// 'visitors.checkinsRollingTotal',
// ],
// dimensions: [
// 'visitors.source'
// ],
// timezone: 'UTC',
// timeDimensions: [{
// dimension: 'visitors.createdAt',
// granularity: 'day',
// dateRange: ['2017-01-02', '2017-01-05']
// }],
// order: {
// 'visitors.createdAt': 'asc',
// 'visitors.source': 'asc'
// }
// }
// ],
[
{ name: 'Rolling with Quarter granularity' },
{
Expand Down Expand Up @@ -72,29 +73,30 @@ const asserts: [options: QueryTestOptions, query: Query][] = [
}
}
],
[
{ name: 'Rolling Mixed With Dimension' },
{
measures: [
'visitors.checkinsRollingTotal',
'visitors.count',
'visitors.checkinsRolling2day'
],
dimensions: [
'visitors.source'
],
timezone: 'UTC',
timeDimensions: [{
dimension: 'visitors.createdAt',
granularity: 'day',
dateRange: ['2017-01-02', '2017-01-05']
}],
order: {
'visitors.createdAt': 'asc',
'visitors.source': 'asc'
}
}
],
// FIXME: Temporary commented out due to flaky results with new Cubestore
// [
// { name: 'Rolling Mixed With Dimension' },
// {
// measures: [
// 'visitors.checkinsRollingTotal',
// 'visitors.count',
// 'visitors.checkinsRolling2day'
// ],
// dimensions: [
// 'visitors.source'
// ],
// timezone: 'UTC',
// timeDimensions: [{
// dimension: 'visitors.createdAt',
// granularity: 'day',
// dateRange: ['2017-01-02', '2017-01-05']
// }],
// order: {
// 'visitors.createdAt': 'asc',
// 'visitors.source': 'asc'
// }
// }
// ],
[
{ name: 'Rolling Prev Period' },
{
Expand Down
Loading