Do not close portals in autonomous transaction

knizhnik · knizhnik · commit 044996ba4689 · 2017-01-31T23:38:25.000+03:00
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
@@ -2040,7 +2040,7 @@ CommitTransaction(void)
 		 * If there weren't any, we are done ... otherwise loop back to check
 		 * if they queued deferred triggers.  Lather, rinse, repeat.
 		 */
-		if (!PreCommit_Portals(false))
+		if (getNestLevelATX() != 0 || !PreCommit_Portals(false))
 			break;
 	}
 
@@ -2280,7 +2280,7 @@ PrepareTransaction(void)
 		 * If there weren't any, we are done ... otherwise loop back to check
 		 * if they queued deferred triggers.  Lather, rinse, repeat.
 		 */
-		if (!PreCommit_Portals(true))
+		if (getNestLevelATX() != 0 || !PreCommit_Portals(false))
 			break;
 	}
 
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
@@ -1230,15 +1230,15 @@ exec_stmt_block(PLpgSQL_execstate *estate, PLpgSQL_stmt_block *block)
 			edata = CopyErrorData();
 			FlushErrorState();
 
+			estate->eval_econtext = old_eval_econtext;
+
 			plpgsql_destroy_econtext(estate);
 
 			old_shared_estate = shared_simple_eval_estate;
 			shared_simple_eval_estate = NULL;
 			AbortCurrentTransaction();
 			shared_simple_eval_estate = old_shared_estate;
 
-			estate->eval_econtext = old_eval_econtext;
-
 			if (block->exceptions)
 			{
 				/* Look for a matching exception handler */
