Commit713c5f9

committed

Fix compability with pg10 (#123)

1 parenta5e7422 commit713c5f9Copy full SHA for 713c5f9

File tree

+13

-2

lines changed

+13

-2

lines changed

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,16 @@`
`59`	`59`	`} while (0)`
`60`	`60`	`#endif`
`61`	`61`
	`62`	`+/*`
	`63`	`+ * CheckValidResultRel()`
	`64`	`+ */`
	`65`	`+#ifPG_VERSION_NUM >=100000`
	`66`	`+#defineCheckValidResultRelCompat(rri,cmd) \`
	`67`	`+ CheckValidResultRel((rri), (cmd))`
	`68`	`+#elifPG_VERSION_NUM >=90500`
	`69`	`+#defineCheckValidResultRelCompat(rri,cmd) \`
	`70`	`+ CheckValidResultRel((rri)->ri_RelationDesc, (cmd))`
	`71`	`+#endif`
`62`	`72`
`63`	`73`	`/*`
`64`	`74`	`* BeginCopyFrom()`
`@@ -590,7 +600,6 @@ extern AttrNumber *convert_tuples_by_name_map(TupleDesc indesc,`
`590`	`600`	`#endif`
`591`	`601`
`592`	`602`
`593`		`-`
`594`	`603`	`/*`
`595`	`604`	`* -------------`
`596`	`605`	`* Common code`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,6 @@ scan_result_parts_storage(Oid partid, ResultPartsStorage *parts_storage)`
`268`	`268`
`269`	`269`	`/* Open relation and check if it is a valid target */`
`270`	`270`	`child_rel=heap_open(partid,NoLock);`
`271`		`-CheckValidResultRel(child_rel,parts_storage->command_type);`
`272`	`271`
`273`	`272`	`/* Build Var translation list for 'inserted_cols' */`
`274`	`273`	`make_inh_translation_list(parent_rel,child_rel,0,&translated_vars);`
`@@ -318,6 +317,9 @@ scan_result_parts_storage(Oid partid, ResultPartsStorage *parts_storage)`
`318`	`317`	`/* ri_ConstraintExprs will be initialized by ExecRelCheck() */`
`319`	`318`	`child_result_rel_info->ri_ConstraintExprs=NULL;`
`320`	`319`
	`320`	`+/* Check that this partition is a valid result relation */`
	`321`	`+CheckValidResultRelCompat(child_result_rel_info,parts_storage->command_type);`
	`322`	`+`
`321`	`323`	`/* Fill the ResultRelInfo holder */`
`322`	`324`	`rri_holder->partid=partid;`
`323`	`325`	`rri_holder->result_rel_info=child_result_rel_info;`

Comments

(0)