Commitcf7ab13

committed

Fix code related to partitioning schemes for dropped columns.

The entry in appinfo->translated_vars can be NULL; if so, we must avoiddereferencing it.Ashutosh BapatDiscussion:http://postgr.es/m/CAFjFpReL7+1ien=-21rhjpO3bV7aAm1rQ8XgLVk2csFagSzpZQ@mail.gmail.com

1 parent35f059e commitcf7ab13Copy full SHA for cf7ab13

File tree

+23

-0

lines changed

+23

-0

lines changed

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -950,6 +950,18 @@ set_append_rel_size(PlannerInfo root, RelOptInfo rel,`
`950`	`950`	`attno-1);`
`951`	`951`	`intchild_index;`
`952`	`952`
	`953`	`+/*`
	`954`	`+ * Ignore any column dropped from the parent.`
	`955`	`+ * Corresponding Var won't have any translation. It won't`
	`956`	`+ * have attr_needed information, since it can not be`
	`957`	`+ * referenced in the query.`
	`958`	`+ */`
	`959`	`+if (var==NULL)`
	`960`	`+{`
	`961`	`+Assert(attr_needed==NULL);`
	`962`	`+continue;`
	`963`	`+}`
	`964`	`+`
`953`	`965`	`child_index=var->varattno-childrel->min_attr;`
`954`	`966`	`childrel->attr_needed[child_index]=attr_needed;`
`955`	`967`	`}`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3706,6 +3706,13 @@ ALTER TABLE list_parted2 DROP COLUMN b;`
`3706`	`3706`	`ERROR: cannot drop column named in partition key`
`3707`	`3707`	`ALTER TABLE list_parted2 ALTER COLUMN b TYPE text;`
`3708`	`3708`	`ERROR: cannot alter type of column named in partition key`
	`3709`	`+-- dropping non-partition key columns should be allowed on the parent table.`
	`3710`	`+ALTER TABLE list_parted DROP COLUMN b;`
	`3711`	`+SELECT * FROM list_parted;`
	`3712`	`+ a`
	`3713`	`+---`
	`3714`	`+(0 rows)`
	`3715`	`+`
`3709`	`3716`	`-- cleanup`
`3710`	`3717`	`DROP TABLE list_parted, list_parted2, range_parted;`
`3711`	`3718`	`DROP TABLE fail_def_part;`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2418,6 +2418,10 @@ ALTER TABLE part_2 INHERIT inh_test;`
`2418`	`2418`	`ALTERTABLE list_parted2 DROP COLUMN b;`
`2419`	`2419`	`ALTERTABLE list_parted2 ALTER COLUMN b TYPEtext;`
`2420`	`2420`
	`2421`	`+-- dropping non-partition key columns should be allowed on the parent table.`
	`2422`	`+ALTERTABLE list_parted DROP COLUMN b;`
	`2423`	`+SELECT*FROM list_parted;`
	`2424`	`+`
`2421`	`2425`	`-- cleanup`
`2422`	`2426`	`DROPTABLE list_parted, list_parted2, range_parted;`
`2423`	`2427`	`DROPTABLE fail_def_part;`

Comments

(0)