@@ -29,9 +29,9 @@ CustomScanMethodspartition_router_plan_methods;
2929CustomExecMethods partition_router_exec_methods ;
3030
3131static TupleTableSlot * router_delete_tuple (TupleTableSlot * slot ,
32- ItemPointer tupleid ,
33- EPQState * epqstate ,
34- EState * estate );
32+ ItemPointer tupleid ,
33+ EPQState * epqstate ,
34+ EState * estate );
3535
3636void
3737init_partition_router_static_data (void )
@@ -232,32 +232,34 @@ partition_router_explain(CustomScanState *node, List *ancestors, ExplainState *e
232232/*
233233 * ----------------------------------------------------------------
234234 * ExecDeleteInternal
235- *Basicly is a copy of ExecDelete from executor/nodeModifyTable.c
235+ *This is a modified copy of ExecDelete from executor/nodeModifyTable.c
236236 * ----------------------------------------------------------------
237237 */
238238
239239static TupleTableSlot *
240240router_delete_tuple (TupleTableSlot * slot ,
241- ItemPointer tupleid ,
242- EPQState * epqstate ,
243- EState * estate )
241+ ItemPointer tupleid ,
242+ EPQState * epqstate ,
243+ EState * estate )
244244{
245245ResultRelInfo * rri ;
246246Relation rel ;
247247HTSU_Result result ;
248248HeapUpdateFailureData hufd ;
249249
250- /*
251- * get information on the (current) result relation
252- */
250+ EvalPlanQualSetSlot ( epqstate , slot );
251+
252+ /* Get information on the (current) result relation */
253253rri = estate -> es_result_relation_info ;
254254rel = rri -> ri_RelationDesc ;
255255
256256/* BEFORE ROW UPDATE triggers */
257257if (rri -> ri_TrigDesc &&
258258rri -> ri_TrigDesc -> trig_update_before_row )
259259{
260- elog (INFO ,"kek!" );
260+ slot = ExecBRUpdateTriggers (estate ,epqstate ,rri ,tupleid ,NULL ,slot );
261+ if (TupIsNull (slot ))
262+ return NULL ;
261263}
262264
263265/* BEFORE ROW DELETE triggers */
@@ -270,10 +272,8 @@ router_delete_tuple(TupleTableSlot *slot,
270272
271273if (tupleid != NULL )
272274{
273- EvalPlanQualSetSlot (epqstate ,slot );
274-
275275ldelete :
276- /*delete the tuple */
276+ /*Delete the tuple */
277277result = heap_delete_compat (rel ,tupleid ,
278278estate -> es_output_cid ,
279279estate -> es_crosscheck_snapshot ,
@@ -328,8 +328,7 @@ router_delete_tuple(TupleTableSlot *slot,
328328elog (ERROR ,"unrecognized heap_delete status: %u" ,result );
329329}
330330}
331- else
332- elog (ERROR ,"tupleid should be specified for deletion" );
331+ else elog (ERROR ,"tupleid should be specified for deletion" );
333332
334333/* AFTER ROW DELETE triggers */
335334ExecARDeleteTriggersCompat (estate ,rri ,tupleid ,NULL ,NULL );