[PGPRO-7614] Fix error that caused by replacement of package state at end of autonomous transaction

kovdb75 · kovdb75 · commit 987375619407 · 2023-01-13T15:16:40.000+03:00
Tags: pg_variables, atx
diff --git a/expected/pg_variables_atx_pkg.out b/expected/pg_variables_atx_pkg.out
@@ -343,6 +343,37 @@ BEGIN;
 	FETCH 1 IN r1_cur;
 ERROR:  unrecognized package "test"
 ROLLBACK;
+--
+--
+-- Test for case: pgv_set() created regular a variable; rollback
+-- removes package state and creates a new state to make package valid.
+-- Commit of next autonomous transaction should not replace this new
+-- state (this is not allowed for autonomous transaction).
+--
+BEGIN;
+	BEGIN AUTONOMOUS;
+		SELECT pgv_set('vars', 'int1', 1);
+ pgv_set 
+---------
+ 
+(1 row)
+
+	ROLLBACK;
+	BEGIN AUTONOMOUS;
+		SELECT pgv_set('vars', 'int1', 2);
+ pgv_set 
+---------
+ 
+(1 row)
+
+	COMMIT;
+ROLLBACK;
+SELECT pgv_remove('vars', 'int1');
+ pgv_remove 
+------------
+ 
+(1 row)
+
 SELECT pgv_free();
  pgv_free 
 ----------
diff --git a/expected/pg_variables_atx_pkg_1.out b/expected/pg_variables_atx_pkg_1.out
@@ -375,6 +375,41 @@ ERROR:  current transaction is aborted, commands ignored until end of transactio
 ERROR:  cursor "r1_cur" does not exist
 ROLLBACK;
 WARNING:  there is no transaction in progress
+--
+--
+-- Test for case: pgv_set() created regular a variable; rollback
+-- removes package state and creates a new state to make package valid.
+-- Commit of next autonomous transaction should not replace this new
+-- state (this is not allowed for autonomous transaction).
+--
+BEGIN;
+	BEGIN AUTONOMOUS;
+ERROR:  syntax error at or near "AUTONOMOUS"
+LINE 1: BEGIN AUTONOMOUS;
+              ^
+		SELECT pgv_set('vars', 'int1', 1);
+ERROR:  current transaction is aborted, commands ignored until end of transaction block
+	ROLLBACK;
+	BEGIN AUTONOMOUS;
+ERROR:  syntax error at or near "AUTONOMOUS"
+LINE 1: BEGIN AUTONOMOUS;
+              ^
+		SELECT pgv_set('vars', 'int1', 2);
+ pgv_set 
+---------
+ 
+(1 row)
+
+	COMMIT;
+WARNING:  there is no transaction in progress
+ROLLBACK;
+WARNING:  there is no transaction in progress
+SELECT pgv_remove('vars', 'int1');
+ pgv_remove 
+------------
+ 
+(1 row)
+
 SELECT pgv_free();
  pgv_free 
 ----------
diff --git a/pg_variables.c b/pg_variables.c
@@ -2354,7 +2354,14 @@ rollbackSavepoint(TransObject *object, TransObjectType type)
 				/* ...create a new state to make package valid. */
 				initObjectHistory(object, type);
 #ifdef PGPRO_EE
-				GetActualState(object)->levels.atxlevel = getNestLevelATX();
+				/*
+				 * Package inside autonomous transaction should not be detected
+				 * as 'object has been changed in upper level' because in this
+				 * case we will remove state in releaseSavepoint() but this
+				 * state may be used pgvRestoreContext(). So atxlevel should
+				 * be 0.
+				 */
+				GetActualState(object)->levels.atxlevel = 0;
 #endif
 				GetActualState(object)->levels.level = GetCurrentTransactionNestLevel() - 1;
 				if (!dlist_is_empty(changesStack))
diff --git a/sql/pg_variables_atx_pkg.sql b/sql/pg_variables_atx_pkg.sql
@@ -166,5 +166,21 @@ BEGIN;
 -- ERROR:  unrecognized package "test"
 	FETCH 1 IN r1_cur;
 ROLLBACK;
+--
+--
+-- Test for case: pgv_set() created regular a variable; rollback
+-- removes package state and creates a new state to make package valid.
+-- Commit of next autonomous transaction should not replace this new
+-- state (this is not allowed for autonomous transaction).
+--
+BEGIN;
+	BEGIN AUTONOMOUS;
+		SELECT pgv_set('vars', 'int1', 1);
+	ROLLBACK;
+	BEGIN AUTONOMOUS;
+		SELECT pgv_set('vars', 'int1', 2);
+	COMMIT;
+ROLLBACK;
+SELECT pgv_remove('vars', 'int1');
 
 SELECT pgv_free();
