From 3d48060515ba25b4c49d975a520ee0682327d1b7 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 16 Feb 2024 06:45:52 +0100 Subject: Merging upstream version 21.1.1. Signed-off-by: Daniel Baumann --- tests/fixtures/optimizer/merge_subqueries.sql | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tests/fixtures/optimizer/merge_subqueries.sql') diff --git a/tests/fixtures/optimizer/merge_subqueries.sql b/tests/fixtures/optimizer/merge_subqueries.sql index 7bc45a7..0f22925 100644 --- a/tests/fixtures/optimizer/merge_subqueries.sql +++ b/tests/fixtures/optimizer/merge_subqueries.sql @@ -218,6 +218,7 @@ with t1 as ( ROW_NUMBER() OVER (PARTITION BY x.a ORDER BY x.a) as row_num FROM x + ORDER BY x.a, x.b, row_num ) SELECT t1.a, @@ -226,7 +227,7 @@ FROM t1 WHERE row_num = 1; -WITH t1 AS (SELECT x.a AS a, x.b AS b, ROW_NUMBER() OVER (PARTITION BY x.a ORDER BY x.a) AS row_num FROM x AS x) SELECT t1.a AS a, t1.b AS b FROM t1 AS t1 WHERE t1.row_num = 1; +WITH t1 AS (SELECT x.a AS a, x.b AS b, ROW_NUMBER() OVER (PARTITION BY x.a ORDER BY x.a) AS row_num FROM x AS x ORDER BY x.a, x.b, row_num) SELECT t1.a AS a, t1.b AS b FROM t1 AS t1 WHERE t1.row_num = 1; # title: Test preventing merge of window expressions join clause with t1 as ( @@ -301,6 +302,7 @@ with t1 as ( ROW_NUMBER() OVER (PARTITION BY x.a ORDER BY x.a) as row_num FROM x + ORDER BY x.a, x.b, row_num ) SELECT t1.a, @@ -308,7 +310,7 @@ SELECT t1.row_num FROM t1; -SELECT x.a AS a, x.b AS b, ROW_NUMBER() OVER (PARTITION BY x.a ORDER BY x.a) AS row_num FROM x AS x; +SELECT x.a AS a, x.b AS b, ROW_NUMBER() OVER (PARTITION BY x.a ORDER BY x.a) AS row_num FROM x AS x ORDER BY x.a, x.b, row_num; # title: Don't merge window functions, inner table is aliased in outer query with t1 as ( -- cgit v1.2.3