fix: remove utility.c atomicity override, fix test separator

rophy · rophy · commit 2ad34f3dfcfc · 2026-02-07T11:57:34.000Z
Remove the Oracle-mode atomicity override in utility.c for CALL/DO
statements. Instead, add / separator after CREATE FUNCTION in the
test to properly separate it from the following DO block.

Restore expected "invalid transaction termination" error for
START TRANSACTION; DO ... COMMIT case, which is correct behavior.
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
@@ -67,7 +67,6 @@
 #include "utils/acl.h"
 #include "utils/guc.h"
 #include "utils/lsyscache.h"
-#include "utils/ora_compatible.h"
 
 /* Hook for plugins to get control in ProcessUtility() */
 ProcessUtility_hook_type ProcessUtility_hook = NULL;
@@ -714,25 +713,7 @@ standard_ProcessUtility(PlannedStmt *pstmt,
 			break;
 
 		case T_DoStmt:
-			/*
-			 * In Oracle compatibility mode, anonymous blocks are non-atomic
-			 * by default when executed at the top level or in a non-atomic
-			 * context, allowing COMMIT/ROLLBACK within the block and in
-			 * any procedures called from it.  However, if we're already in
-			 * an atomic context (e.g., called from a function), we must
-			 * respect that.
-			 */
-			{
-				bool	doAtomicContext = isAtomicContext;
-
-				if (compatible_db == ORA_PARSER &&
-					(context == PROCESS_UTILITY_TOPLEVEL ||
-					 context == PROCESS_UTILITY_QUERY_NONATOMIC))
-					doAtomicContext = false;
-
-				ExecuteDoStmt(pstate, (DoStmt *) parsetree,
-							  doAtomicContext, params, dest);
-			}
+			ExecuteDoStmt(pstate, (DoStmt *) parsetree, isAtomicContext, params, dest);
 			break;
 
 		case T_CreateTableSpaceStmt:
@@ -876,24 +857,7 @@ standard_ProcessUtility(PlannedStmt *pstmt,
 			break;
 
 		case T_CallStmt:
-			/*
-			 * In Oracle compatibility mode, CALL statements are non-atomic
-			 * by default when executed at the top level or in a non-atomic
-			 * context, allowing COMMIT/ROLLBACK within the called procedure
-			 * and any nested calls.  However, if we're already in an atomic
-			 * context (e.g., called from a function), we must respect that.
-			 */
-			{
-				bool	callAtomicContext = isAtomicContext;
-
-				if (compatible_db == ORA_PARSER &&
-					(context == PROCESS_UTILITY_TOPLEVEL ||
-					 context == PROCESS_UTILITY_QUERY_NONATOMIC))
-					callAtomicContext = false;
-
-				ExecuteCallStmt(castNode(CallStmt, parsetree), params,
-								callAtomicContext, dest);
-			}
+			ExecuteCallStmt(castNode(CallStmt, parsetree), params, isAtomicContext, dest);
 			break;
 
 		case T_ClusterStmt:
diff --git a/src/pl/plisql/src/expected/plisql_transaction.out b/src/pl/plisql/src/expected/plisql_transaction.out
@@ -55,6 +55,8 @@ CONTEXT:  PL/iSQL function transaction_test1(pg_catalog.int4,text) line 6 at COM
 COMMIT;
 START TRANSACTION;
 DO LANGUAGE plisql $$ BEGIN COMMIT; END $$;
+ERROR:  invalid transaction termination
+CONTEXT:  PL/iSQL function inline_code_block line 1 at COMMIT
 COMMIT;
 TRUNCATE test1;
 -- not allowed in a function
@@ -470,6 +472,7 @@ INSERT INTO test4 SELECT repeat('xyzzy', 2000);
 -- that will return a still-toasted value
 CREATE FUNCTION data_source(i int) RETURNS TEXT LANGUAGE sql
 AS 'select f1 from test4' IMMUTABLE;
+/
 DO $$
 declare x text;
 begin
@@ -479,8 +482,8 @@ begin
   end loop;
   raise notice 'length(x) = %', length(x);
 end $$;
-/
 NOTICE:  length(x) = 10000
+/
 -- operations on composite types vs. internal transactions
 DO LANGUAGE plisql $$
 declare
diff --git a/src/pl/plisql/src/sql/plisql_transaction.sql b/src/pl/plisql/src/sql/plisql_transaction.sql
@@ -393,6 +393,7 @@ INSERT INTO test4 SELECT repeat('xyzzy', 2000);
 -- that will return a still-toasted value
 CREATE FUNCTION data_source(i int) RETURNS TEXT LANGUAGE sql
 AS 'select f1 from test4' IMMUTABLE;
+/
 
 DO $$
 declare x text;
