File tree Expand file tree Collapse file tree 2 files changed +7
-3
lines changed Expand file tree Collapse file tree 2 files changed +7
-3
lines changed Original file line number Diff line number Diff line change @@ -884,7 +884,7 @@ impl CubeScanWrapperNode {
884
884
vec ! [ ] ,
885
885
vec ! [ ] ,
886
886
vec ! [ ] ,
887
- // TODO
887
+ vec ! [ ] ,
888
888
from_alias. clone ( ) . unwrap_or ( "" . to_string ( ) ) ,
889
889
None ,
890
890
None ,
@@ -3579,7 +3579,7 @@ impl WrappedSelectNode {
3579
3579
aggregate,
3580
3580
patch_measures,
3581
3581
filter,
3582
- window : _ ,
3582
+ window,
3583
3583
order,
3584
3584
} = columns;
3585
3585
@@ -3597,7 +3597,7 @@ impl WrappedSelectNode {
3597
3597
group_by. into_iter ( ) . map ( |( m, _) | m) . collect ( ) ,
3598
3598
group_descs,
3599
3599
aggregate. into_iter ( ) . map ( |( m, _) | m) . collect ( ) ,
3600
- // TODO
3600
+ window . into_iter ( ) . map ( | ( m , _ ) | m ) . collect ( ) ,
3601
3601
from_alias. unwrap_or ( "" . to_string ( ) ) ,
3602
3602
if !filter. is_empty ( ) {
3603
3603
Some ( filter. iter ( ) . map ( |( f, _) | f. expr . to_string ( ) ) . join ( " AND " ) )
Original file line number Diff line number Diff line change @@ -402,6 +402,7 @@ impl SqlTemplates {
402
402
group_by : Vec < AliasedColumn > ,
403
403
group_descs : Vec < Option < GroupingSetDesc > > ,
404
404
aggregate : Vec < AliasedColumn > ,
405
+ window : Vec < AliasedColumn > ,
405
406
alias : String ,
406
407
filter : Option < String > ,
407
408
_having : Option < String > ,
@@ -412,11 +413,13 @@ impl SqlTemplates {
412
413
) -> Result < String , CubeError > {
413
414
let group_by = self . to_template_columns ( group_by) ?;
414
415
let aggregate = self . to_template_columns ( aggregate) ?;
416
+ let window = self . to_template_columns ( window) ?;
415
417
let projection = self . to_template_columns ( projection) ?;
416
418
let order_by = self . to_template_columns ( order_by) ?;
417
419
let select_concat = group_by
418
420
. iter ( )
419
421
. chain ( aggregate. iter ( ) )
422
+ . chain ( window. iter ( ) )
420
423
. chain ( projection. iter ( ) )
421
424
. cloned ( )
422
425
. collect :: < Vec < _ > > ( ) ;
@@ -437,6 +440,7 @@ impl SqlTemplates {
437
440
select_concat => select_concat,
438
441
group_by => group_by_expr,
439
442
aggregate => aggregate,
443
+ window => window,
440
444
projection => projection,
441
445
order_by => order_by,
442
446
filter => filter,
You can’t perform that action at this time.
0 commit comments