From a815943e090a6982b5354ee20634d20d0cd36270 Mon Sep 17 00:00:00 2001 From: Peter Geoghegan Date: Thu, 4 Feb 2016 03:58:32 -0800 Subject: [PATCH] Fix arbiter WHERE clause deparsing --- src/backend/utils/adt/ruleutils.c | 12 ++++++++++++ src/test/regress/expected/rules.out | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index 4efd298..ed40bae 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -5532,9 +5532,21 @@ get_insert_query_def(Query *query, deparse_context *context) /* Add a WHERE clause (for partial indexes) if given */ if (confl->arbiterWhere != NULL) { + bool varprefix; + + /* + * Force non-prefixing of Vars, since parser assumes that they + * belong to target relation. WHERE clause does not use + * InferenceElem, so this is separately required. + */ + varprefix = context->varprefix; + context->varprefix = false; + appendContextKeyword(context, " WHERE ", -PRETTYINDENT_STD, PRETTYINDENT_STD, 1); get_rule_expr(confl->arbiterWhere, context, false); + + context->varprefix = varprefix; } } else if (confl->constraint != InvalidOid) diff --git a/src/test/regress/expected/rules.out b/src/test/regress/expected/rules.out index 28b061f..2bdba2d 100644 --- a/src/test/regress/expected/rules.out +++ b/src/test/regress/expected/rules.out @@ -2846,7 +2846,7 @@ SELECT definition FROM pg_rules WHERE tablename = 'hats' ORDER BY rulename; CREATE RULE hat_nosert AS + ON INSERT TO hats DO INSTEAD INSERT INTO hat_data (hat_name, hat_color) + VALUES (new.hat_name, new.hat_color) ON CONFLICT(hat_name COLLATE "C" bpchar_pattern_ops)+ - WHERE (hat_data.hat_color = 'green'::bpchar) DO NOTHING + + WHERE (hat_color = 'green'::bpchar) DO NOTHING + RETURNING hat_data.hat_name, + hat_data.hat_color; (1 row) @@ -2871,7 +2871,7 @@ SELECT tablename, rulename, definition FROM pg_rules hats | hat_nosert | CREATE RULE hat_nosert AS + | | ON INSERT TO hats DO INSTEAD INSERT INTO hat_data (hat_name, hat_color) + | | VALUES (new.hat_name, new.hat_color) ON CONFLICT(hat_name COLLATE "C" bpchar_pattern_ops)+ - | | WHERE (hat_data.hat_color = 'green'::bpchar) DO NOTHING + + | | WHERE (hat_color = 'green'::bpchar) DO NOTHING + | | RETURNING hat_data.hat_name, + | | hat_data.hat_color; (1 row) -- 1.9.1