Commit58cb505

committed

Port to PG 11

1 parent62cd735 commit58cb505Copy full SHA for 58cb505

File tree

+17

-2

lines changed

+17

-2

lines changed

Lines changed: 13 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -389,10 +389,19 @@ foreign_expr_walker(Node *node,`
`389`	`389`	`char*`
`390`	`390`	`deparse_type_name(Oidtype_oid,int32typemod)`
`391`	`391`	`{`
	`392`	`+#ifPG_VERSION_NUM>=110000`
	`393`	`+uint8flags=FORMAT_TYPE_TYPEMOD_GIVEN;`
	`394`	`+`
	`395`	`+if (type_oid >=FirstBootstrapObjectId)`
	`396`	`+flags \|=FORMAT_TYPE_FORCE_QUALIFY;`
	`397`	`+`
	`398`	`+returnformat_type_extended(type_oid,typemod,flags);`
	`399`	`+#else`
`392`	`400`	`if (type_oid<FirstBootstrapObjectId)`
`393`	`401`	`returnformat_type_with_typemod(type_oid,typemod);`
`394`	`402`	`else`
`395`	`403`	`returnformat_type_with_typemod_qualified(type_oid,typemod);`
	`404`	`+#endif`
`396`	`405`	`}`
`397`	`406`
`398`	`407`	`/*`
`@@ -1365,8 +1374,11 @@ deparseColumnRef(StringInfo buf, int varno, int varattno, PlannerInfo *root,`
`1365`	`1374`	`* FDW option, use attribute name.`
`1366`	`1375`	`*/`
`1367`	`1376`	`if (colname==NULL)`
	`1377`	`+#ifPG_VERSION_NUM>=110000`
	`1378`	`+colname=get_attname(rte->relid,varattno, false);`
	`1379`	`+#else`
`1368`	`1380`	`colname=get_relid_attribute_name(rte->relid,varattno);`
`1369`		`-`
	`1381`	`+#endif`
`1370`	`1382`	`if (qualify_col)`
`1371`	`1383`	`ADD_REL_QUALIFIER(buf,varno);`
`1372`	`1384`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1039,10 +1039,13 @@ static void begin_batch_insert(Oid oid)`
`1039`	`1039`	`estate->es_result_relations=resultRelInfo;`
`1040`	`1040`	`estate->es_num_result_relations=1;`
`1041`	`1041`	`estate->es_result_relation_info=resultRelInfo;`
`1042`		`-`
`1043`	`1042`	`ExecOpenIndices(estate->es_result_relation_info, false);`
	`1043`	`+#ifPG_VERSION_NUM>=110000`
	`1044`	`+slot=ExecInitExtraTupleSlot(estate,RelationGetDescr(rel));`
	`1045`	`+#else`
`1044`	`1046`	`slot=ExecInitExtraTupleSlot(estate);`
`1045`	`1047`	`ExecSetSlotDescriptor(slot,RelationGetDescr(rel));`
	`1048`	`+#endif`
`1046`	`1049`	`}`
`1047`	`1050`
`1048`	`1051`	`staticvoidinsert_tuple(Datumvalues,boolnulls)`

Comments

(0)