Commit403bd6a

committed

Fix crash when trying to display a NOTIFY rule action.

Fixes oversight in commit2ffa740.Per report from Josh Kupershmidt.I think we've broken this case before, so let's add a regression testthis time.

1 parent6563fb2 commit403bd6aCopy full SHA for 403bd6a

File tree

+17

-7

lines changed

+17

-7

lines changed

Lines changed: 12 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -2564,14 +2564,19 @@ set_deparse_for_query(deparse_namespace dpns, Query query,`
`2564`	`2564`	`dpns->rtable_columns=lappend(dpns->rtable_columns,`
`2565`	`2565`	`palloc0(sizeof(deparse_columns)));`
`2566`	`2566`
`2567`		`-/* Detect whether global uniqueness of USING names is needed */`
`2568`		`-dpns->unique_using=has_unnamed_full_join_using((Node*)query->jointree);`
	`2567`	`+/* If it's a utility query, it won't have a jointree */`
	`2568`	`+if (query->jointree)`
	`2569`	`+{`
	`2570`	`+/* Detect whether global uniqueness of USING names is needed */`
	`2571`	`+dpns->unique_using=`
	`2572`	`+has_unnamed_full_join_using((Node*)query->jointree);`
`2569`	`2573`
`2570`		`-/*`
`2571`		`- * Select names for columns merged by USING, via a recursive pass over the`
`2572`		`- * query jointree.`
`2573`		`- */`
`2574`		`-set_using_names(dpns, (Node*)query->jointree);`
	`2574`	`+/*`
	`2575`	`+ * Select names for columns merged by USING, via a recursive pass over`
	`2576`	`+ * the query jointree.`
	`2577`	`+ */`
	`2578`	`+set_using_names(dpns, (Node*)query->jointree);`
	`2579`	`+}`
`2575`	`2580`
`2576`	`2581`	`/*`
`2577`	`2582`	`* Now assign remaining column aliases for each RTE. We do this in a`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2573,6 +2573,7 @@ select * from rules_log;`
`2573`	`2573`	`11 \| 13 \| new`
`2574`	`2574`	`(12 rows)`
`2575`	`2575`
	`2576`	`+create rule r3 as on delete to rules_src do notify rules_src_deletion;`
`2576`	`2577`	`\d+ rules_src`
`2577`	`2578`	`Table "public.rules_src"`
`2578`	`2579`	`Column \| Type \| Modifiers \| Storage \| Stats target \| Description`
`@@ -2584,6 +2585,9 @@ Rules:`
`2584`	`2585`	`ON UPDATE TO rules_src DO INSERT INTO rules_log (f1, f2, tag) VALUES (old.f1,old.f2,'old'::text), (new.f1,new.f2,'new'::text)`
`2585`	`2586`	`r2 AS`
`2586`	`2587`	`ON UPDATE TO rules_src DO VALUES (old.f1,old.f2,'old'::text), (new.f1,new.f2,'new'::text)`
	`2588`	`+ r3 AS`
	`2589`	`+ ON DELETE TO rules_src DO`
	`2590`	`+ NOTIFY rules_src_deletion`
`2587`	`2591`	`Has OIDs: no`
`2588`	`2592`
`2589`	`2593`	`--`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -970,6 +970,7 @@ create rule r2 as on update to rules_src do also`
`970`	`970`	`update rules_srcset f2= f2/10;`
`971`	`971`	`select*from rules_src;`
`972`	`972`	`select*from rules_log;`
	`973`	`+createruler3ason delete to rules_src do notify rules_src_deletion;`
`973`	`974`	`\d+ rules_src`
`974`	`975`
`975`	`976`	`--`

Comments

(0)