Skip to content

Commit 851c63a

Browse files
mtoy-googly-mooglymtoy-googly-moogly
committed
fix trino reverse
1 parent 8fbb030 commit 851c63a

File tree

1 file changed

+38
-34
lines changed

1 file changed

+38
-34
lines changed

‎packages/malloy/src/dialect/trino/dialect_functions.ts

Lines changed: 38 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -433,40 +433,44 @@ export const TRINO_DIALECT_FUNCTIONS: DefinitionBlueprintMap = {
433433
// array functions except those below
434434
array_join,
435435
sequence,
436-
...wrapDef('array_distinct', {x: {array: T}}, {array: T}),
437-
...wrapDef('array_except', {x: {array: T}, y: {array: T}}, {array: T}),
438-
...wrapDef('array_intersect', {x: {array: T}, y: {array: T}}, {array: T}),
439-
...wrapDef('array_max', {x: {array: T}}, T),
440-
...wrapDef('array_min', {x: {array: T}}, T),
441-
...wrapDef('array_normalize', {x: {array: T}, p: 'number'}, {array: T}),
442-
...wrapDef('array_remove', {x: {array: T}, element: T}, {array: T}),
436+
...wrapDef('array_distinct', {'x': {array: T}}, {array: T}),
437+
...wrapDef('array_except', {'x': {array: T}, 'y': {array: T}}, {array: T}),
438+
...wrapDef('array_intersect', {'x': {array: T}, 'y': {array: T}}, {array: T}),
439+
...wrapDef('array_max', {'x': {array: T}}, T),
440+
...wrapDef('array_min', {'x': {array: T}}, T),
441+
...wrapDef('array_normalize', {'x': {array: T}, 'p': 'number'}, {array: T}),
442+
...wrapDef('array_remove', {'x': {array: T}, 'element': T}, {array: T}),
443443
// mtoy todo document mising lambda sort
444-
...wrapDef('array_sort', {x: {array: T}}, {array: T}),
445-
...wrapDef('arrays_overlap', {x: {array: T}, y: {array: T}}, 'boolean'),
446-
...wrapDef('array_union', {x: {array: T}, y: {array: T}}, {array: T}),
447-
...wrapDef('cardinality', {x: {array: T}}, 'number'),
448-
...wrapDef('reverse', {x: {array: T}}, {array: T}),
449-
...wrapDef('shuffle', {x: {array: T}}, {array: T}),
450-
...wrapDef('combinations', {x: {array: T}, n: 'number'}, {array: {array: T}}),
451-
...wrapDef('contains', {x: {array: T}, element: T}, 'boolean'),
452-
...wrapDef('element_at', {x: {array: T}, oridnal: 'number'}, T),
453-
...wrapDef('flatten', {x: {array: {array: T}}}, {array: T}),
454-
...wrapDef('ngrams', {x: {array: T}, n: 'number'}, {array: {array: T}}),
455-
...wrapDef('repeat', {x: T, n: 'number'}, {array: T}),
444+
...wrapDef('array_sort', {'x': {array: T}}, {array: T}),
445+
...wrapDef('arrays_overlap', {'x': {array: T}, 'y': {array: T}}, 'boolean'),
446+
...wrapDef('array_union', {'x': {array: T}, 'y': {array: T}}, {array: T}),
447+
...wrapDef('cardinality', {'x': {array: T}}, 'number'),
448+
...wrapDef('reverse', {'x': 'string'}, 'string'),
449+
...wrapDef('shuffle', {'x': {array: T}}, {array: T}),
450+
...wrapDef(
451+
'combinations',
452+
{'x': {array: T}, 'n': 'number'},
453+
{array: {array: T}}
454+
),
455+
...wrapDef('contains', {'x': {array: T}, 'element': T}, 'boolean'),
456+
...wrapDef('element_at', {'x': {array: T}, 'oridnal': 'number'}, T),
457+
...wrapDef('flatten', {'x': {array: {array: T}}}, {array: T}),
458+
...wrapDef('ngrams', {'x': {array: T}, 'n': 'number'}, {array: {array: T}}),
459+
...wrapDef('repeat', {'x': T, 'n': 'number'}, {array: T}),
456460
...wrapDef(
457461
'slice',
458-
{x: {array: T}, start: 'number', len: 'number'},
462+
{'x': {array: T}, 'start': 'number', 'len': 'number'},
459463
{array: T}
460464
),
461465
...wrapDef(
462466
'split',
463467
{to_split: 'string', seperator: 'string'},
464468
{array: 'string'}
465469
),
466-
...wrapDef('trim_array', {x: {array: T}, n: 'number'}, {array: T}),
470+
...wrapDef('trim_array', {'x': {array: T}, 'n': 'number'}, {array: T}),
467471
...wrapDef(
468472
'array_split_into_chunks',
469-
{x: {array: T}, n: 'number'},
473+
{'x': {array: T}, 'n': 'number'},
470474
{array: {array: T}}
471475
),
472476
};
@@ -475,13 +479,13 @@ export const TRINO_DIALECT_FUNCTIONS: DefinitionBlueprintMap = {
475479

476480
const array_position: OverloadedDefinitionBlueprint = {
477481
first_instance: {
478-
takes: {'array_v': {array: T}, 'el': T},
482+
takes: {'x': {array: T}, 'el': T},
479483
generic: {T: ['any']},
480484
returns: 'number',
481485
impl: {function: 'ARRAY_POSITION'},
482486
},
483487
nth_instance: {
484-
takes: {'array_v': {array: T}, 'el': T, 'instance': 'number'},
488+
takes: {'x': {array: T}, 'el': T, 'instance': 'number'},
485489
generic: {T: ['any']},
486490
returns: 'number',
487491
impl: {function: 'ARRAY_POSITION'},
@@ -499,7 +503,7 @@ const array_intersect: OverloadedDefinitionBlueprint = {
499503
impl: {function: 'ARRAY_INTERSECT'},
500504
},
501505
nested_array: {
502-
takes: {'array_v': {array: {array: T}}},
506+
takes: {'x': {array: {array: T}}},
503507
generic: {'T': ['any']},
504508
returns: {array: T},
505509
impl: {function: 'ARRAY_INTERSECT'},
@@ -508,7 +512,7 @@ const array_intersect: OverloadedDefinitionBlueprint = {
508512

509513
const array_least_frequent: OverloadedDefinitionBlueprint = {
510514
array_only: {
511-
takes: {'array_v': {array: T}},
515+
takes: {'x': {array: T}},
512516
generic: {'T': ['any']},
513517
returns: {array: T},
514518
impl: {function: 'ARRAY_LEAST_FREQUENT'},
@@ -526,7 +530,7 @@ const array_least_frequent: OverloadedDefinitionBlueprint = {
526530

527531
const reverse: OverloadedDefinitionBlueprint = {
528532
yarra: {
529-
takes: {'array_v': {array: T}},
533+
takes: {'x': {array: T}},
530534
returns: {array: T},
531535
generic: {'T': ['any']},
532536
impl: {function: 'REVERSE'},
@@ -544,12 +548,12 @@ export const PRESTO_DIALECT_FUNCTIONS: DefinitionBlueprintMap = {
544548
array_least_frequent,
545549
array_position,
546550
reverse,
547-
...wrapDef('array_average', {'array_v': {array: T}}, 'number'),
548-
...wrapDef('array_has_duplicates', {'array_v': {array: T}}, 'boolean'),
551+
...wrapDef('array_average', {'x': {array: T}}, 'number'),
552+
...wrapDef('array_has_duplicates', {'x': {array: T}}, 'boolean'),
549553
...wrapDef('array_cum_sum', {numeric_array: {array: T}}, {array: 'number'}),
550-
...wrapDef('array_duplicates', {'array_v': {array: T}}, {array: T}),
551-
...wrapDef('array_sum', {'array_v': {array: T}}, 'number'),
552-
...wrapDef('array_sort_desc', {'array_v': {array: T}}, {array: T}),
553-
...wrapDef('remove_nulls', {'array_v': {array: T}}, {array: T}),
554-
...wrapDef('array_top_n', {'array_v': {array: T}, 'n': 'number'}, {array: T}),
554+
...wrapDef('array_duplicates', {'x': {array: T}}, {array: T}),
555+
...wrapDef('array_sum', {'x': {array: T}}, 'number'),
556+
...wrapDef('array_sort_desc', {'x': {array: T}}, {array: T}),
557+
...wrapDef('remove_nulls', {'x': {array: T}}, {array: T}),
558+
...wrapDef('array_top_n', {'x': {array: T}, 'n': 'number'}, {array: T}),
555559
};

0 commit comments

Comments
 (0)