Commite98dd7b

committed

fixes for REL_10_BETA2

1 parentc70a71a commite98dd7bCopy full SHA for e98dd7b

File tree

+33

-5

lines changed

+33

-5

lines changed

Lines changed: 28 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`#include"compat/debug_compat_features.h"`
`23`	`23`
`24`	`24`	`#include"postgres.h"`
	`25`	`+#include"commands/trigger.h"`
`25`	`26`	`#include"executor/executor.h"`
`26`	`27`	`#include"nodes/memnodes.h"`
`27`	`28`	`#include"nodes/relation.h"`
`@@ -562,6 +563,33 @@ extern AttrNumber *convert_tuples_by_name_map(TupleDesc indesc,`
`562`	`563`	`#endif`
`563`	`564`
`564`	`565`
	`566`	`+/*`
	`567`	`+ * ExecARInsertTriggers()`
	`568`	`+ */`
	`569`	`+#ifPG_VERSION_NUM >=100000`
	`570`	`+#defineExecARInsertTriggersCompat(estate,relinfo,trigtuple, \`
	`571`	`+recheck_indexes,transition_capture) \`
	`572`	`+ExecARInsertTriggers((estate), (relinfo), (trigtuple), \`
	`573`	`+ (recheck_indexes), (transition_capture))`
	`574`	`+#elifPG_VERSION_NUM >=90500`
	`575`	`+#defineExecARInsertTriggersCompat(estate,relinfo,trigtuple, \`
	`576`	`+recheck_indexes,transition_capture) \`
	`577`	`+ExecARInsertTriggers((estate), (relinfo), (trigtuple), (recheck_indexes))`
	`578`	`+#endif`
	`579`	`+`
	`580`	`+`
	`581`	`+/*`
	`582`	`+ * ExecASInsertTriggers()`
	`583`	`+ */`
	`584`	`+#ifPG_VERSION_NUM >=100000`
	`585`	`+#defineExecASInsertTriggersCompat(estate,relinfo,transition_capture) \`
	`586`	`+ExecASInsertTriggers((estate), (relinfo), (transition_capture))`
	`587`	`+#elifPG_VERSION_NUM >=90500`
	`588`	`+#defineExecASInsertTriggersCompat(estate,relinfo,transition_capture) \`
	`589`	`+ExecASInsertTriggers((estate), (relinfo))`
	`590`	`+#endif`
	`591`	`+`
	`592`	`+`
`565`	`593`
`566`	`594`	`/*`
`567`	`595`	`* -------------`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -722,9 +722,9 @@ PathmanCopyFrom(CopyState cstate, Relation parent_rel,`
`722`	`722`	`recheckIndexes=ExecInsertIndexTuples(slot,&(tuple->t_self),`
`723`	`723`	`estate, false,NULL,NIL);`
`724`	`724`
`725`		`-/* AFTER ROW INSERT Triggers */`
`726`		`-ExecARInsertTriggers(estate,child_result_rel,tuple,`
`727`		`-recheckIndexes);`
	`725`	`+/* AFTER ROW INSERT Triggers(FIXME: NULL transition)*/`
	`726`	`+ExecARInsertTriggersCompat(estate,child_result_rel,tuple,`
	`727`	`+recheckIndexes,NULL);`
`728`	`728`
`729`	`729`	`list_free(recheckIndexes);`
`730`	`730`
`@@ -746,8 +746,8 @@ PathmanCopyFrom(CopyState cstate, Relation parent_rel,`
`746`	`746`	`if (old_protocol)`
`747`	`747`	`pq_endmsgread();`
`748`	`748`
`749`		`-/* Execute AFTER STATEMENT insertion triggers */`
`750`		`-ExecASInsertTriggers(estate,parent_result_rel);`
	`749`	`+/* Execute AFTER STATEMENT insertion triggers(FIXME: NULL transition)*/`
	`750`	`+ExecASInsertTriggersCompat(estate,parent_result_rel,NULL);`
`751`	`751`
`752`	`752`	`/* Handle queued AFTER triggers */`
`753`	`753`	`AfterTriggerEndQuery(estate);`

Comments

(0)