Adding upstream version 6.1.1.upstream/6.1.1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 19 insertions, 38 deletions

diff --git a/tests/fixtures/optimizer/optimizer.sql b/tests/fixtures/optimizer/optimizer.sql
index f7bbdda..f1d0f7d 100644
--- a/tests/fixtures/optimizer/optimizer.sql
+++ b/tests/fixtures/optimizer/optimizer.sql
@@ -2,11 +2,7 @@ SELECT a, m FROM z LATERAL VIEW EXPLODE([1, 2]) q AS m;
 SELECT
   "z"."a" AS "a",
   "q"."m" AS "m"
-FROM (
-  SELECT
-    "z"."a" AS "a"
-  FROM "z" AS "z"
-) AS "z"
+FROM "z" AS "z"
 LATERAL VIEW
 EXPLODE(ARRAY(1, 2)) q AS "m";
 
@@ -91,41 +87,26 @@ FROM (
 WHERE (TRUE AND TRUE OR 'a' = 'b') AND a > 1
 GROUP BY a;
 SELECT
-  "d"."a" AS "a",
-  SUM("d"."b") AS "_col_1"
-FROM (
+  "x"."a" AS "a",
+  SUM("y"."b") AS "_col_1"
+FROM "x" AS "x"
+LEFT JOIN (
   SELECT
-    "x"."a" AS "a",
-    "y"."b" AS "b"
-  FROM (
-    SELECT
-      "x"."a" AS "a"
-    FROM "x" AS "x"
-    WHERE
-      "x"."a" > 1
-  ) AS "x"
-  LEFT JOIN (
-    SELECT
-      MAX("y"."b") AS "_col_0",
-      "y"."a" AS "_u_1"
-    FROM "y" AS "y"
-    GROUP BY
-      "y"."a"
-  ) AS "_u_0"
-    ON "x"."a" = "_u_0"."_u_1"
-  JOIN (
-    SELECT
-      "y"."a" AS "a",
-      "y"."b" AS "b"
-    FROM "y" AS "y"
-  ) AS "y"
-    ON "x"."a" = "y"."a"
-  WHERE
-    "_u_0"."_col_0" >= 0
-    AND NOT "_u_0"."_u_1" IS NULL
-) AS "d"
+    MAX("y"."b") AS "_col_0",
+    "y"."a" AS "_u_1"
+  FROM "y" AS "y"
+  GROUP BY
+    "y"."a"
+) AS "_u_0"
+  ON "x"."a" = "_u_0"."_u_1"
+JOIN "y" AS "y"
+  ON "x"."a" = "y"."a"
+WHERE
+  "_u_0"."_col_0" >= 0
+  AND "x"."a" > 1
+  AND NOT "_u_0"."_u_1" IS NULL
 GROUP BY
-  "d"."a";
+  "x"."a";
 
 (SELECT a FROM x) LIMIT 1;
 (