Minor: Fix invalid query in test (#15131)

* Minor: Fix invalid query in test

* other query

Author: alamb

datafusion/sqllogictest/test_files/order.slt

@@ -986,17 +986,26 @@ statement ok
 create table t(a0 int, a int, b int, c int) as values (1, 2, 3, 4), (5, 6, 7, 8);
 
 # expect this query to run successfully, not error
+query IIII
+select * from (select c, a, NULL::int as a0, b from t order by a, c) t1
+union all
+select * from (select c, NULL::int as a, a0, b from t order by a0, c) t2
+order by c, a, a0, b
+limit 2;
+----
+4 2 NULL 3
+4 NULL 1 3
+
 query III
 select * from (select c, a, NULL::int as a0 from t order by a, c) t1
 union all
 select * from (select c, NULL::int as a, a0 from t order by a0, c) t2
-order by c, a, a0, b
+order by c, a, a0
 limit 2;
 ----
 4 2 NULL
 4 NULL 1
 
-
 # Casting from numeric to string types breaks the ordering
 statement ok
 CREATE EXTERNAL TABLE ordered_table (
@@ -1232,43 +1241,41 @@ physical_plan
 
 # Test: inputs into union with different orderings
 query TT
-explain select * from (select b, c, a, NULL::int as a0 from ordered_table order by a, c) t1
+explain select * from (select b, c, a, NULL::int as a0, d from ordered_table order by a, c) t1
 union all
-select * from (select b, c, NULL::int as a, a0 from ordered_table order by a0, c) t2
+select * from (select b, c, NULL::int as a, a0, d from ordered_table order by a0, c) t2
 order by d, c, a, a0, b
 limit 2;
 ----
 logical_plan
-01)Projection: t1.b, t1.c, t1.a, t1.a0
-02)--Sort: t1.d ASC NULLS LAST, t1.c ASC NULLS LAST, t1.a ASC NULLS LAST, t1.a0 ASC NULLS LAST, t1.b ASC NULLS LAST, fetch=2
-03)----Union
-04)------SubqueryAlias: t1
-05)--------Projection: ordered_table.b, ordered_table.c, ordered_table.a, Int32(NULL) AS a0, ordered_table.d
-06)----------TableScan: ordered_table projection=[a, b, c, d]
-07)------SubqueryAlias: t2
-08)--------Projection: ordered_table.b, ordered_table.c, Int32(NULL) AS a, ordered_table.a0, ordered_table.d
-09)----------TableScan: ordered_table projection=[a0, b, c, d]
+01)Sort: t1.d ASC NULLS LAST, t1.c ASC NULLS LAST, t1.a ASC NULLS LAST, t1.a0 ASC NULLS LAST, t1.b ASC NULLS LAST, fetch=2
+02)--Union
+03)----SubqueryAlias: t1
+04)------Projection: ordered_table.b, ordered_table.c, ordered_table.a, Int32(NULL) AS a0, ordered_table.d
+05)--------TableScan: ordered_table projection=[a, b, c, d]
+06)----SubqueryAlias: t2
+07)------Projection: ordered_table.b, ordered_table.c, Int32(NULL) AS a, ordered_table.a0, ordered_table.d
+08)--------TableScan: ordered_table projection=[a0, b, c, d]
 physical_plan
-01)ProjectionExec: expr=[b@0 as b, c@1 as c, a@2 as a, a0@3 as a0]
-02)--SortPreservingMergeExec: [d@4 ASC NULLS LAST, c@1 ASC NULLS LAST, a@2 ASC NULLS LAST, a0@3 ASC NULLS LAST, b@0 ASC NULLS LAST], fetch=2
-03)----UnionExec
-04)------SortExec: TopK(fetch=2), expr=[d@4 ASC NULLS LAST, c@1 ASC NULLS LAST, a@2 ASC NULLS LAST, b@0 ASC NULLS LAST], preserve_partitioning=[false]
-05)--------ProjectionExec: expr=[b@1 as b, c@2 as c, a@0 as a, NULL as a0, d@3 as d]
-06)----------DataSourceExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/data/window_2.csv]]}, projection=[a, b, c, d], output_ordering=[c@2 ASC NULLS LAST], file_type=csv, has_header=true
-07)------SortExec: TopK(fetch=2), expr=[d@4 ASC NULLS LAST, c@1 ASC NULLS LAST, a0@3 ASC NULLS LAST, b@0 ASC NULLS LAST], preserve_partitioning=[false]
-08)--------ProjectionExec: expr=[b@1 as b, c@2 as c, NULL as a, a0@0 as a0, d@3 as d]
-09)----------DataSourceExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/data/window_2.csv]]}, projection=[a0, b, c, d], output_ordering=[c@2 ASC NULLS LAST], file_type=csv, has_header=true
+01)SortPreservingMergeExec: [d@4 ASC NULLS LAST, c@1 ASC NULLS LAST, a@2 ASC NULLS LAST, a0@3 ASC NULLS LAST, b@0 ASC NULLS LAST], fetch=2
+02)--UnionExec
+03)----SortExec: TopK(fetch=2), expr=[d@4 ASC NULLS LAST, c@1 ASC NULLS LAST, a@2 ASC NULLS LAST, b@0 ASC NULLS LAST], preserve_partitioning=[false]
+04)------ProjectionExec: expr=[b@1 as b, c@2 as c, a@0 as a, NULL as a0, d@3 as d]
+05)--------DataSourceExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/data/window_2.csv]]}, projection=[a, b, c, d], output_ordering=[c@2 ASC NULLS LAST], file_type=csv, has_header=true
+06)----SortExec: TopK(fetch=2), expr=[d@4 ASC NULLS LAST, c@1 ASC NULLS LAST, a0@3 ASC NULLS LAST, b@0 ASC NULLS LAST], preserve_partitioning=[false]
+07)------ProjectionExec: expr=[b@1 as b, c@2 as c, NULL as a, a0@0 as a0, d@3 as d]
+08)--------DataSourceExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/data/window_2.csv]]}, projection=[a0, b, c, d], output_ordering=[c@2 ASC NULLS LAST], file_type=csv, has_header=true
 
 # Test: run the query from above
-query IIII
-select * from (select b, c, a, NULL::int as a0 from ordered_table order by a, c) t1
+query IIIII
+select * from (select b, c, a, NULL::int as a0, d from ordered_table order by a, c) t1
 union all
-select * from (select b, c, NULL::int as a, a0 from ordered_table order by a0, c) t2
+select * from (select b, c, NULL::int as a, a0, d from ordered_table order by a0, c) t2
 order by d, c, a, a0, b
 limit 2;
 ----
-0 0 0 NULL
-0 0 NULL 1
+0 0 0 NULL 0
+0 0 NULL 1 0
 
 
 statement ok