Skip to content

Commit fee1d3f

Browse files
KSDaemonKSDaemon
committed
fix tests: have to add alias, because of too long identifiers
1 parent 20733cf commit fee1d3f

File tree

1 file changed

+61
-60
lines changed

1 file changed

+61
-60
lines changed

‎packages/cubejs-schema-compiler/test/integration/postgres/sql-generation.test.ts‎

Lines changed: 61 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@ describe('SQL Generation', () => {
296296
\${FILTER_PARAMS.visitor_checkins.created_at.filter('created_at')} AND
297297
\${FILTER_GROUP(FILTER_PARAMS.visitor_checkins.created_at.filter("(created_at - INTERVAL '3 DAY')"), FILTER_PARAMS.visitor_checkins.source.filter('source'))}
298298
\`,
299+
sql_alias: \`vc\`,
299300
300301
rewriteQueries: true,
301302
@@ -568,28 +569,28 @@ describe('SQL Generation', () => {
568569
visitors__created_at_day: '2017-01-02T00:00:00.000Z',
569570
visitors__visitor_revenue: '100',
570571
visitors__visitor_count: '1',
571-
visitor_checkins__visitor_checkins_count: '3',
572+
vc__visitor_checkins_count: '3',
572573
visitors__per_visitor_revenue: '100'
573574
},
574575
{
575576
visitors__created_at_day: '2017-01-04T00:00:00.000Z',
576577
visitors__visitor_revenue: '200',
577578
visitors__visitor_count: '1',
578-
visitor_checkins__visitor_checkins_count: '2',
579+
vc__visitor_checkins_count: '2',
579580
visitors__per_visitor_revenue: '200'
580581
},
581582
{
582583
visitors__created_at_day: '2017-01-05T00:00:00.000Z',
583584
visitors__visitor_revenue: null,
584585
visitors__visitor_count: '1',
585-
visitor_checkins__visitor_checkins_count: '1',
586+
vc__visitor_checkins_count: '1',
586587
visitors__per_visitor_revenue: null
587588
},
588589
{
589590
visitors__created_at_day: '2017-01-06T00:00:00.000Z',
590591
visitors__visitor_revenue: null,
591592
visitors__visitor_count: '2',
592-
visitor_checkins__visitor_checkins_count: '0',
593+
vc__visitor_checkins_count: '0',
593594
visitors__per_visitor_revenue: null
594595
}
595596
]
@@ -627,7 +628,7 @@ describe('SQL Generation', () => {
627628
}, [{
628629
visitors__visitor_revenue: '300',
629630
visitors__visitor_count: '5',
630-
visitor_checkins__visitor_checkins_count: '6',
631+
vc__visitor_checkins_count: '6',
631632
visitors__per_visitor_revenue: '60'
632633
}]));
633634

@@ -748,22 +749,22 @@ describe('SQL Generation', () => {
748749
{
749750
visitors__created_at_day: '2017-01-02T00:00:00.000Z',
750751
visitors__revenue_rolling: null,
751-
visitor_checkins__visitor_checkins_count: '3'
752+
vc__visitor_checkins_count: '3'
752753
},
753754
{
754755
visitors__created_at_day: '2017-01-04T00:00:00.000Z',
755756
visitors__revenue_rolling: '100',
756-
visitor_checkins__visitor_checkins_count: '2'
757+
vc__visitor_checkins_count: '2'
757758
},
758759
{
759760
visitors__created_at_day: '2017-01-05T00:00:00.000Z',
760761
visitors__revenue_rolling: '200',
761-
visitor_checkins__visitor_checkins_count: '1'
762+
vc__visitor_checkins_count: '1'
762763
},
763764
{
764765
visitors__created_at_day: '2017-01-06T00:00:00.000Z',
765766
visitors__revenue_rolling: '500',
766-
visitor_checkins__visitor_checkins_count: '0'
767+
vc__visitor_checkins_count: '0'
767768
}
768769
]));
769770

@@ -979,7 +980,7 @@ describe('SQL Generation', () => {
979980
return dbRunner.testQuery(query.buildSqlAndParams()).then(res => {
980981
console.log(JSON.stringify(res));
981982
expect(res).toEqual(
982-
[{ visitor_checkins__revenue_per_checkin: '50' }]
983+
[{ vc__revenue_per_checkin: '50' }]
983984
);
984985
});
985986
});
@@ -1000,7 +1001,7 @@ describe('SQL Generation', () => {
10001001
return dbRunner.testQuery(query.buildSqlAndParams()).then(res => {
10011002
console.log(JSON.stringify(res));
10021003
expect(res).toEqual(
1003-
[{ visitor_checkins__google_sourced_checkins: '1' }]
1004+
[{ vc__google_sourced_checkins: '1' }]
10041005
);
10051006
});
10061007
});
@@ -1024,7 +1025,7 @@ describe('SQL Generation', () => {
10241025
return dbRunner.testQuery(query.buildSqlAndParams()).then(res => {
10251026
console.log(JSON.stringify(res));
10261027
expect(res).toEqual(
1027-
[{ visitor_checkins__google_sourced_checkins: '1' }]
1028+
[{ vc__google_sourced_checkins: '1' }]
10281029
);
10291030
});
10301031
});
@@ -1435,15 +1436,15 @@ describe('SQL Generation', () => {
14351436
}]
14361437
}, [
14371438
{
1438-
visitor_checkins__cards_count: '0',
1439+
vc__cards_count: '0',
14391440
visitors__visitor_revenue: '300'
14401441
},
14411442
{
1442-
visitor_checkins__cards_count: '1',
1443+
vc__cards_count: '1',
14431444
visitors__visitor_revenue: '100'
14441445
},
14451446
{
1446-
visitor_checkins__cards_count: null,
1447+
vc__cards_count: null,
14471448
visitors__visitor_revenue: null
14481449
}
14491450
]));
@@ -1479,28 +1480,28 @@ describe('SQL Generation', () => {
14791480
expect(res).toEqual(
14801481
[
14811482
{
1482-
visitor_checkins__id: 3,
1483-
visitor_checkins__created_at_day: '2017-01-04T00:00:00.000Z',
1484-
visitor_checkins__visitor_checkins_count: 1,
1485-
visitor_checkins__visitor_checkins_rolling: 1
1483+
vc__id: 3,
1484+
vc__created_at_day: '2017-01-04T00:00:00.000Z',
1485+
vc__visitor_checkins_count: 1,
1486+
vc__visitor_checkins_rolling: 1
14861487
},
14871488
{
1488-
visitor_checkins__id: 4,
1489-
visitor_checkins__created_at_day: '2017-01-04T00:00:00.000Z',
1490-
visitor_checkins__visitor_checkins_count: 1,
1491-
visitor_checkins__visitor_checkins_rolling: 1
1489+
vc__id: 4,
1490+
vc__created_at_day: '2017-01-04T00:00:00.000Z',
1491+
vc__visitor_checkins_count: 1,
1492+
vc__visitor_checkins_rolling: 1
14921493
},
14931494
{
1494-
visitor_checkins__id: 5,
1495-
visitor_checkins__created_at_day: '2017-01-04T00:00:00.000Z',
1496-
visitor_checkins__visitor_checkins_count: 1,
1497-
visitor_checkins__visitor_checkins_rolling: 1
1495+
vc__id: 5,
1496+
vc__created_at_day: '2017-01-04T00:00:00.000Z',
1497+
vc__visitor_checkins_count: 1,
1498+
vc__visitor_checkins_rolling: 1
14981499
},
14991500
{
1500-
visitor_checkins__id: 6,
1501-
visitor_checkins__created_at_day: '2017-01-05T00:00:00.000Z',
1502-
visitor_checkins__visitor_checkins_count: 1,
1503-
visitor_checkins__visitor_checkins_rolling: 1
1501+
vc__id: 6,
1502+
vc__created_at_day: '2017-01-05T00:00:00.000Z',
1503+
vc__visitor_checkins_count: 1,
1504+
vc__visitor_checkins_rolling: 1
15041505
}
15051506
]
15061507
);
@@ -1549,7 +1550,7 @@ describe('SQL Generation', () => {
15491550
expect(res).toEqual(
15501551
[
15511552
{
1552-
visitor_checkins__source: 'google',
1553+
vc__source: 'google',
15531554
visitors__created_at_day: '2017-01-02T00:00:00.000Z',
15541555
visitors__per_visitor_revenue: '100'
15551556
}
@@ -1596,7 +1597,7 @@ describe('SQL Generation', () => {
15961597
console.log(JSON.stringify(res));
15971598
expect(res).toEqual(
15981599
[{
1599-
visitor_checkins__source: 'google',
1600+
vc__source: 'google',
16001601
visitors__created_at_day: '2017-01-02T00:00:00.000Z',
16011602
visitors__visitor_revenue: '100'
16021603
}]
@@ -1623,7 +1624,7 @@ describe('SQL Generation', () => {
16231624
return dbRunner.testQuery(query.buildSqlAndParams()).then(res => {
16241625
console.log(JSON.stringify(res));
16251626
expect(res).toEqual(
1626-
[{ visitor_checkins__revenue_per_checkin: '60' }]
1627+
[{ vc__revenue_per_checkin: '60' }]
16271628
);
16281629
});
16291630
});
@@ -1649,7 +1650,7 @@ describe('SQL Generation', () => {
16491650
return dbRunner.testQuery(query.buildSqlAndParams()).then(res => {
16501651
console.log(JSON.stringify(res));
16511652
expect(res).toEqual(
1652-
[{ visitor_checkins__revenue_per_checkin: '50' }]
1653+
[{ vc__revenue_per_checkin: '50' }]
16531654
);
16541655
});
16551656
});
@@ -1694,12 +1695,12 @@ describe('SQL Generation', () => {
16941695
ungrouped: true,
16951696
allowUngroupedWithoutPrimaryKey: true,
16961697
}, [
1697-
{ visitor_checkins__created_at_day: '2017-01-02T00:00:00.000Z', visitor_checkins__google_sourced_checkins: null },
1698-
{ visitor_checkins__created_at_day: '2017-01-03T00:00:00.000Z', visitor_checkins__google_sourced_checkins: null },
1699-
{ visitor_checkins__created_at_day: '2017-01-04T00:00:00.000Z', visitor_checkins__google_sourced_checkins: null },
1700-
{ visitor_checkins__created_at_day: '2017-01-04T00:00:00.000Z', visitor_checkins__google_sourced_checkins: null },
1701-
{ visitor_checkins__created_at_day: '2017-01-04T00:00:00.000Z', visitor_checkins__google_sourced_checkins: null },
1702-
{ visitor_checkins__created_at_day: '2017-01-05T00:00:00.000Z', visitor_checkins__google_sourced_checkins: 1 },
1698+
{ vc__created_at_day: '2017-01-02T00:00:00.000Z', vc__google_sourced_checkins: null },
1699+
{ vc__created_at_day: '2017-01-03T00:00:00.000Z', vc__google_sourced_checkins: null },
1700+
{ vc__created_at_day: '2017-01-04T00:00:00.000Z', vc__google_sourced_checkins: null },
1701+
{ vc__created_at_day: '2017-01-04T00:00:00.000Z', vc__google_sourced_checkins: null },
1702+
{ vc__created_at_day: '2017-01-04T00:00:00.000Z', vc__google_sourced_checkins: null },
1703+
{ vc__created_at_day: '2017-01-05T00:00:00.000Z', vc__google_sourced_checkins: 1 },
17031704
]));
17041705

17051706
it('ungrouped filtered distinct count', () => runQueryTest({
@@ -1718,12 +1719,12 @@ describe('SQL Generation', () => {
17181719
ungrouped: true,
17191720
allowUngroupedWithoutPrimaryKey: true,
17201721
}, [
1721-
{ visitor_checkins__created_at_day: '2017-01-02T00:00:00.000Z', visitor_checkins__unique_google_sourced_checkins: null },
1722-
{ visitor_checkins__created_at_day: '2017-01-03T00:00:00.000Z', visitor_checkins__unique_google_sourced_checkins: null },
1723-
{ visitor_checkins__created_at_day: '2017-01-04T00:00:00.000Z', visitor_checkins__unique_google_sourced_checkins: null },
1724-
{ visitor_checkins__created_at_day: '2017-01-04T00:00:00.000Z', visitor_checkins__unique_google_sourced_checkins: null },
1725-
{ visitor_checkins__created_at_day: '2017-01-04T00:00:00.000Z', visitor_checkins__unique_google_sourced_checkins: null },
1726-
{ visitor_checkins__created_at_day: '2017-01-05T00:00:00.000Z', visitor_checkins__unique_google_sourced_checkins: 1 },
1722+
{ vc__created_at_day: '2017-01-02T00:00:00.000Z', vc__unique_google_sourced_checkins: null },
1723+
{ vc__created_at_day: '2017-01-03T00:00:00.000Z', vc__unique_google_sourced_checkins: null },
1724+
{ vc__created_at_day: '2017-01-04T00:00:00.000Z', vc__unique_google_sourced_checkins: null },
1725+
{ vc__created_at_day: '2017-01-04T00:00:00.000Z', vc__unique_google_sourced_checkins: null },
1726+
{ vc__created_at_day: '2017-01-04T00:00:00.000Z', vc__unique_google_sourced_checkins: null },
1727+
{ vc__created_at_day: '2017-01-05T00:00:00.000Z', vc__unique_google_sourced_checkins: 1 },
17271728
]));
17281729

17291730
it('ungrouped ratio measure', () => runQueryTest({
@@ -1742,12 +1743,12 @@ describe('SQL Generation', () => {
17421743
ungrouped: true,
17431744
allowUngroupedWithoutPrimaryKey: true,
17441745
}, [
1745-
{ visitor_checkins__created_at_day: '2017-01-02T00:00:00.000Z', visitor_checkins__unique_sources_per_checking: 1 },
1746-
{ visitor_checkins__created_at_day: '2017-01-03T00:00:00.000Z', visitor_checkins__unique_sources_per_checking: 1 },
1747-
{ visitor_checkins__created_at_day: '2017-01-04T00:00:00.000Z', visitor_checkins__unique_sources_per_checking: 1 },
1748-
{ visitor_checkins__created_at_day: '2017-01-04T00:00:00.000Z', visitor_checkins__unique_sources_per_checking: 1 },
1749-
{ visitor_checkins__created_at_day: '2017-01-04T00:00:00.000Z', visitor_checkins__unique_sources_per_checking: 1 },
1750-
{ visitor_checkins__created_at_day: '2017-01-05T00:00:00.000Z', visitor_checkins__unique_sources_per_checking: 1 },
1746+
{ vc__created_at_day: '2017-01-02T00:00:00.000Z', vc__unique_sources_per_checking: 1 },
1747+
{ vc__created_at_day: '2017-01-03T00:00:00.000Z', vc__unique_sources_per_checking: 1 },
1748+
{ vc__created_at_day: '2017-01-04T00:00:00.000Z', vc__unique_sources_per_checking: 1 },
1749+
{ vc__created_at_day: '2017-01-04T00:00:00.000Z', vc__unique_sources_per_checking: 1 },
1750+
{ vc__created_at_day: '2017-01-04T00:00:00.000Z', vc__unique_sources_per_checking: 1 },
1751+
{ vc__created_at_day: '2017-01-05T00:00:00.000Z', vc__unique_sources_per_checking: 1 },
17511752
]));
17521753

17531754
it('builds geo dimension', () => runQueryTest({
@@ -2175,7 +2176,7 @@ describe('SQL Generation', () => {
21752176
}],
21762177
order: []
21772178
}, [
2178-
{ visitor_checkins__visitor_checkins_count: '4' }
2179+
{ vc__visitor_checkins_count: '4' }
21792180
])
21802181
);
21812182

@@ -2209,7 +2210,7 @@ describe('SQL Generation', () => {
22092210
}],
22102211
order: []
22112212
}, [
2212-
{ visitor_checkins__visitor_checkins_count: '4' }
2213+
{ vc__visitor_checkins_count: '4' }
22132214
])
22142215
);
22152216

@@ -2227,7 +2228,7 @@ describe('SQL Generation', () => {
22272228
}],
22282229
order: []
22292230
}, [
2230-
{ visitor_checkins__visitor_checkins_count: '4' }
2231+
{ vc__visitor_checkins_count: '4' }
22312232
])
22322233
);
22332234

@@ -2263,7 +2264,7 @@ describe('SQL Generation', () => {
22632264
}],
22642265
order: []
22652266
}, [
2266-
{ visitor_checkins__visitor_checkins_count: '1' }
2267+
{ vc__visitor_checkins_count: '1' }
22672268
])
22682269
);
22692270

@@ -2303,7 +2304,7 @@ describe('SQL Generation', () => {
23032304
}],
23042305
order: []
23052306
}, [
2306-
{ visitor_checkins__visitor_checkins_count: '1' }
2307+
{ vc__visitor_checkins_count: '1' }
23072308
])
23082309
);
23092310

@@ -2770,11 +2771,11 @@ describe('SQL Generation', () => {
27702771
[{
27712772
visitors__percentage_of_total: 9,
27722773
visitors__revenue: '100',
2773-
visitor_checkins__source: 'google'
2774+
vc__source: 'google'
27742775
}, {
27752776
visitors__percentage_of_total: 91,
27762777
visitors__revenue: '1000',
2777-
visitor_checkins__source: null
2778+
vc__source: null
27782779
}]
27792780
));
27802781

0 commit comments

Comments
 (0)