Skip to content

Commit a888943

Browse files
committed
fix tests
1 parent 6ba5294 commit a888943

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

packages/cubejs-schema-compiler/test/integration/mssql/mssql-pre-aggregations.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ describe('MSSqlPreAggregations', () => {
276276

277277
expect(preAggregationsDescription[0].invalidateKeyQueries[0][0].replace(/(\r\n|\n|\r)/gm, '')
278278
.replace(/\s+/g, ' '))
279-
.toMatch('SELECT CASE WHEN CURRENT_TIMESTAMP < DATEADD(day, 7, CAST(@_1 AS DATETIMEOFFSET)) THEN FLOOR((DATEDIFF(SECOND,\'1970-01-01\', GETUTCDATE())) / 3600) END');
279+
.toMatch('SELECT CASE WHEN CURRENT_TIMESTAMP < DATEADD(day, 7, CAST(@_1 AS DATETIMEOFFSET)) THEN FLOOR((-25200 + DATEDIFF(SECOND,\'1970-01-01\', GETUTCDATE())) / 3600) END');
280280

281281
return dbRunner
282282
.evaluateQueryWithPreAggregations(query)

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1183,7 +1183,7 @@ describe('SQL Generation', () => {
11831183
const utcOffset = moment.tz('America/Los_Angeles').utcOffset() * 60;
11841184
expect(query.everyRefreshKeySql({
11851185
every: '1 hour'
1186-
})).toEqual(['FLOOR((EXTRACT(EPOCH FROM NOW())) / 3600)', false, expect.any(BaseQuery)]);
1186+
})).toEqual(['FLOOR((-25200 + EXTRACT(EPOCH FROM NOW())) / 3600)', false, expect.any(BaseQuery)]);
11871187

11881188
// Standard syntax (minutes hours day month dow)
11891189
expect(query.everyRefreshKeySql({ every: '0 * * * *', timezone }))
@@ -1290,7 +1290,7 @@ describe('SQL Generation', () => {
12901290
expect(query.cacheKeyQueries()).toEqual([
12911291
[
12921292
// Postgres dialect
1293-
'SELECT FLOOR((EXTRACT(EPOCH FROM NOW())) / 600) as refresh_key',
1293+
'SELECT FLOOR((-25200 + EXTRACT(EPOCH FROM NOW())) / 600) as refresh_key',
12941294
[],
12951295
{
12961296
// false, because there is no externalQueryClass
@@ -1311,15 +1311,15 @@ describe('SQL Generation', () => {
13111311
],
13121312
timeDimensions: [],
13131313
filters: [],
1314-
timezone: 'America/Los_Angeles',
1314+
timezone: 'Europe/London',
13151315
externalQueryClass: MssqlQuery
13161316
});
13171317

13181318
// Query should not match any pre-aggregation!
13191319
expect(query.cacheKeyQueries()).toEqual([
13201320
[
13211321
// MSSQL dialect, because externalQueryClass
1322-
'SELECT FLOOR((DATEDIFF(SECOND,\'1970-01-01\', GETUTCDATE())) / 600) as refresh_key',
1322+
'SELECT FLOOR((3600 + DATEDIFF(SECOND,\'1970-01-01\', GETUTCDATE())) / 600) as refresh_key',
13231323
[],
13241324
{
13251325
// true, because externalQueryClass
@@ -1352,7 +1352,7 @@ describe('SQL Generation', () => {
13521352
expect(preAggregations[0].invalidateKeyQueries).toEqual([
13531353
[
13541354
// MSSQL dialect
1355-
'SELECT FLOOR((DATEDIFF(SECOND,\'1970-01-01\', GETUTCDATE())) / 3600) as refresh_key',
1355+
'SELECT FLOOR((-25200 + DATEDIFF(SECOND,\'1970-01-01\', GETUTCDATE())) / 3600) as refresh_key',
13561356
[],
13571357
{
13581358
external: true,
@@ -1405,15 +1405,15 @@ describe('SQL Generation', () => {
14051405
dateRange: ['2016-12-30', '2017-01-05']
14061406
}],
14071407
filters: [],
1408-
timezone: 'America/Los_Angeles',
1408+
timezone: 'Asia/Tokyo',
14091409
externalQueryClass: MssqlQuery
14101410
});
14111411

14121412
const preAggregations: any = query.newPreAggregations().preAggregationsDescription();
14131413
expect(preAggregations.length).toEqual(1);
14141414
expect(preAggregations[0].invalidateKeyQueries).toEqual([
14151415
[
1416-
'SELECT CASE\n WHEN CURRENT_TIMESTAMP < CAST(@_1 AS DATETIMEOFFSET) THEN FLOOR((DATEDIFF(SECOND,\'1970-01-01\', GETUTCDATE())) / 3600) END as refresh_key',
1416+
'SELECT CASE\n WHEN CURRENT_TIMESTAMP < CAST(@_1 AS DATETIMEOFFSET) THEN FLOOR((32400 + DATEDIFF(SECOND,\'1970-01-01\', GETUTCDATE())) / 3600) END as refresh_key',
14171417
[
14181418
'__TO_PARTITION_RANGE',
14191419
],
@@ -1496,7 +1496,7 @@ describe('SQL Generation', () => {
14961496
expect(preAggregations.length).toEqual(1);
14971497
expect(preAggregations[0].invalidateKeyQueries).toEqual([
14981498
[
1499-
'SELECT FLOOR((EXTRACT(EPOCH FROM NOW())) / 600) as refresh_key',
1499+
'SELECT FLOOR((-25200 + EXTRACT(EPOCH FROM NOW())) / 600) as refresh_key',
15001500
[],
15011501
{
15021502
external: false,
@@ -1527,7 +1527,7 @@ describe('SQL Generation', () => {
15271527
expect(preAggregations.length).toEqual(1);
15281528
expect(preAggregations[0].invalidateKeyQueries).toEqual([
15291529
[
1530-
'SELECT FLOOR((DATEDIFF(SECOND,\'1970-01-01\', GETUTCDATE())) / 600) as refresh_key',
1530+
'SELECT FLOOR((-25200 + DATEDIFF(SECOND,\'1970-01-01\', GETUTCDATE())) / 600) as refresh_key',
15311531
[],
15321532
{
15331533
external: true,

0 commit comments

Comments
 (0)