From 864aa8ff435135b09d48335ea557b7a80e87c500 Mon Sep 17 00:00:00 2001 From: Henson Choi Date: Wed, 21 Oct 2026 20:34:12 +0900 Subject: [PATCH v1 1/2] Add tests for column names of relations not printed in FROM The columns of a relation that is not printed in the FROM clause, such as the target of UPDATE or NEW and OLD of a rule, are renamed to keep the name of a merged JOIN USING column unique, and so are OLD and NEW of RETURNING, which read the target. The deparsed text then refers to columns that do not exist. The expected output shows the behavior before the fix. The next commit fixes it and updates the output. --- src/test/regress/expected/rules.out | 37 +++++++++++++++++++++++++++++ src/test/regress/sql/rules.sql | 19 +++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/src/test/regress/expected/rules.out b/src/test/regress/expected/rules.out index acbe4667d89..3c35d8eff4b 100644 --- a/src/test/regress/expected/rules.out +++ b/src/test/regress/expected/rules.out @@ -4155,3 +4155,40 @@ DROP TABLE ruletest_t3; DROP TABLE ruletest_t2; DROP TABLE ruletest_t1; DROP USER regress_rule_user1; +-- Test that the columns of a relation not printed in FROM (the target of +-- UPDATE, NEW and OLD) are not renamed to keep a USING column name unique. +CREATE TABLE ruletest_cu_a (x int); +CREATE TABLE ruletest_cu_b (x int); +CREATE TABLE ruletest_cu_t (x int, a int); +CREATE RULE ruletest_cu_r AS ON UPDATE TO ruletest_cu_a + DO ALSO UPDATE ruletest_cu_t SET a = 1 + FROM ruletest_cu_a ca FULL JOIN ruletest_cu_b cb USING (x) + WHERE ruletest_cu_t.x = NEW.x AND ca.x = OLD.x; +SELECT pg_get_ruledef(oid) FROM pg_rewrite WHERE rulename = 'ruletest_cu_r'; + pg_get_ruledef +------------------------------------------------------------------------------------------- + CREATE RULE ruletest_cu_r AS + + ON UPDATE TO public.ruletest_cu_a DO UPDATE ruletest_cu_t AS ruletest_cu_t SET a = 1+ + FROM (ruletest_cu_a ca + + FULL JOIN ruletest_cu_b cb USING (x)) + + WHERE ((ruletest_cu_t.x_1 = new.x_1) AND (ca.x = old.x_1)); +(1 row) + +-- The same for OLD and NEW of RETURNING, which read the target. +CREATE RULE ruletest_cu_ret AS ON DELETE TO ruletest_cu_a + DO INSTEAD UPDATE ruletest_cu_t SET a = 1 + FROM ruletest_cu_a ca FULL JOIN ruletest_cu_b cb USING (x) + WHERE ruletest_cu_t.x = ca.x + RETURNING WITH (OLD AS o, NEW AS n) o.x + n.x AS x; +SELECT pg_get_ruledef(oid) FROM pg_rewrite WHERE rulename = 'ruletest_cu_ret'; + pg_get_ruledef +--------------------------------------------------------------------------------------------------- + CREATE RULE ruletest_cu_ret AS + + ON DELETE TO public.ruletest_cu_a DO INSTEAD UPDATE ruletest_cu_t AS ruletest_cu_t SET a = 1+ + FROM (ruletest_cu_a ca + + FULL JOIN ruletest_cu_b cb USING (x)) + + WHERE (ruletest_cu_t.x_1 = ca.x) + + RETURNING WITH (OLD AS o, NEW AS n) (o.x_1 + n.x_1) AS x; +(1 row) + +DROP TABLE ruletest_cu_a, ruletest_cu_b, ruletest_cu_t; diff --git a/src/test/regress/sql/rules.sql b/src/test/regress/sql/rules.sql index abe89d097c9..e36aea2df3e 100644 --- a/src/test/regress/sql/rules.sql +++ b/src/test/regress/sql/rules.sql @@ -1460,3 +1460,22 @@ DROP TABLE ruletest_t2; DROP TABLE ruletest_t1; DROP USER regress_rule_user1; + +-- Test that the columns of a relation not printed in FROM (the target of +-- UPDATE, NEW and OLD) are not renamed to keep a USING column name unique. +CREATE TABLE ruletest_cu_a (x int); +CREATE TABLE ruletest_cu_b (x int); +CREATE TABLE ruletest_cu_t (x int, a int); +CREATE RULE ruletest_cu_r AS ON UPDATE TO ruletest_cu_a + DO ALSO UPDATE ruletest_cu_t SET a = 1 + FROM ruletest_cu_a ca FULL JOIN ruletest_cu_b cb USING (x) + WHERE ruletest_cu_t.x = NEW.x AND ca.x = OLD.x; +SELECT pg_get_ruledef(oid) FROM pg_rewrite WHERE rulename = 'ruletest_cu_r'; +-- The same for OLD and NEW of RETURNING, which read the target. +CREATE RULE ruletest_cu_ret AS ON DELETE TO ruletest_cu_a + DO INSTEAD UPDATE ruletest_cu_t SET a = 1 + FROM ruletest_cu_a ca FULL JOIN ruletest_cu_b cb USING (x) + WHERE ruletest_cu_t.x = ca.x + RETURNING WITH (OLD AS o, NEW AS n) o.x + n.x AS x; +SELECT pg_get_ruledef(oid) FROM pg_rewrite WHERE rulename = 'ruletest_cu_ret'; +DROP TABLE ruletest_cu_a, ruletest_cu_b, ruletest_cu_t; -- 2.54.0 (Apple Git-157)