@@ -2425,91 +2425,103 @@ describe('PreAggregations', () => {
24252425 } ) ;
24262426 } ) ;
24272427
2428- it ( 'rollup join existing joins' , async ( ) => {
2429- await compiler . compile ( ) ;
2430-
2431- const query = new PostgresQuery ( { joinGraph, cubeEvaluator, compiler } , {
2432- measures : [
2433- 'visitor_checkins.count' ,
2434- ] ,
2435- dimensions : [ 'visitors.source' , 'cards.visitorId' ] ,
2436- preAggregationsSchema : '' ,
2437- order : [ {
2438- id : 'visitors.source' ,
2439- } , {
2440- id : 'cards.visitorId' ,
2441- } ] ,
2442- timezone : 'UTC' ,
2428+ if ( getEnv ( 'nativeSqlPlanner' ) ) {
2429+ it . skip ( 'FIXME(tesseract): rollup join existing joins' , ( ) => {
2430+ // TODO: Fix in tesseract
24432431 } ) ;
2432+ } else {
2433+ it ( 'rollup join existing joins' , async ( ) => {
2434+ await compiler . compile ( ) ;
24442435
2445- const queryAndParams = query . buildSqlAndParams ( ) ;
2446- console . log ( queryAndParams ) ;
2447- const preAggregationsDescription = query . preAggregations ?. preAggregationsDescription ( ) ;
2448- console . log ( preAggregationsDescription ) ;
2436+ const query = new PostgresQuery ( { joinGraph, cubeEvaluator, compiler } , {
2437+ measures : [
2438+ 'visitor_checkins.count' ,
2439+ ] ,
2440+ dimensions : [ 'visitors.source' , 'cards.visitorId' ] ,
2441+ preAggregationsSchema : '' ,
2442+ order : [ {
2443+ id : 'visitors.source' ,
2444+ } , {
2445+ id : 'cards.visitorId' ,
2446+ } ] ,
2447+ timezone : 'UTC' ,
2448+ } ) ;
24492449
2450- console . log ( query . preAggregations ?. rollupMatchResultDescriptions ( ) ) ;
2450+ const queryAndParams = query . buildSqlAndParams ( ) ;
2451+ console . log ( queryAndParams ) ;
2452+ const preAggregationsDescription = query . preAggregations ?. preAggregationsDescription ( ) ;
2453+ console . log ( preAggregationsDescription ) ;
24512454
2452- const queries = dbRunner . tempTablePreAggregations ( preAggregationsDescription ) ;
2455+ console . log ( query . preAggregations ?. rollupMatchResultDescriptions ( ) ) ;
24532456
2454- console . log ( JSON . stringify ( queries . concat ( queryAndParams ) ) ) ;
2457+ const queries = dbRunner . tempTablePreAggregations ( preAggregationsDescription ) ;
24552458
2456- return dbRunner . evaluateQueryWithPreAggregations ( query ) . then ( res => {
2457- console . log ( JSON . stringify ( res ) ) ;
2458- expect ( res ) . toEqual (
2459- [
2460- { visitors__source : 'google' , cards__visitor_id : 3 , vc__count : '1' } ,
2461- { visitors__source : 'some' , cards__visitor_id : 1 , vc__count : '3' } ,
2462- { visitors__source : 'some' , cards__visitor_id : null , vc__count : '2' } ,
2463- { visitors__source : null , cards__visitor_id : null , vc__count : '0' } ,
2464- ] ,
2465- ) ;
2466- } ) ;
2467- } ) ;
2459+ console . log ( JSON . stringify ( queries . concat ( queryAndParams ) ) ) ;
24682460
2469- it ( 'rollup join partitioned' , async ( ) => {
2470- await compiler . compile ( ) ;
2461+ return dbRunner . evaluateQueryWithPreAggregations ( query ) . then ( res => {
2462+ console . log ( JSON . stringify ( res ) ) ;
2463+ expect ( res ) . toEqual (
2464+ [
2465+ { visitors__source : 'google' , cards__visitor_id : 3 , vc__count : '1' } ,
2466+ { visitors__source : 'some' , cards__visitor_id : 1 , vc__count : '3' } ,
2467+ { visitors__source : 'some' , cards__visitor_id : null , vc__count : '2' } ,
2468+ { visitors__source : null , cards__visitor_id : null , vc__count : '0' } ,
2469+ ] ,
2470+ ) ;
2471+ } ) ;
2472+ } ) ;
2473+ }
24712474
2472- const query = new PostgresQuery ( { joinGraph, cubeEvaluator, compiler } , {
2473- measures : [
2474- 'visitor_checkins.count' ,
2475- ] ,
2476- dimensions : [ 'visitors.source' ] ,
2477- timezone : 'America/Los_Angeles' ,
2478- preAggregationsSchema : '' ,
2479- timeDimensions : [ {
2480- dimension : 'visitors.createdAt' ,
2481- granularity : 'hour' ,
2482- dateRange : [ '2017-01-03' , '2017-01-04' ]
2483- } ] ,
2484- order : [ {
2485- id : 'visitors.createdAt'
2486- } ] ,
2475+ if ( getEnv ( 'nativeSqlPlanner' ) ) {
2476+ it . skip ( 'FIXME(tesseract): rollup join partitioned' , ( ) => {
2477+ // TODO: Fix in tesseract
24872478 } ) ;
2479+ } else {
2480+ it ( 'rollup join partitioned' , async ( ) => {
2481+ await compiler . compile ( ) ;
24882482
2489- const queryAndParams = query . buildSqlAndParams ( ) ;
2490- console . log ( queryAndParams ) ;
2491- const preAggregationsDescription = query . preAggregations ?. preAggregationsDescription ( ) ;
2492- console . log ( preAggregationsDescription ) ;
2483+ const query = new PostgresQuery ( { joinGraph, cubeEvaluator, compiler } , {
2484+ measures : [
2485+ 'visitor_checkins.count' ,
2486+ ] ,
2487+ dimensions : [ 'visitors.source' ] ,
2488+ timezone : 'America/Los_Angeles' ,
2489+ preAggregationsSchema : '' ,
2490+ timeDimensions : [ {
2491+ dimension : 'visitors.createdAt' ,
2492+ granularity : 'hour' ,
2493+ dateRange : [ '2017-01-03' , '2017-01-04' ]
2494+ } ] ,
2495+ order : [ {
2496+ id : 'visitors.createdAt'
2497+ } ] ,
2498+ } ) ;
24932499
2494- console . log ( query . preAggregations ?. rollupMatchResultDescriptions ( ) ) ;
2500+ const queryAndParams = query . buildSqlAndParams ( ) ;
2501+ console . log ( queryAndParams ) ;
2502+ const preAggregationsDescription = query . preAggregations ?. preAggregationsDescription ( ) ;
2503+ console . log ( preAggregationsDescription ) ;
24952504
2496- const queries = dbRunner . tempTablePreAggregations ( preAggregationsDescription ) ;
2505+ console . log ( query . preAggregations ?. rollupMatchResultDescriptions ( ) ) ;
24972506
2498- console . log ( JSON . stringify ( queries . concat ( queryAndParams ) ) ) ;
2507+ const queries = dbRunner . tempTablePreAggregations ( preAggregationsDescription ) ;
24992508
2500- return dbRunner . evaluateQueryWithPreAggregations ( query ) . then ( res => {
2501- console . log ( JSON . stringify ( res ) ) ;
2502- expect ( res ) . toEqual (
2503- [
2504- {
2505- visitors__source : 'some' ,
2506- visitors__created_at_hour : '2017-01-04T16:00:00.000Z' ,
2507- vc__count : '2'
2508- }
2509- ] ,
2510- ) ;
2509+ console . log ( JSON . stringify ( queries . concat ( queryAndParams ) ) ) ;
2510+
2511+ return dbRunner . evaluateQueryWithPreAggregations ( query ) . then ( res => {
2512+ console . log ( JSON . stringify ( res ) ) ;
2513+ expect ( res ) . toEqual (
2514+ [
2515+ {
2516+ visitors__source : 'some' ,
2517+ visitors__created_at_hour : '2017-01-04T16:00:00.000Z' ,
2518+ vc__count : '2'
2519+ }
2520+ ] ,
2521+ ) ;
2522+ } ) ;
25112523 } ) ;
2512- } ) ;
2524+ }
25132525
25142526 it ( 'partitioned without time' , async ( ) => {
25152527 await compiler . compile ( ) ;
0 commit comments