From d7d19c3008f706bced1e7fb5fa2bf6b626374a87 Mon Sep 17 00:00:00 2001 From: John Ed Quinn Date: Thu, 8 Aug 2024 11:57:54 -0700 Subject: [PATCH 1/2] Fixes miscellaneous test cases --- partiql-tests-data/eval/query/pivot.ion | 15 ++++++---- .../eval/query/select/projection.ion | 30 ++++++++++--------- 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/partiql-tests-data/eval/query/pivot.ion b/partiql-tests-data/eval/query/pivot.ion index deb62a3..c6549fc 100644 --- a/partiql-tests-data/eval/query/pivot.ion +++ b/partiql-tests-data/eval/query/pivot.ion @@ -45,12 +45,17 @@ pivot::[ { name:"pivotBadFieldType", statement:"PIVOT a.name AT i FROM animals AS a AT i", - assert:{ - evalMode:[EvalModeCoerce, EvalModeError], - result:EvaluationSuccess, - output:{ + assert: [ + { + evalMode: EvalModeCoerce, + result: EvaluationSuccess, + output:{} + }, + { + evalMode: EvalModeError, + result: EvaluationFail } - } + ] }, { name:"pivotUnpivotWithWhereOrderByLimit", diff --git a/partiql-tests-data/eval/query/select/projection.ion b/partiql-tests-data/eval/query/select/projection.ion index 91c6bc9..a3be9f9 100644 --- a/partiql-tests-data/eval/query/select/projection.ion +++ b/partiql-tests-data/eval/query/select/projection.ion @@ -24,11 +24,17 @@ { name:"projectionIterationBehaviorUnfiltered_select_list", statement:"select x.someColumn from <<{'someColumn': MISSING}>> AS x", - assert:{ - evalMode:[EvalModeCoerce, EvalModeError], - result:EvaluationSuccess, - output:$bag::[{}] - } + assert: [ + { + evalMode: EvalModeCoerce, + result: EvaluationSuccess, + output: $bag::[{}] + }, + { + evalMode: EvalModeError, + result: EvaluationFail + } + ] }, { name:"projectionIterationBehaviorUnfiltered_select_star", @@ -36,11 +42,7 @@ assert:{ evalMode:[EvalModeCoerce, EvalModeError], result:EvaluationSuccess, - output:$bag::[ - { - _1:{} - } - ] + output:$bag::[ { } ] } } ] @@ -118,10 +120,10 @@ result:EvaluationSuccess, output:$bag::[ { - _1:( - 1 - 2 - ) + _1: 1 + }, + { + _1: 2 } ] } From eb10224db761010399c36660f39d0937c9d7117f Mon Sep 17 00:00:00 2001 From: John Ed Quinn Date: Tue, 27 Aug 2024 15:12:05 -0700 Subject: [PATCH 2/2] Revert SEXP change --- partiql-tests-data/eval/query/select/projection.ion | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/partiql-tests-data/eval/query/select/projection.ion b/partiql-tests-data/eval/query/select/projection.ion index a3be9f9..6020fc0 100644 --- a/partiql-tests-data/eval/query/select/projection.ion +++ b/partiql-tests-data/eval/query/select/projection.ion @@ -120,10 +120,10 @@ result:EvaluationSuccess, output:$bag::[ { - _1: 1 - }, - { - _1: 2 + _1:( + 1 + 2 + ) } ] }