Commit9873756

committed

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

Tags: pg_variables, atx

1 parentafdef54 commit9873756Copy full SHA for 9873756

File tree

+90

-1

lines changed

+90

-1

lines changed

Lines changed: 31 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -343,6 +343,37 @@ BEGIN;`
`343`	`343`	`FETCH 1 IN r1_cur;`
`344`	`344`	`ERROR: unrecognized package "test"`
`345`	`345`	`ROLLBACK;`
	`346`	`+--`
	`347`	`+--`
	`348`	`+-- Test for case: pgv_set() created regular a variable; rollback`
	`349`	`+-- removes package state and creates a new state to make package valid.`
	`350`	`+-- Commit of next autonomous transaction should not replace this new`
	`351`	`+-- state (this is not allowed for autonomous transaction).`
	`352`	`+--`
	`353`	`+BEGIN;`
	`354`	`+BEGIN AUTONOMOUS;`
	`355`	`+SELECT pgv_set('vars', 'int1', 1);`
	`356`	`+ pgv_set`
	`357`	`+---------`
	`358`	`+`
	`359`	`+(1 row)`
	`360`	`+`
	`361`	`+ROLLBACK;`
	`362`	`+BEGIN AUTONOMOUS;`
	`363`	`+SELECT pgv_set('vars', 'int1', 2);`
	`364`	`+ pgv_set`
	`365`	`+---------`
	`366`	`+`
	`367`	`+(1 row)`
	`368`	`+`
	`369`	`+COMMIT;`
	`370`	`+ROLLBACK;`
	`371`	`+SELECT pgv_remove('vars', 'int1');`
	`372`	`+ pgv_remove`
	`373`	`+------------`
	`374`	`+`
	`375`	`+(1 row)`
	`376`	`+`
`346`	`377`	`SELECT pgv_free();`
`347`	`378`	`pgv_free`
`348`	`379`	`----------`

Lines changed: 35 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -375,6 +375,41 @@ ERROR: current transaction is aborted, commands ignored until end of transactio`
`375`	`375`	`ERROR: cursor "r1_cur" does not exist`
`376`	`376`	`ROLLBACK;`
`377`	`377`	`WARNING: there is no transaction in progress`
	`378`	`+--`
	`379`	`+--`
	`380`	`+-- Test for case: pgv_set() created regular a variable; rollback`
	`381`	`+-- removes package state and creates a new state to make package valid.`
	`382`	`+-- Commit of next autonomous transaction should not replace this new`
	`383`	`+-- state (this is not allowed for autonomous transaction).`
	`384`	`+--`
	`385`	`+BEGIN;`
	`386`	`+BEGIN AUTONOMOUS;`
	`387`	`+ERROR: syntax error at or near "AUTONOMOUS"`
	`388`	`+LINE 1: BEGIN AUTONOMOUS;`
	`389`	`+ ^`
	`390`	`+SELECT pgv_set('vars', 'int1', 1);`
	`391`	`+ERROR: current transaction is aborted, commands ignored until end of transaction block`
	`392`	`+ROLLBACK;`
	`393`	`+BEGIN AUTONOMOUS;`
	`394`	`+ERROR: syntax error at or near "AUTONOMOUS"`
	`395`	`+LINE 1: BEGIN AUTONOMOUS;`
	`396`	`+ ^`
	`397`	`+SELECT pgv_set('vars', 'int1', 2);`
	`398`	`+ pgv_set`
	`399`	`+---------`
	`400`	`+`
	`401`	`+(1 row)`
	`402`	`+`
	`403`	`+COMMIT;`
	`404`	`+WARNING: there is no transaction in progress`
	`405`	`+ROLLBACK;`
	`406`	`+WARNING: there is no transaction in progress`
	`407`	`+SELECT pgv_remove('vars', 'int1');`
	`408`	`+ pgv_remove`
	`409`	`+------------`
	`410`	`+`
	`411`	`+(1 row)`
	`412`	`+`
`378`	`413`	`SELECT pgv_free();`
`379`	`414`	`pgv_free`
`380`	`415`	`----------`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2354,7 +2354,14 @@ rollbackSavepoint(TransObject *object, TransObjectType type)`
`2354`	`2354`	`/* ...create a new state to make package valid. */`
`2355`	`2355`	`initObjectHistory(object,type);`
`2356`	`2356`	`#ifdefPGPRO_EE`
`2357`		`-GetActualState(object)->levels.atxlevel=getNestLevelATX();`
	`2357`	`+/*`
	`2358`	`+ * Package inside autonomous transaction should not be detected`
	`2359`	`+ * as 'object has been changed in upper level' because in this`
	`2360`	`+ * case we will remove state in releaseSavepoint() but this`
	`2361`	`+ * state may be used pgvRestoreContext(). So atxlevel should`
	`2362`	`+ * be 0.`
	`2363`	`+ */`
	`2364`	`+GetActualState(object)->levels.atxlevel=0;`
`2358`	`2365`	`#endif`
`2359`	`2366`	`GetActualState(object)->levels.level=GetCurrentTransactionNestLevel()-1;`
`2360`	`2367`	`if (!dlist_is_empty(changesStack))`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -166,5 +166,21 @@ BEGIN;`
`166`	`166`	`-- ERROR: unrecognized package "test"`
`167`	`167`	`FETCH1IN r1_cur;`
`168`	`168`	`ROLLBACK;`
	`169`	`+--`
	`170`	`+--`
	`171`	`+-- Test for case: pgv_set() created regular a variable; rollback`
	`172`	`+-- removes package state and creates a new state to make package valid.`
	`173`	`+-- Commit of next autonomous transaction should not replace this new`
	`174`	`+-- state (this is not allowed for autonomous transaction).`
	`175`	`+--`
	`176`	`+BEGIN;`
	`177`	`+BEGIN AUTONOMOUS;`
	`178`	`+SELECT pgv_set('vars','int1',1);`
	`179`	`+ROLLBACK;`
	`180`	`+BEGIN AUTONOMOUS;`
	`181`	`+SELECT pgv_set('vars','int1',2);`
	`182`	`+COMMIT;`
	`183`	`+ROLLBACK;`
	`184`	`+SELECT pgv_remove('vars','int1');`
`169`	`185`
`170`	`186`	`SELECT pgv_free();`

Comments

(0)