Merging upstream version 17.4.1.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
f4a8b128b0
commit
bf82c6c1c0
GPG key ID:
FBB4F0E80A80222F
78 changed files with 35859 additions and 34717 deletions
17
tests/fixtures/identity.sql
vendored
17
tests/fixtures/identity.sql
vendored
|
|
@ -423,6 +423,8 @@ SELECT 1 INTERSECT SELECT 2
|
|||
SELECT 1 INTERSECT SELECT 2
|
||||
SELECT 1 AS delete, 2 AS alter
|
||||
SELECT * FROM (x)
|
||||
SELECT * FROM ((x))
|
||||
SELECT * FROM (((x)))
|
||||
SELECT * FROM ((SELECT 1))
|
||||
SELECT * FROM (x CROSS JOIN foo LATERAL VIEW EXPLODE(y))
|
||||
SELECT * FROM (SELECT 1) AS x
|
||||
|
|
@ -432,6 +434,14 @@ SELECT * FROM (SELECT 1 UNION ALL SELECT 2)
|
|||
SELECT * FROM ((SELECT 1) AS a UNION ALL (SELECT 2) AS b)
|
||||
SELECT * FROM ((SELECT 1) AS a(b))
|
||||
SELECT * FROM ((SELECT 1) UNION (SELECT 2) UNION (SELECT 3))
|
||||
SELECT * FROM (table1 AS t1 LEFT JOIN table2 AS t2 ON 1 = 1)
|
||||
SELECT * FROM (tbl1 LEFT JOIN tbl2 ON 1 = 1)
|
||||
SELECT * FROM (tbl1, tbl2 JOIN tbl3 ON TRUE)
|
||||
SELECT * FROM (tbl1 CROSS JOIN tbl2)
|
||||
SELECT * FROM (tbl1 CROSS JOIN tbl2) AS t
|
||||
SELECT * FROM (tbl AS tbl) AS t
|
||||
SELECT * FROM (tbl1 JOIN (tbl2 CROSS JOIN tbl3) ON bla = foo)
|
||||
SELECT * FROM (tbl1, LATERAL (SELECT * FROM bla) AS tbl)
|
||||
SELECT * FROM x AS y(a, b)
|
||||
SELECT * EXCEPT (a, b)
|
||||
SELECT * EXCEPT (a, b) FROM y
|
||||
|
|
@ -607,6 +617,7 @@ CREATE FUNCTION a() LANGUAGE sql RETURNS INT
|
|||
CREATE FUNCTION a.b(x INT) RETURNS INT AS RETURN x + 1
|
||||
CREATE FUNCTION a.b.c()
|
||||
CREATE INDEX abc ON t (a)
|
||||
CREATE INDEX "abc" ON t (a)
|
||||
CREATE INDEX abc ON t (a, b, b)
|
||||
CREATE INDEX abc ON t (a NULLS LAST)
|
||||
CREATE INDEX pointloc ON points USING GIST(BOX(location, location))
|
||||
|
|
@ -700,6 +711,7 @@ UPDATE tbl_name SET foo = 123
|
|||
UPDATE tbl_name SET foo = 123, bar = 345
|
||||
UPDATE db.tbl_name SET foo = 123 WHERE tbl_name.bar = 234
|
||||
UPDATE db.tbl_name SET foo = 123, foo_1 = 234 WHERE tbl_name.bar = 234
|
||||
UPDATE products SET price = price * 1.10 WHERE price <= 99.99 RETURNING name, price AS new_price
|
||||
TRUNCATE TABLE x
|
||||
OPTIMIZE TABLE y
|
||||
VACUUM FREEZE my_table
|
||||
|
|
@ -721,11 +733,6 @@ WITH a AS ((SELECT 1 AS b) UNION ALL (SELECT 1 AS b)) SELECT * FROM a
|
|||
SELECT (WITH x AS (SELECT 1 AS y) SELECT * FROM x) AS z
|
||||
SELECT ((SELECT 1) + 1)
|
||||
SELECT * FROM project.dataset.INFORMATION_SCHEMA.TABLES
|
||||
SELECT * FROM (table1 AS t1 LEFT JOIN table2 AS t2 ON 1 = 1)
|
||||
SELECT * FROM (tbl1 LEFT JOIN tbl2 ON 1 = 1)
|
||||
SELECT * FROM (tbl1, tbl2 JOIN tbl3 ON TRUE)
|
||||
SELECT * FROM (tbl1 JOIN (tbl2 CROSS JOIN tbl3) ON bla = foo)
|
||||
SELECT * FROM (tbl1, LATERAL (SELECT * FROM bla) AS tbl)
|
||||
SELECT CAST(x AS INT) /* comment */ FROM foo
|
||||
SELECT a /* x */, b /* x */
|
||||
SELECT a /* x */ /* y */ /* z */, b /* k */ /* m */
|
||||
|
|
|
|||
105
tests/fixtures/optimizer/optimizer.sql
vendored
105
tests/fixtures/optimizer/optimizer.sql
vendored
|
|
@ -701,3 +701,108 @@ SELECT
|
|||
"x"."a" * "x"."b" - "x"."b"
|
||||
) AS "f"
|
||||
FROM "x" AS "x";
|
||||
|
||||
# title: wrapped table without alias
|
||||
# execute: false
|
||||
SELECT * FROM (tbl);
|
||||
SELECT
|
||||
*
|
||||
FROM (
|
||||
"tbl" AS "tbl"
|
||||
);
|
||||
|
||||
# title: wrapped table with alias
|
||||
# execute: false
|
||||
SELECT * FROM (tbl AS tbl);
|
||||
SELECT
|
||||
*
|
||||
FROM (
|
||||
"tbl" AS "tbl"
|
||||
);
|
||||
|
||||
# title: wrapped join of tables without alias
|
||||
SELECT a, c FROM (x LEFT JOIN y ON a = c);
|
||||
SELECT
|
||||
"x"."a" AS "a",
|
||||
"y"."c" AS "c"
|
||||
FROM (
|
||||
"x" AS "x"
|
||||
LEFT JOIN "y" AS "y"
|
||||
ON "x"."a" = "y"."c"
|
||||
);
|
||||
|
||||
# title: wrapped join of tables with alias
|
||||
# execute: false
|
||||
SELECT a, c FROM (x LEFT JOIN y ON a = c) AS t;
|
||||
SELECT
|
||||
"x"."a" AS "a",
|
||||
"y"."c" AS "c"
|
||||
FROM "x" AS "x"
|
||||
LEFT JOIN "y" AS "y"
|
||||
ON "x"."a" = "y"."c";
|
||||
|
||||
# title: chained wrapped joins without aliases
|
||||
# execute: false
|
||||
SELECT * FROM ((a CROSS JOIN ((b CROSS JOIN c) CROSS JOIN (d CROSS JOIN e))));
|
||||
SELECT
|
||||
*
|
||||
FROM (
|
||||
(
|
||||
"a" AS "a"
|
||||
CROSS JOIN (
|
||||
(
|
||||
"b" AS "b"
|
||||
CROSS JOIN "c" AS "c"
|
||||
)
|
||||
CROSS JOIN (
|
||||
"d" AS "d"
|
||||
CROSS JOIN "e" AS "e"
|
||||
)
|
||||
)
|
||||
)
|
||||
);
|
||||
|
||||
# title: chained wrapped joins with aliases
|
||||
# execute: false
|
||||
SELECT * FROM ((a AS foo CROSS JOIN b AS bar) CROSS JOIN c AS baz);
|
||||
SELECT
|
||||
*
|
||||
FROM (
|
||||
(
|
||||
"a" AS "foo"
|
||||
CROSS JOIN "b" AS "bar"
|
||||
)
|
||||
CROSS JOIN "c" AS "baz"
|
||||
);
|
||||
|
||||
# title: table joined with join construct
|
||||
SELECT x.a, y.b, z.c FROM x LEFT JOIN (y INNER JOIN z ON y.c = z.c) ON x.b = y.b;
|
||||
SELECT
|
||||
"x"."a" AS "a",
|
||||
"y"."b" AS "b",
|
||||
"z"."c" AS "c"
|
||||
FROM "x" AS "x"
|
||||
LEFT JOIN (
|
||||
"y" AS "y"
|
||||
JOIN "z" AS "z"
|
||||
ON "y"."c" = "z"."c"
|
||||
)
|
||||
ON "x"."b" = "y"."b";
|
||||
|
||||
# title: select * from table joined with join construct
|
||||
# execute: false
|
||||
SELECT * FROM x LEFT JOIN (y INNER JOIN z ON y.c = z.c) ON x.b = y.b;
|
||||
SELECT
|
||||
"y"."b" AS "b",
|
||||
"y"."c" AS "c",
|
||||
"z"."a" AS "a",
|
||||
"z"."c" AS "c",
|
||||
"x"."a" AS "a",
|
||||
"x"."b" AS "b"
|
||||
FROM "x" AS "x"
|
||||
LEFT JOIN (
|
||||
"y" AS "y"
|
||||
JOIN "z" AS "z"
|
||||
ON "y"."c" = "z"."c"
|
||||
)
|
||||
ON "x"."b" = "y"."b";
|
||||
|
|
|
|||
4
tests/fixtures/optimizer/qualify_columns.sql
vendored
4
tests/fixtures/optimizer/qualify_columns.sql
vendored
|
|
@ -430,6 +430,10 @@ SELECT x.a AS a, x.b AS b FROM x AS x QUALIFY COUNT(x.a) OVER (PARTITION BY x.b)
|
|||
-- Expand laterals
|
||||
--------------------------------------
|
||||
|
||||
# execute: false
|
||||
select 2 AS d, d + 1 FROM x WHERE d = 2 GROUP BY d;
|
||||
SELECT 2 AS d, 2 + 1 AS _col_1 FROM x AS x WHERE 2 = 2 GROUP BY 1;
|
||||
|
||||
# title: expand alias reference
|
||||
SELECT
|
||||
x.a + 1 AS i,
|
||||
|
|
|
|||
50
tests/fixtures/optimizer/qualify_tables.sql
vendored
50
tests/fixtures/optimizer/qualify_tables.sql
vendored
|
|
@ -26,45 +26,49 @@ SELECT (SELECT y.c FROM c.db.y AS y) FROM c.db.x AS x;
|
|||
SELECT * FROM x PIVOT (SUM(a) FOR b IN ('a', 'b'));
|
||||
SELECT * FROM c.db.x AS x PIVOT(SUM(a) FOR b IN ('a', 'b')) AS _q_0;
|
||||
|
||||
-----------------------------------------------------------
|
||||
--- Unnest wrapped tables / joins, expand join constructs
|
||||
-----------------------------------------------------------
|
||||
|
||||
# title: wrapped table without alias
|
||||
SELECT * FROM (tbl);
|
||||
SELECT * FROM c.db.tbl AS tbl;
|
||||
SELECT * FROM (c.db.tbl AS tbl);
|
||||
|
||||
# title: wrapped table with alias
|
||||
SELECT * FROM (tbl AS tbl);
|
||||
SELECT * FROM c.db.tbl AS tbl;
|
||||
SELECT * FROM (c.db.tbl AS tbl);
|
||||
|
||||
# title: wrapped table with alias and multiple redundant parentheses
|
||||
# title: wrapped table with alias using multiple (redundant) parentheses
|
||||
SELECT * FROM ((((tbl AS tbl))));
|
||||
SELECT * FROM c.db.tbl AS tbl;
|
||||
SELECT * FROM ((((c.db.tbl AS tbl))));
|
||||
|
||||
# title: wrapped join of tables without alias
|
||||
SELECT * FROM (t1 CROSS JOIN t2);
|
||||
SELECT * FROM (c.db.t1 AS t1 CROSS JOIN c.db.t2 AS t2);
|
||||
|
||||
# title: wrapped join of tables with alias, expansion of join construct
|
||||
SELECT * FROM (t1 CROSS JOIN t2) AS t;
|
||||
SELECT * FROM (SELECT * FROM c.db.t1 AS t1 CROSS JOIN c.db.t2 AS t2) AS t;
|
||||
|
||||
# title: chained wrapped joins without aliases (1)
|
||||
SELECT * FROM ((a CROSS JOIN b) CROSS JOIN c);
|
||||
SELECT * FROM c.db.a AS a CROSS JOIN c.db.b AS b CROSS JOIN c.db.c AS c;
|
||||
SELECT * FROM ((c.db.a AS a CROSS JOIN c.db.b AS b) CROSS JOIN c.db.c AS c);
|
||||
|
||||
# title: chained wrapped joins without aliases (2)
|
||||
SELECT * FROM (a CROSS JOIN (b CROSS JOIN c));
|
||||
SELECT * FROM c.db.a AS a CROSS JOIN c.db.b AS b CROSS JOIN c.db.c AS c;
|
||||
SELECT * FROM (c.db.a AS a CROSS JOIN (c.db.b AS b CROSS JOIN c.db.c AS c));
|
||||
|
||||
# title: chained wrapped joins without aliases (3)
|
||||
SELECT * FROM ((a CROSS JOIN ((b CROSS JOIN c) CROSS JOIN d)));
|
||||
SELECT * FROM c.db.a AS a CROSS JOIN c.db.b AS b CROSS JOIN c.db.c AS c CROSS JOIN c.db.d AS d;
|
||||
SELECT * FROM ((c.db.a AS a CROSS JOIN ((c.db.b AS b CROSS JOIN c.db.c AS c) CROSS JOIN c.db.d AS d)));
|
||||
|
||||
# title: chained wrapped joins without aliases (4)
|
||||
SELECT * FROM ((a CROSS JOIN ((b CROSS JOIN c) CROSS JOIN (d CROSS JOIN e))));
|
||||
SELECT * FROM c.db.a AS a CROSS JOIN c.db.b AS b CROSS JOIN c.db.c AS c CROSS JOIN c.db.d AS d CROSS JOIN c.db.e AS e;
|
||||
SELECT * FROM ((c.db.a AS a CROSS JOIN ((c.db.b AS b CROSS JOIN c.db.c AS c) CROSS JOIN (c.db.d AS d CROSS JOIN c.db.e AS e))));
|
||||
|
||||
# title: chained wrapped joins with aliases
|
||||
SELECT * FROM ((a AS foo CROSS JOIN b AS bar) CROSS JOIN c AS baz);
|
||||
SELECT * FROM c.db.a AS foo CROSS JOIN c.db.b AS bar CROSS JOIN c.db.c AS baz;
|
||||
SELECT * FROM ((c.db.a AS foo CROSS JOIN c.db.b AS bar) CROSS JOIN c.db.c AS baz);
|
||||
|
||||
# title: wrapped join with subquery without alias
|
||||
SELECT * FROM (tbl1 CROSS JOIN (SELECT * FROM tbl2) AS t1);
|
||||
SELECT * FROM c.db.tbl1 AS tbl1 CROSS JOIN (SELECT * FROM c.db.tbl2 AS tbl2) AS t1;
|
||||
SELECT * FROM (c.db.tbl1 AS tbl1 CROSS JOIN (SELECT * FROM c.db.tbl2 AS tbl2) AS t1);
|
||||
|
||||
# title: wrapped join with subquery with alias, parentheses can't be omitted because of alias
|
||||
SELECT * FROM (tbl1 CROSS JOIN (SELECT * FROM tbl2) AS t1) AS t2;
|
||||
|
|
@ -72,32 +76,28 @@ SELECT * FROM (SELECT * FROM c.db.tbl1 AS tbl1 CROSS JOIN (SELECT * FROM c.db.tb
|
|||
|
||||
# title: join construct as the right operand of a left join
|
||||
SELECT * FROM a LEFT JOIN (b INNER JOIN c ON c.id = b.id) ON b.id = a.id;
|
||||
SELECT * FROM c.db.a AS a LEFT JOIN c.db.b AS b ON b.id = a.id INNER JOIN c.db.c AS c ON c.id = b.id;
|
||||
SELECT * FROM c.db.a AS a LEFT JOIN (c.db.b AS b INNER JOIN c.db.c AS c ON c.id = b.id) ON b.id = a.id;
|
||||
|
||||
# title: nested joins converted to canonical form
|
||||
# title: nested joins
|
||||
SELECT * FROM a LEFT JOIN b INNER JOIN c ON c.id = b.id ON b.id = a.id;
|
||||
SELECT * FROM c.db.a AS a LEFT JOIN c.db.b AS b ON b.id = a.id INNER JOIN c.db.c AS c ON c.id = b.id;
|
||||
SELECT * FROM c.db.a AS a LEFT JOIN c.db.b AS b INNER JOIN c.db.c AS c ON c.id = b.id ON b.id = a.id;
|
||||
|
||||
# title: parentheses can't be omitted because alias shadows inner table names
|
||||
SELECT t.a FROM (tbl AS tbl) AS t;
|
||||
SELECT t.a FROM (SELECT * FROM c.db.tbl AS tbl) AS t;
|
||||
|
||||
# title: outermost set of parentheses can't be omitted due to shadowing (1)
|
||||
SELECT * FROM ((tbl AS tbl)) AS _q_0;
|
||||
SELECT * FROM (SELECT * FROM c.db.tbl AS tbl) AS _q_0;
|
||||
|
||||
# title: outermost set of parentheses can't be omitted due to shadowing (2)
|
||||
# title: wrapped aliased table with outer alias
|
||||
SELECT * FROM ((((tbl AS tbl)))) AS _q_0;
|
||||
SELECT * FROM (SELECT * FROM c.db.tbl AS tbl) AS _q_0;
|
||||
|
||||
# title: join construct with three tables in canonical form
|
||||
# title: join construct with three tables
|
||||
SELECT * FROM (tbl1 AS tbl1 JOIN tbl2 AS tbl2 ON id1 = id2 JOIN tbl3 AS tbl3 ON id1 = id3) AS _q_0;
|
||||
SELECT * FROM (SELECT * FROM c.db.tbl1 AS tbl1 JOIN c.db.tbl2 AS tbl2 ON id1 = id2 JOIN c.db.tbl3 AS tbl3 ON id1 = id3) AS _q_0;
|
||||
|
||||
# title: join construct with three tables in canonical form and redundant set of parentheses
|
||||
# title: join construct with three tables and redundant set of parentheses
|
||||
SELECT * FROM ((tbl1 AS tbl1 JOIN tbl2 AS tbl2 ON id1 = id2 JOIN tbl3 AS tbl3 ON id1 = id3)) AS _q_0;
|
||||
SELECT * FROM (SELECT * FROM c.db.tbl1 AS tbl1 JOIN c.db.tbl2 AS tbl2 ON id1 = id2 JOIN c.db.tbl3 AS tbl3 ON id1 = id3) AS _q_0;
|
||||
|
||||
# title: nested join construct in canonical form
|
||||
# title: join construct within join construct
|
||||
SELECT * FROM (tbl1 AS tbl1 JOIN (tbl2 AS tbl2 JOIN tbl3 AS tbl3 ON id2 = id3) AS _q_0 ON id1 = id3) AS _q_1;
|
||||
SELECT * FROM (SELECT * FROM c.db.tbl1 AS tbl1 JOIN (SELECT * FROM c.db.tbl2 AS tbl2 JOIN c.db.tbl3 AS tbl3 ON id2 = id3) AS _q_0 ON id1 = id3) AS _q_1;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue