diff --git a/expected/pg_variables_trans.out b/expected/pg_variables_trans.out
index d73ef69..8113fc8 100644
--- a/expected/pg_variables_trans.out
+++ b/expected/pg_variables_trans.out
@@ -2367,3 +2367,1398 @@ SELECT pgv_free();
  
 (1 row)
 
+-- Variables should be rollbackable if transactional
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'x', ROW (2::int, 3::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+BEGIN;
+SELECT pgv_remove('test', 'x');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+BEGIN;
+SELECT pgv_remove('test');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+BEGIN;
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+---
+--- Variables should not be rollbackable if not transactional
+---
+-- case 1 (remove var)
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'y', ROW (2::int, 3::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'y');
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+BEGIN;
+SELECT pgv_remove('test', 'y');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+ROLLBACK;
+SELECT pgv_select('test', 'y');
+ERROR:  unrecognized variable "y"
+-- case 2 (remove pack)
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'y', ROW (2::int, 3::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'y');
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+BEGIN;
+SELECT pgv_remove('test');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+ROLLBACK;
+SELECT pgv_select('test', 'y');
+ERROR:  unrecognized variable "y"
+-- case 3 (free)
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'y', ROW (2::int, 3::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'y');
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+BEGIN;
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+ROLLBACK;
+SELECT pgv_select('test', 'y');
+ERROR:  unrecognized variable "y"
+-- clear all
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+---
+--- Cursors test #1 (remove var)
+---
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+SELECT pgv_remove('test', 'x');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'y');
+SELECT pgv_remove('test', 'y');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized variable "y"
+ROLLBACK;
+SELECT pgv_select('test', 'y');
+ERROR:  unrecognized variable "y"
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+---
+--- Cursors test #2 (remove pack)
+---
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+SELECT pgv_remove('test');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'y');
+SELECT pgv_remove('test');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test');
+ERROR:  function pgv_select(unknown) does not exist
+LINE 1: SELECT pgv_select('test');
+               ^
+HINT:  No function matches the given name and argument types. You might need to add explicit type casts.
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+---
+--- Cursors test #3 (free)
+---
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'y');
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test');
+ERROR:  function pgv_select(unknown) does not exist
+LINE 1: SELECT pgv_select('test');
+               ^
+HINT:  No function matches the given name and argument types. You might need to add explicit type casts.
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+---
+--- Cursor test #4
+---
+-- non transactional, remove var
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+SELECT pgv_remove('test', 'x');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ERROR:  unrecognized package "test"
+-- non transactional, remove pac
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+SELECT pgv_remove('test');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ERROR:  unrecognized package "test"
+-- non transactional, free
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ERROR:  unrecognized package "test"
+-- transactional, remove var
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'y');
+SELECT pgv_remove('test', 'y');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'y');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+-- transactional, remove pack
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'y');
+SELECT pgv_remove('test');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'y');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+-- transactional, free
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'y');
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'y');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+---
+--- Cursor test #5
+---
+-- non transactional
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+CLOSE r1_cur;
+SELECT pgv_remove('test', 'x');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ERROR:  unrecognized package "test"
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+CLOSE r1_cur;
+SELECT pgv_remove('test');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ERROR:  unrecognized package "test"
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+CLOSE r1_cur;
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ERROR:  unrecognized package "test"
+-- transactional
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_remove('test', 'x');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_remove('test');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+---
+--- Cursor test #6
+---
+--SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), TRUE);
+--BEGIN;
+--DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+--FETCH 1 in r1_cur;
+--CLOSE r1_cur;
+--SELECT pgv_remove('test', 'x');
+--COMMIT;
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+---
+--- Tests for "leaked hash_seq_search scan for hash table"
+---
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'x', ROW (2::int, 3::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'x', ROW (3::int, 4::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'x') LIMIT 1;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_select('test', 'x') LIMIT 2;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+SELECT pgv_select('test', 'x') LIMIT 3;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+BEGIN;
+SELECT pgv_select('test', 'x') LIMIT 1;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_select('test', 'x') LIMIT 2;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+SELECT pgv_select('test', 'x') LIMIT 3;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+ROLLBACK;
+BEGIN;
+SELECT pgv_select('test', 'x') LIMIT 1;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_select('test', 'x') LIMIT 2;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+SELECT pgv_select('test', 'x') LIMIT 3;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+COMMIT;
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'y', ROW (2::int, 3::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'y', ROW (3::int, 4::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'y') LIMIT 1;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_select('test', 'y') LIMIT 2;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+SELECT pgv_select('test', 'y') LIMIT 3;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+BEGIN;
+SELECT pgv_select('test', 'y') LIMIT 1;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_select('test', 'y') LIMIT 2;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+SELECT pgv_select('test', 'y') LIMIT 3;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+ROLLBACK;
+BEGIN;
+SELECT pgv_select('test', 'y') LIMIT 1;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_select('test', 'y') LIMIT 2;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+SELECT pgv_select('test', 'y') LIMIT 3;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+COMMIT;
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+DECLARE r2_cur CURSOR FOR SELECT pgv_select('test', 'y');
+DECLARE r3_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+FETCH 1 in r2_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+FETCH 1 in r3_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+ROLLBACK;
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+DECLARE r2_cur CURSOR FOR SELECT pgv_select('test', 'y');
+DECLARE r3_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 2 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+FETCH 2 in r2_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+FETCH 2 in r3_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+ROLLBACK;
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+DECLARE r2_cur CURSOR FOR SELECT pgv_select('test', 'y');
+DECLARE r3_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 3 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+FETCH 3 in r2_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+FETCH 3 in r3_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+ROLLBACK;
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+DECLARE r2_cur CURSOR FOR SELECT pgv_select('test', 'y');
+DECLARE r3_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+FETCH 1 in r2_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+FETCH 1 in r3_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+COMMIT;
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+DECLARE r2_cur CURSOR FOR SELECT pgv_select('test', 'y');
+DECLARE r3_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 2 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+FETCH 2 in r2_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+FETCH 2 in r3_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+COMMIT;
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+DECLARE r2_cur CURSOR FOR SELECT pgv_select('test', 'y');
+DECLARE r3_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 3 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+FETCH 3 in r2_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+FETCH 3 in r3_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+COMMIT;
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+DECLARE r2_cur CURSOR FOR SELECT pgv_select('test', 'y');
+DECLARE r3_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+FETCH 2 in r2_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+FETCH 3 in r3_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+ROLLBACK;
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+DECLARE r2_cur CURSOR FOR SELECT pgv_select('test', 'y');
+DECLARE r3_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+FETCH 2 in r2_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+FETCH 3 in r3_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+COMMIT;
+---
+--- Some special cases
+---
+-- take #1
+SELECT pgv_insert('test', 'z1', ROW (2::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'z1');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (2,2)
+(1 row)
+
+SELECT pgv_remove('test', 'z1');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized variable "z1"
+ROLLBACK;
+SELECT pgv_select('test', 'z1');
+ pgv_select 
+------------
+ (2,2)
+(1 row)
+
+-- take #2
+SELECT pgv_insert('test', 'z2', ROW (2::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'z2');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (2,2)
+(1 row)
+
+CLOSE r1_cur;
+SELECT pgv_remove('test', 'z2');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  cursor "r1_cur" does not exist
+ROLLBACK;
+SELECT pgv_select('test', 'z2');
+ERROR:  unrecognized variable "z2"
+SELECT pgv_insert('test', 'z2', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+-- take #3
+SELECT pgv_insert('test', 'z3', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'z3');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+CLOSE r1_cur;
+SELECT pgv_remove('test', 'z3');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  cursor "r1_cur" does not exist
+ROLLBACK;
+SELECT pgv_select('test', 'z3');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+--BEGIN;
+--DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'z3');
+--FETCH 1 in r1_cur;
+--SELECT pgv_remove('test', 'z3');
+--COMMIT;
+--SELECT pgv_select('test', 'z3');
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+-- take #4
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'x', ROW (2::int, 3::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+SAVEPOINT sp1;
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+ROLLBACK TO SAVEPOINT sp1;
+COMMIT;
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+SAVEPOINT sp1;
+FETCH 2 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+ROLLBACK TO SAVEPOINT sp1;
+COMMIT;
+BEGIN;
+SAVEPOINT sp1;
+SELECT pgv_select('test', 'x') LIMIT 1;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+ROLLBACK TO SAVEPOINT sp1;
+COMMIT;
+---
+--- Test cases for pgv_stats
+---
+SELECT pgv_insert('test1', 'y', ROW (2::float, 1::float), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test1', 'x', ROW (2::float, 1::float), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+FETCH 1 in r1_cur;
+  pgv_stats   
+--------------
+ (test,32768)
+(1 row)
+
+FETCH 1 in r2_cur;
+  pgv_stats   
+--------------
+ (test,32768)
+(1 row)
+
+COMMIT;
+SELECT pgv_insert('test1', 'y', ROW (2::float, 1::float), TRUE);
+ERROR:  there is a record in the variable "y" with same key
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+FETCH 1 in r1_cur;
+  pgv_stats   
+--------------
+ (test,32768)
+(1 row)
+
+FETCH 1 in r2_cur;
+  pgv_stats   
+--------------
+ (test,32768)
+(1 row)
+
+ROLLBACK;
+SELECT pgv_insert('test1', 'y', ROW (2::float, 1::float), FALSE);
+ERROR:  variable "y" already created as TRANSACTIONAL
+SELECT pgv_insert('test1', 'y', ROW (2::float, 1::float), FALSE);
+ERROR:  variable "y" already created as TRANSACTIONAL
+SELECT pgv_insert('test1', 'x', ROW (2::float, 1::float), FALSE);
+ERROR:  variable "x" already created as TRANSACTIONAL
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+FETCH 1 in r1_cur;
+  pgv_stats   
+--------------
+ (test,32768)
+(1 row)
+
+FETCH 1 in r2_cur;
+  pgv_stats   
+--------------
+ (test,32768)
+(1 row)
+
+COMMIT;
+SELECT pgv_insert('test1', 'y', ROW (2::float, 1::float), FALSE);
+ERROR:  variable "y" already created as TRANSACTIONAL
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+FETCH 1 in r1_cur;
+  pgv_stats   
+--------------
+ (test,32768)
+(1 row)
+
+FETCH 1 in r2_cur;
+  pgv_stats   
+--------------
+ (test,32768)
+(1 row)
+
+ROLLBACK;
+SELECT pgv_insert('test1', 'y', ROW (2::float, 1::float), FALSE);
+ERROR:  variable "y" already created as TRANSACTIONAL
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+---
+--- Some special cases
+---
+-- 1
+BEGIN;
+SAVEPOINT comm2;
+SELECT pgv_insert('test', 'x1', ROW (2::float, 1::float), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+FETCH 1 in r1_cur;
+  pgv_stats   
+--------------
+ (test,32768)
+(1 row)
+
+FETCH 1 in r2_cur;
+  pgv_stats   
+--------------
+ (test,32768)
+(1 row)
+
+COMMIT;
+-- 2
+BEGIN;
+SELECT pgv_insert('test', 'x2', ROW (2::float, 1::float), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SAVEPOINT comm2;
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+FETCH 1 in r1_cur;
+  pgv_stats   
+--------------
+ (test,49152)
+(1 row)
+
+FETCH 1 in r2_cur;
+  pgv_stats   
+--------------
+ (test,49152)
+(1 row)
+
+COMMIT;
+-- 3
+BEGIN;
+SELECT pgv_insert('test', 'x3', ROW (2::float, 1::float), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+SAVEPOINT comm2;
+FETCH 1 in r1_cur;
+  pgv_stats   
+--------------
+ (test,65536)
+(1 row)
+
+FETCH 1 in r2_cur;
+  pgv_stats   
+--------------
+ (test,65536)
+(1 row)
+
+COMMIT;
+-- 4
+BEGIN;
+SELECT pgv_insert('test', 'x4', ROW (2::float, 1::float), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+FETCH 1 in r1_cur;
+  pgv_stats   
+--------------
+ (test,81920)
+(1 row)
+
+SAVEPOINT comm2;
+FETCH 1 in r2_cur;
+  pgv_stats   
+--------------
+ (test,81920)
+(1 row)
+
+COMMIT;
+-- 5
+BEGIN;
+SELECT pgv_insert('test', 'x5', ROW (2::float, 1::float), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+FETCH 1 in r1_cur;
+  pgv_stats   
+--------------
+ (test,98304)
+(1 row)
+
+FETCH 1 in r2_cur;
+  pgv_stats   
+--------------
+ (test,98304)
+(1 row)
+
+SAVEPOINT comm2;
+COMMIT;
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
diff --git a/expected/pg_variables_trans_1.out b/expected/pg_variables_trans_1.out
new file mode 100644
index 0000000..b6f8132
--- /dev/null
+++ b/expected/pg_variables_trans_1.out
@@ -0,0 +1,3764 @@
+SET timezone = 'Europe/Moscow'; -- Need to proper output of datetime variables
+--CHECK SAVEPOINT RELEASE
+BEGIN;
+-- Declare variables
+SELECT pgv_set('vars', 'any1', 'some value'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT pgv_set('vars', 'any2', 'some value'::text);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT pgv_set_int('vars', 'int1', 101, true);
+ pgv_set_int 
+-------------
+ 
+(1 row)
+
+SELECT pgv_set_int('vars', 'int2', 102);
+ pgv_set_int 
+-------------
+ 
+(1 row)
+
+SELECT pgv_set_int('vars', 'intNULL', NULL, true);
+ pgv_set_int 
+-------------
+ 
+(1 row)
+
+SELECT pgv_set_text('vars', 'str1', 's101', true);
+ pgv_set_text 
+--------------
+ 
+(1 row)
+
+SELECT pgv_set_text('vars', 'str2', 's102');
+ pgv_set_text 
+--------------
+ 
+(1 row)
+
+SELECT pgv_set_numeric('vars', 'num1', 1.01, true);
+ pgv_set_numeric 
+-----------------
+ 
+(1 row)
+
+SELECT pgv_set_numeric('vars', 'num2', 1.02);
+ pgv_set_numeric 
+-----------------
+ 
+(1 row)
+
+SELECT pgv_set_timestamp('vars', 'ts1', '2016-03-30 10:00:00', true);
+ pgv_set_timestamp 
+-------------------
+ 
+(1 row)
+
+SELECT pgv_set_timestamp('vars', 'ts2', '2016-03-30 11:00:00');
+ pgv_set_timestamp 
+-------------------
+ 
+(1 row)
+
+SELECT pgv_set_timestamptz('vars', 'tstz1', '2016-03-30 10:00:00 GMT+01', true);
+ pgv_set_timestamptz 
+---------------------
+ 
+(1 row)
+
+SELECT pgv_set_timestamptz('vars', 'tstz2', '2016-03-30 11:00:00 GMT+02');
+ pgv_set_timestamptz 
+---------------------
+ 
+(1 row)
+
+SELECT pgv_set_date('vars', 'd1', '2016-03-29', true);
+ pgv_set_date 
+--------------
+ 
+(1 row)
+
+SELECT pgv_set_date('vars', 'd2', '2016-03-30');
+ pgv_set_date 
+--------------
+ 
+(1 row)
+
+SELECT pgv_set_jsonb('vars2', 'j1', '[1, 2, "foo", null]', true);
+ pgv_set_jsonb 
+---------------
+ 
+(1 row)
+
+SELECT pgv_set_jsonb('vars2', 'j2', '{"bar": "baz", "balance": 7.77, "active": false}');
+ pgv_set_jsonb 
+---------------
+ 
+(1 row)
+
+SAVEPOINT comm;
+-- Set new values
+SELECT pgv_set('vars', 'any1', 'another value'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT pgv_set('vars', 'any2', 'another value'::text);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT pgv_set_int('vars', 'int1', 103, true);
+ pgv_set_int 
+-------------
+ 
+(1 row)
+
+SELECT pgv_set_int('vars', 'int2', 103);
+ pgv_set_int 
+-------------
+ 
+(1 row)
+
+SELECT pgv_set_int('vars', 'intNULL', 104, true);
+ pgv_set_int 
+-------------
+ 
+(1 row)
+
+SELECT pgv_set_text('vars', 'str1', 's103', true);
+ pgv_set_text 
+--------------
+ 
+(1 row)
+
+SELECT pgv_set_text('vars', 'str2', 's103');
+ pgv_set_text 
+--------------
+ 
+(1 row)
+
+SELECT pgv_set_numeric('vars', 'num1', 1.03, true);
+ pgv_set_numeric 
+-----------------
+ 
+(1 row)
+
+SELECT pgv_set_numeric('vars', 'num2', 1.03);
+ pgv_set_numeric 
+-----------------
+ 
+(1 row)
+
+SELECT pgv_set_timestamp('vars', 'ts1', '2016-03-30 12:00:00', true);
+ pgv_set_timestamp 
+-------------------
+ 
+(1 row)
+
+SELECT pgv_set_timestamp('vars', 'ts2', '2016-03-30 12:00:00');
+ pgv_set_timestamp 
+-------------------
+ 
+(1 row)
+
+SELECT pgv_set_timestamptz('vars', 'tstz1', '2016-03-30 12:00:00 GMT+03', true);
+ pgv_set_timestamptz 
+---------------------
+ 
+(1 row)
+
+SELECT pgv_set_timestamptz('vars', 'tstz2', '2016-03-30 12:00:00 GMT+03');
+ pgv_set_timestamptz 
+---------------------
+ 
+(1 row)
+
+SELECT pgv_set_date('vars', 'd1', '2016-04-02', true);
+ pgv_set_date 
+--------------
+ 
+(1 row)
+
+SELECT pgv_set_date('vars', 'd2', '2016-04-02');
+ pgv_set_date 
+--------------
+ 
+(1 row)
+
+SELECT pgv_set_jsonb('vars2', 'j1', '{"foo": [true, "bar"], "tags": {"a": 1, "b": null}}', true);
+ pgv_set_jsonb 
+---------------
+ 
+(1 row)
+
+SELECT pgv_set_jsonb('vars2', 'j2', '{"foo": [true, "bar"], "tags": {"a": 1, "b": null}}');
+ pgv_set_jsonb 
+---------------
+ 
+(1 row)
+
+-- Check values before releasing savepoint
+SELECT pgv_get('vars', 'any1',NULL::text);
+    pgv_get    
+---------------
+ another value
+(1 row)
+
+SELECT pgv_get('vars', 'any2',NULL::text);
+    pgv_get    
+---------------
+ another value
+(1 row)
+
+SELECT pgv_get_int('vars', 'int1');
+ pgv_get_int 
+-------------
+         103
+(1 row)
+
+SELECT pgv_get_int('vars', 'int2');
+ pgv_get_int 
+-------------
+         103
+(1 row)
+
+SELECT pgv_get_int('vars', 'intNULL');
+ pgv_get_int 
+-------------
+         104
+(1 row)
+
+SELECT pgv_get_text('vars', 'str1');
+ pgv_get_text 
+--------------
+ s103
+(1 row)
+
+SELECT pgv_get_text('vars', 'str2');
+ pgv_get_text 
+--------------
+ s103
+(1 row)
+
+SELECT pgv_get_numeric('vars', 'num1');
+ pgv_get_numeric 
+-----------------
+            1.03
+(1 row)
+
+SELECT pgv_get_numeric('vars', 'num2');
+ pgv_get_numeric 
+-----------------
+            1.03
+(1 row)
+
+SELECT pgv_get_timestamp('vars', 'ts1');
+    pgv_get_timestamp     
+--------------------------
+ Wed Mar 30 12:00:00 2016
+(1 row)
+
+SELECT pgv_get_timestamp('vars', 'ts2');
+    pgv_get_timestamp     
+--------------------------
+ Wed Mar 30 12:00:00 2016
+(1 row)
+
+SELECT pgv_get_timestamptz('vars', 'tstz1');
+     pgv_get_timestamptz      
+------------------------------
+ Wed Mar 30 18:00:00 2016 MSK
+(1 row)
+
+SELECT pgv_get_timestamptz('vars', 'tstz2');
+     pgv_get_timestamptz      
+------------------------------
+ Wed Mar 30 18:00:00 2016 MSK
+(1 row)
+
+SELECT pgv_get_date('vars', 'd1');
+ pgv_get_date 
+--------------
+ 04-02-2016
+(1 row)
+
+SELECT pgv_get_date('vars', 'd2');
+ pgv_get_date 
+--------------
+ 04-02-2016
+(1 row)
+
+SELECT pgv_get_jsonb('vars2', 'j1');
+                    pgv_get_jsonb                    
+-----------------------------------------------------
+ {"foo": [true, "bar"], "tags": {"a": 1, "b": null}}
+(1 row)
+
+SELECT pgv_get_jsonb('vars2', 'j2');
+                    pgv_get_jsonb                    
+-----------------------------------------------------
+ {"foo": [true, "bar"], "tags": {"a": 1, "b": null}}
+(1 row)
+
+-- Check values after releasing savepoint
+RELEASE comm;
+SELECT pgv_get('vars', 'any1',NULL::text);
+    pgv_get    
+---------------
+ another value
+(1 row)
+
+SELECT pgv_get('vars', 'any2',NULL::text);
+    pgv_get    
+---------------
+ another value
+(1 row)
+
+SELECT pgv_get_int('vars', 'int1');
+ pgv_get_int 
+-------------
+         103
+(1 row)
+
+SELECT pgv_get_int('vars', 'int2');
+ pgv_get_int 
+-------------
+         103
+(1 row)
+
+SELECT pgv_get_int('vars', 'intNULL');
+ pgv_get_int 
+-------------
+         104
+(1 row)
+
+SELECT pgv_get_text('vars', 'str1');
+ pgv_get_text 
+--------------
+ s103
+(1 row)
+
+SELECT pgv_get_text('vars', 'str2');
+ pgv_get_text 
+--------------
+ s103
+(1 row)
+
+SELECT pgv_get_numeric('vars', 'num1');
+ pgv_get_numeric 
+-----------------
+            1.03
+(1 row)
+
+SELECT pgv_get_numeric('vars', 'num2');
+ pgv_get_numeric 
+-----------------
+            1.03
+(1 row)
+
+SELECT pgv_get_timestamp('vars', 'ts1');
+    pgv_get_timestamp     
+--------------------------
+ Wed Mar 30 12:00:00 2016
+(1 row)
+
+SELECT pgv_get_timestamp('vars', 'ts2');
+    pgv_get_timestamp     
+--------------------------
+ Wed Mar 30 12:00:00 2016
+(1 row)
+
+SELECT pgv_get_timestamptz('vars', 'tstz1');
+     pgv_get_timestamptz      
+------------------------------
+ Wed Mar 30 18:00:00 2016 MSK
+(1 row)
+
+SELECT pgv_get_timestamptz('vars', 'tstz2');
+     pgv_get_timestamptz      
+------------------------------
+ Wed Mar 30 18:00:00 2016 MSK
+(1 row)
+
+SELECT pgv_get_date('vars', 'd1');
+ pgv_get_date 
+--------------
+ 04-02-2016
+(1 row)
+
+SELECT pgv_get_date('vars', 'd2');
+ pgv_get_date 
+--------------
+ 04-02-2016
+(1 row)
+
+SELECT pgv_get_jsonb('vars2', 'j1');
+                    pgv_get_jsonb                    
+-----------------------------------------------------
+ {"foo": [true, "bar"], "tags": {"a": 1, "b": null}}
+(1 row)
+
+SELECT pgv_get_jsonb('vars2', 'j2');
+                    pgv_get_jsonb                    
+-----------------------------------------------------
+ {"foo": [true, "bar"], "tags": {"a": 1, "b": null}}
+(1 row)
+
+COMMIT;
+CREATE TABLE tab (id int, t varchar);
+INSERT INTO tab VALUES (0, 'str00'), (1, 'str33'), (2, NULL), (NULL, 'strNULL');
+BEGIN;
+SELECT pgv_insert('vars3', 'r1', tab, true) FROM tab;
+ pgv_insert 
+------------
+ 
+ 
+ 
+ 
+(4 rows)
+
+SELECT pgv_insert('vars3', 'r2', tab) FROM tab;
+ pgv_insert 
+------------
+ 
+ 
+ 
+ 
+(4 rows)
+
+SAVEPOINT comm;
+SELECT pgv_insert('vars3', 'r1', row(5 :: integer, 'str55' :: varchar),true);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('vars3', 'r2', row(5 :: integer, 'str55' :: varchar));
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('vars3', 'r1');
+ pgv_select 
+------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (5,str55)
+ (0,str00)
+(5 rows)
+
+SELECT pgv_select('vars3', 'r2');
+ pgv_select 
+------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (5,str55)
+ (0,str00)
+(5 rows)
+
+RELEASE comm;
+SELECT pgv_select('vars3', 'r1');
+ pgv_select 
+------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (5,str55)
+ (0,str00)
+(5 rows)
+
+SELECT pgv_select('vars3', 'r2');
+ pgv_select 
+------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (5,str55)
+ (0,str00)
+(5 rows)
+
+COMMIT;
+--CHECK SAVEPOINT ROLLBACK
+BEGIN;
+-- Variables are already declared
+SAVEPOINT comm2;
+-- Set new values
+SELECT pgv_set('vars', 'any1', 'one more value'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT pgv_set('vars', 'any2', 'one more value'::text);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT pgv_set_int('vars', 'int1', 101, true);
+ pgv_set_int 
+-------------
+ 
+(1 row)
+
+SELECT pgv_set_int('vars', 'int2', 102);
+ pgv_set_int 
+-------------
+ 
+(1 row)
+
+SELECT pgv_set_int('vars', 'intNULL', NULL, true);
+ pgv_set_int 
+-------------
+ 
+(1 row)
+
+SELECT pgv_set_text('vars', 'str1', 's101', true);
+ pgv_set_text 
+--------------
+ 
+(1 row)
+
+SELECT pgv_set_text('vars', 'str2', 's102');
+ pgv_set_text 
+--------------
+ 
+(1 row)
+
+SELECT pgv_set_numeric('vars', 'num1', 1.01, true);
+ pgv_set_numeric 
+-----------------
+ 
+(1 row)
+
+SELECT pgv_set_numeric('vars', 'num2', 1.02);
+ pgv_set_numeric 
+-----------------
+ 
+(1 row)
+
+SELECT pgv_set_timestamp('vars', 'ts1', '2016-03-30 10:00:00', true);
+ pgv_set_timestamp 
+-------------------
+ 
+(1 row)
+
+SELECT pgv_set_timestamp('vars', 'ts2', '2016-03-30 11:00:00');
+ pgv_set_timestamp 
+-------------------
+ 
+(1 row)
+
+SELECT pgv_set_timestamptz('vars', 'tstz1', '2016-03-30 10:00:00 GMT+01', true);
+ pgv_set_timestamptz 
+---------------------
+ 
+(1 row)
+
+SELECT pgv_set_timestamptz('vars', 'tstz2', '2016-03-30 11:00:00 GMT+02');
+ pgv_set_timestamptz 
+---------------------
+ 
+(1 row)
+
+SELECT pgv_set_date('vars', 'd1', '2016-03-29', true);
+ pgv_set_date 
+--------------
+ 
+(1 row)
+
+SELECT pgv_set_date('vars', 'd2', '2016-03-30');
+ pgv_set_date 
+--------------
+ 
+(1 row)
+
+SELECT pgv_set_jsonb('vars2', 'j1', '[1, 2, "foo", null]', true);
+ pgv_set_jsonb 
+---------------
+ 
+(1 row)
+
+SELECT pgv_set_jsonb('vars2', 'j2', '{"bar": "baz", "balance": 7.77, "active": false}');
+ pgv_set_jsonb 
+---------------
+ 
+(1 row)
+
+-- Check values before rollback to savepoint
+SELECT pgv_get('vars', 'any1',NULL::text);
+    pgv_get     
+----------------
+ one more value
+(1 row)
+
+SELECT pgv_get('vars', 'any2',NULL::text);
+    pgv_get     
+----------------
+ one more value
+(1 row)
+
+SELECT pgv_get_int('vars', 'int1');
+ pgv_get_int 
+-------------
+         101
+(1 row)
+
+SELECT pgv_get_int('vars', 'int2');
+ pgv_get_int 
+-------------
+         102
+(1 row)
+
+SELECT pgv_get_int('vars', 'intNULL');
+ pgv_get_int 
+-------------
+            
+(1 row)
+
+SELECT pgv_get_text('vars', 'str1');
+ pgv_get_text 
+--------------
+ s101
+(1 row)
+
+SELECT pgv_get_text('vars', 'str2');
+ pgv_get_text 
+--------------
+ s102
+(1 row)
+
+SELECT pgv_get_numeric('vars', 'num1');
+ pgv_get_numeric 
+-----------------
+            1.01
+(1 row)
+
+SELECT pgv_get_numeric('vars', 'num2');
+ pgv_get_numeric 
+-----------------
+            1.02
+(1 row)
+
+SELECT pgv_get_timestamp('vars', 'ts1');
+    pgv_get_timestamp     
+--------------------------
+ Wed Mar 30 10:00:00 2016
+(1 row)
+
+SELECT pgv_get_timestamp('vars', 'ts2');
+    pgv_get_timestamp     
+--------------------------
+ Wed Mar 30 11:00:00 2016
+(1 row)
+
+SELECT pgv_get_timestamptz('vars', 'tstz1');
+     pgv_get_timestamptz      
+------------------------------
+ Wed Mar 30 14:00:00 2016 MSK
+(1 row)
+
+SELECT pgv_get_timestamptz('vars', 'tstz2');
+     pgv_get_timestamptz      
+------------------------------
+ Wed Mar 30 16:00:00 2016 MSK
+(1 row)
+
+SELECT pgv_get_date('vars', 'd1');
+ pgv_get_date 
+--------------
+ 03-29-2016
+(1 row)
+
+SELECT pgv_get_date('vars', 'd2');
+ pgv_get_date 
+--------------
+ 03-30-2016
+(1 row)
+
+SELECT pgv_get_jsonb('vars2', 'j1');
+    pgv_get_jsonb    
+---------------------
+ [1, 2, "foo", null]
+(1 row)
+
+SELECT pgv_get_jsonb('vars2', 'j2');
+                  pgv_get_jsonb                   
+--------------------------------------------------
+ {"bar": "baz", "active": false, "balance": 7.77}
+(1 row)
+
+-- Check values after rollback to savepoint
+ROLLBACK TO comm2;
+SELECT pgv_get('vars', 'any1',NULL::text);
+    pgv_get    
+---------------
+ another value
+(1 row)
+
+SELECT pgv_get('vars', 'any2',NULL::text);
+    pgv_get     
+----------------
+ one more value
+(1 row)
+
+SELECT pgv_get_int('vars', 'int1');
+ pgv_get_int 
+-------------
+         103
+(1 row)
+
+SELECT pgv_get_int('vars', 'int2');
+ pgv_get_int 
+-------------
+         102
+(1 row)
+
+SELECT pgv_get_int('vars', 'intNULL');
+ pgv_get_int 
+-------------
+         104
+(1 row)
+
+SELECT pgv_get_text('vars', 'str1');
+ pgv_get_text 
+--------------
+ s103
+(1 row)
+
+SELECT pgv_get_text('vars', 'str2');
+ pgv_get_text 
+--------------
+ s102
+(1 row)
+
+SELECT pgv_get_numeric('vars', 'num1');
+ pgv_get_numeric 
+-----------------
+            1.03
+(1 row)
+
+SELECT pgv_get_numeric('vars', 'num2');
+ pgv_get_numeric 
+-----------------
+            1.02
+(1 row)
+
+SELECT pgv_get_timestamp('vars', 'ts1');
+    pgv_get_timestamp     
+--------------------------
+ Wed Mar 30 12:00:00 2016
+(1 row)
+
+SELECT pgv_get_timestamp('vars', 'ts2');
+    pgv_get_timestamp     
+--------------------------
+ Wed Mar 30 11:00:00 2016
+(1 row)
+
+SELECT pgv_get_timestamptz('vars', 'tstz1');
+     pgv_get_timestamptz      
+------------------------------
+ Wed Mar 30 18:00:00 2016 MSK
+(1 row)
+
+SELECT pgv_get_timestamptz('vars', 'tstz2');
+     pgv_get_timestamptz      
+------------------------------
+ Wed Mar 30 16:00:00 2016 MSK
+(1 row)
+
+SELECT pgv_get_date('vars', 'd1');
+ pgv_get_date 
+--------------
+ 04-02-2016
+(1 row)
+
+SELECT pgv_get_date('vars', 'd2');
+ pgv_get_date 
+--------------
+ 03-30-2016
+(1 row)
+
+SELECT pgv_get_jsonb('vars2', 'j1');
+                    pgv_get_jsonb                    
+-----------------------------------------------------
+ {"foo": [true, "bar"], "tags": {"a": 1, "b": null}}
+(1 row)
+
+SELECT pgv_get_jsonb('vars2', 'j2');
+                  pgv_get_jsonb                   
+--------------------------------------------------
+ {"bar": "baz", "active": false, "balance": 7.77}
+(1 row)
+
+COMMIT;
+-- Record variables
+BEGIN;
+SAVEPOINT comm2;
+SELECT pgv_delete('vars3', 'r1', 5);
+ pgv_delete 
+------------
+ t
+(1 row)
+
+SELECT pgv_delete('vars3', 'r2', 5);
+ pgv_delete 
+------------
+ t
+(1 row)
+
+SELECT pgv_select('vars3', 'r1');
+ pgv_select 
+------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (0,str00)
+(4 rows)
+
+SELECT pgv_select('vars3', 'r2');
+ pgv_select 
+------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (0,str00)
+(4 rows)
+
+ROLLBACK to comm2;
+SELECT pgv_select('vars3', 'r1');
+ pgv_select 
+------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (5,str55)
+ (0,str00)
+(5 rows)
+
+SELECT pgv_select('vars3', 'r2');
+ pgv_select 
+------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (0,str00)
+(4 rows)
+
+COMMIT;
+-- TRYING TO CHANGE FLAG 'IS_TRANSACTIONAL'
+SELECT pgv_set('vars', 'any1', 'value'::text);
+ERROR:  variable "any1" already created as TRANSACTIONAL
+SELECT pgv_set('vars', 'any2', 'value'::text, true);
+ERROR:  variable "any2" already created as NOT TRANSACTIONAL
+SELECT pgv_set_int('vars', 'int1', 301);
+ERROR:  variable "int1" already created as TRANSACTIONAL
+SELECT pgv_set_int('vars', 'int2', 302, true);
+ERROR:  variable "int2" already created as NOT TRANSACTIONAL
+SELECT pgv_set_text('vars', 'str1', 's301');
+ERROR:  variable "str1" already created as TRANSACTIONAL
+SELECT pgv_set_text('vars', 'str2', 's302', true);
+ERROR:  variable "str2" already created as NOT TRANSACTIONAL
+SELECT pgv_set_numeric('vars', 'num1', 3.01);
+ERROR:  variable "num1" already created as TRANSACTIONAL
+SELECT pgv_set_numeric('vars', 'num2', 3.02, true);
+ERROR:  variable "num2" already created as NOT TRANSACTIONAL
+SELECT pgv_set_timestamp('vars', 'ts1', '2016-03-30 20:00:00');
+ERROR:  variable "ts1" already created as TRANSACTIONAL
+SELECT pgv_set_timestamp('vars', 'ts2', '2016-03-30 21:00:00', true);
+ERROR:  variable "ts2" already created as NOT TRANSACTIONAL
+SELECT pgv_set_timestamptz('vars', 'tstz1', '2016-03-30 20:00:00 GMT+01');
+ERROR:  variable "tstz1" already created as TRANSACTIONAL
+SELECT pgv_set_timestamptz('vars', 'tstz2', '2016-03-30 21:00:00 GMT+02', true);
+ERROR:  variable "tstz2" already created as NOT TRANSACTIONAL
+SELECT pgv_set_date('vars', 'd1', '2016-04-29');
+ERROR:  variable "d1" already created as TRANSACTIONAL
+SELECT pgv_set_date('vars', 'd2', '2016-04-30', true);
+ERROR:  variable "d2" already created as NOT TRANSACTIONAL
+SELECT pgv_set_jsonb('vars2', 'j1', '[1, 2, "foo2", null]');
+ERROR:  variable "j1" already created as TRANSACTIONAL
+SELECT pgv_set_jsonb('vars2', 'j2', '{"bar": "baz2", "balance": 7.77, "active": true}', true);
+ERROR:  variable "j2" already created as NOT TRANSACTIONAL
+SELECT pgv_insert('vars3', 'r1', row(6 :: integer, 'str66' :: varchar));
+ERROR:  variable "r1" already created as TRANSACTIONAL
+SELECT pgv_insert('vars3', 'r2', row(6 :: integer, 'str66' :: varchar),true);
+ERROR:  variable "r2" already created as NOT TRANSACTIONAL
+-- CHECK pgv_list() WHILE WE HAVE A LOT OF MISCELLANEOUS VARIABLES
+SELECT * FROM pgv_list() order by package, name;
+ package |  name   | is_transactional 
+---------+---------+------------------
+ vars    | any1    | t
+ vars    | any2    | f
+ vars    | d1      | t
+ vars    | d2      | f
+ vars    | int1    | t
+ vars    | int2    | f
+ vars    | intNULL | t
+ vars    | num1    | t
+ vars    | num2    | f
+ vars    | str1    | t
+ vars    | str2    | f
+ vars    | ts1     | t
+ vars    | ts2     | f
+ vars    | tstz1   | t
+ vars    | tstz2   | f
+ vars2   | j1      | t
+ vars2   | j2      | f
+ vars3   | r1      | t
+ vars3   | r2      | f
+(19 rows)
+
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+-- VARIABLES DECLARED IN SUBTRANSACTION SHOULD BE DESTROYED AFTER ROLLBACK TO SAVEPOINT
+-- For better readability we don't use deprecated api functions in test below
+BEGIN;
+SAVEPOINT sp_to_rollback;
+SELECT pgv_set('vars', 'any1', 'text value'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT pgv_set('vars', 'any2', 'text value'::text);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT pgv_insert('vars3', 'r1', row(6 :: integer, 'str44' :: varchar), true);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('vars3', 'r2', row(6 :: integer, 'str44' :: varchar));
+ pgv_insert 
+------------
+ 
+(1 row)
+
+ROLLBACK TO sp_to_rollback;
+COMMIT;
+SELECT pgv_get('vars', 'any1',NULL::text);
+ERROR:  unrecognized variable "any1"
+SELECT pgv_get('vars', 'any2',NULL::text);
+  pgv_get   
+------------
+ text value
+(1 row)
+
+SELECT pgv_select('vars3', 'r1');
+ERROR:  unrecognized variable "r1"
+SELECT pgv_select('vars3', 'r2');
+ pgv_select 
+------------
+ (6,str44)
+(1 row)
+
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+-- CHECK ROLLBACK AFTER COMMITTING SUBTRANSACTION
+BEGIN;
+SELECT pgv_set('vars', 'any1', 'before savepoint sp1'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SAVEPOINT sp1;
+SELECT pgv_set('vars', 'any1', 'after savepoint sp1'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SAVEPOINT sp2;
+SELECT pgv_set('vars', 'any1', 'after savepoint sp2'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+RELEASE sp2;
+SELECT pgv_get('vars', 'any1',NULL::text);
+       pgv_get       
+---------------------
+ after savepoint sp2
+(1 row)
+
+ROLLBACK TO sp1;
+SELECT pgv_get('vars', 'any1',NULL::text);
+       pgv_get        
+----------------------
+ before savepoint sp1
+(1 row)
+
+COMMIT;
+BEGIN;
+SAVEPOINT sp1;
+SAVEPOINT sp2;
+SELECT pgv_set('vars2', 'any1', 'variable exists'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+RELEASE sp2;
+SELECT pgv_get('vars2', 'any1',NULL::text);
+     pgv_get     
+-----------------
+ variable exists
+(1 row)
+
+ROLLBACK TO sp1;
+COMMIT;
+SELECT pgv_get('vars2', 'any1',NULL::text);
+ERROR:  unrecognized package "vars2"
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+--CHECK TRANSACTION COMMIT
+-- Declare variables
+SELECT pgv_set('vars', 'any1', 'some value'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT pgv_set('vars', 'any2', 'some value'::text);
+ pgv_set 
+---------
+ 
+(1 row)
+
+BEGIN;
+-- Set new values
+SELECT pgv_set('vars', 'any1', 'another value'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT pgv_set('vars', 'any2', 'another value'::text);
+ pgv_set 
+---------
+ 
+(1 row)
+
+-- Check values before committing transaction
+SELECT pgv_get('vars', 'any1',NULL::text);
+    pgv_get    
+---------------
+ another value
+(1 row)
+
+SELECT pgv_get('vars', 'any2',NULL::text);
+    pgv_get    
+---------------
+ another value
+(1 row)
+
+-- Check values after committing transaction
+COMMIT;
+SELECT pgv_get('vars', 'any1',NULL::text);
+    pgv_get    
+---------------
+ another value
+(1 row)
+
+SELECT pgv_get('vars', 'any2',NULL::text);
+    pgv_get    
+---------------
+ another value
+(1 row)
+
+SELECT pgv_insert('vars3', 'r1', tab, true) FROM tab;
+ pgv_insert 
+------------
+ 
+ 
+ 
+ 
+(4 rows)
+
+SELECT pgv_insert('vars3', 'r2', tab) FROM tab;
+ pgv_insert 
+------------
+ 
+ 
+ 
+ 
+(4 rows)
+
+BEGIN;
+SELECT pgv_insert('vars3', 'r1', row(5 :: integer, 'str55' :: varchar),true);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('vars3', 'r2', row(5 :: integer, 'str55' :: varchar));
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('vars3', 'r1');
+ pgv_select 
+------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (5,str55)
+ (0,str00)
+(5 rows)
+
+SELECT pgv_select('vars3', 'r2');
+ pgv_select 
+------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (5,str55)
+ (0,str00)
+(5 rows)
+
+COMMIT;
+SELECT pgv_select('vars3', 'r1');
+ pgv_select 
+------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (5,str55)
+ (0,str00)
+(5 rows)
+
+SELECT pgv_select('vars3', 'r2');
+ pgv_select 
+------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (5,str55)
+ (0,str00)
+(5 rows)
+
+-- CHECK TRANSACTION ROLLBACK
+-- Variables are already declared
+BEGIN;
+-- Set new values
+SELECT pgv_set('vars', 'any1', 'one more value'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT pgv_set('vars', 'any2', 'one more value'::text);
+ pgv_set 
+---------
+ 
+(1 row)
+
+-- Check values before rollback
+SELECT pgv_get('vars', 'any1',NULL::text);
+    pgv_get     
+----------------
+ one more value
+(1 row)
+
+SELECT pgv_get('vars', 'any2',NULL::text);
+    pgv_get     
+----------------
+ one more value
+(1 row)
+
+-- Check values after rollback
+ROLLBACK;
+SELECT pgv_get('vars', 'any1',NULL::text);
+    pgv_get    
+---------------
+ another value
+(1 row)
+
+SELECT pgv_get('vars', 'any2',NULL::text);
+    pgv_get     
+----------------
+ one more value
+(1 row)
+
+-- Record variables
+BEGIN;
+SELECT pgv_delete('vars3', 'r1', 5);
+ pgv_delete 
+------------
+ t
+(1 row)
+
+SELECT pgv_delete('vars3', 'r2', 5);
+ pgv_delete 
+------------
+ t
+(1 row)
+
+SELECT pgv_select('vars3', 'r1');
+ pgv_select 
+------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (0,str00)
+(4 rows)
+
+SELECT pgv_select('vars3', 'r2');
+ pgv_select 
+------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (0,str00)
+(4 rows)
+
+ROLLBACK;
+SELECT pgv_select('vars3', 'r1');
+ pgv_select 
+------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (5,str55)
+ (0,str00)
+(5 rows)
+
+SELECT pgv_select('vars3', 'r2');
+ pgv_select 
+------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (0,str00)
+(4 rows)
+
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+-- VARIABLES DECLARED IN TRANSACTION SHOULD BE DESTROYED AFTER ROLLBACK
+BEGIN;
+SELECT pgv_set('vars', 'any1', 'text value'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT pgv_set('vars', 'any2', 'text value'::text);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT pgv_insert('vars', 'r1', row(6 :: integer, 'str44' :: varchar), true);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('vars', 'r2', row(6 :: integer, 'str44' :: varchar));
+ pgv_insert 
+------------
+ 
+(1 row)
+
+ROLLBACK;
+SELECT pgv_get('vars', 'any1',NULL::text);
+ERROR:  unrecognized variable "any1"
+SELECT pgv_get('vars', 'any2',NULL::text);
+  pgv_get   
+------------
+ text value
+(1 row)
+
+SELECT pgv_select('vars', 'r1');
+ERROR:  unrecognized variable "r1"
+SELECT pgv_select('vars', 'r2');
+ pgv_select 
+------------
+ (6,str44)
+(1 row)
+
+SELECT pgv_remove('vars');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+-- CHECK ROLLBACK AFTER COMMITTING SUBTRANSACTION
+SELECT pgv_set('vars', 'any1', 'before transaction block'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+BEGIN;
+SELECT pgv_set('vars', 'any1', 'before savepoint sp1'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SAVEPOINT sp1;
+SELECT pgv_set('vars', 'any1', 'after savepoint sp1'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SAVEPOINT sp2;
+SELECT pgv_set('vars', 'any1', 'after savepoint sp2'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+RELEASE sp2;
+SELECT pgv_get('vars', 'any1',NULL::text);
+       pgv_get       
+---------------------
+ after savepoint sp2
+(1 row)
+
+ROLLBACK TO sp1;
+SELECT pgv_get('vars', 'any1',NULL::text);
+       pgv_get        
+----------------------
+ before savepoint sp1
+(1 row)
+
+ROLLBACK;
+SELECT pgv_get('vars', 'any1',NULL::text);
+         pgv_get          
+--------------------------
+ before transaction block
+(1 row)
+
+BEGIN;
+SAVEPOINT sp1;
+SELECT pgv_set('vars2', 'any1', 'variable exists'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+RELEASE sp1;
+SELECT pgv_get('vars2', 'any1',NULL::text);
+     pgv_get     
+-----------------
+ variable exists
+(1 row)
+
+ROLLBACK;
+SELECT pgv_get('vars2', 'any1',NULL::text);
+ERROR:  unrecognized package "vars2"
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+-- Additional tests
+SELECT pgv_insert('vars3', 'r1', tab, true) FROM tab;
+ pgv_insert 
+------------
+ 
+ 
+ 
+ 
+(4 rows)
+
+BEGIN;
+SELECT pgv_insert('vars3', 'r1', row(5 :: integer, 'before savepoint sp1' :: varchar),true);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SAVEPOINT sp1;
+SELECT pgv_update('vars3', 'r1', row(5 :: integer, 'after savepoint sp1' :: varchar));
+ pgv_update 
+------------
+ t
+(1 row)
+
+SAVEPOINT sp2;
+SELECT pgv_insert('vars3', 'r1', row(7 :: integer, 'row after sp2 to remove in sp4' :: varchar),true);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SAVEPOINT sp3;
+SAVEPOINT sp4;
+SELECT pgv_delete('vars3', 'r1', 7);
+ pgv_delete 
+------------
+ t
+(1 row)
+
+SAVEPOINT sp5;
+SELECT pgv_select('vars3', 'r1');
+        pgv_select         
+---------------------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (5,"after savepoint sp1")
+ (0,str00)
+(5 rows)
+
+ROLLBACK TO sp5;
+SELECT pgv_select('vars3', 'r1');
+        pgv_select         
+---------------------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (5,"after savepoint sp1")
+ (0,str00)
+(5 rows)
+
+RELEASE sp4;
+SELECT pgv_select('vars3', 'r1');
+        pgv_select         
+---------------------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (5,"after savepoint sp1")
+ (0,str00)
+(5 rows)
+
+ROLLBACK TO sp3;
+SELECT pgv_select('vars3', 'r1');
+              pgv_select              
+--------------------------------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (5,"after savepoint sp1")
+ (0,str00)
+ (7,"row after sp2 to remove in sp4")
+(6 rows)
+
+RELEASE sp2;
+SELECT pgv_select('vars3', 'r1');
+              pgv_select              
+--------------------------------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (5,"after savepoint sp1")
+ (0,str00)
+ (7,"row after sp2 to remove in sp4")
+(6 rows)
+
+ROLLBACK TO sp1;
+SELECT pgv_select('vars3', 'r1');
+         pgv_select         
+----------------------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (5,"before savepoint sp1")
+ (0,str00)
+(5 rows)
+
+COMMIT;
+SELECT pgv_select('vars3', 'r1');
+         pgv_select         
+----------------------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (5,"before savepoint sp1")
+ (0,str00)
+(5 rows)
+
+SELECT pgv_set('vars', 'any1', 'outer'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+BEGIN;
+SELECT pgv_set('vars', 'any1', 'begin'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SAVEPOINT sp1;
+SELECT pgv_set('vars', 'any1', 'sp1'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SAVEPOINT sp2;
+SELECT pgv_set('vars', 'any1', 'sp2'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SAVEPOINT sp3;
+SAVEPOINT sp4;
+SELECT pgv_set('vars', 'any1', 'sp4'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SAVEPOINT sp5;
+SELECT pgv_get('vars', 'any1',NULL::text);
+ pgv_get 
+---------
+ sp4
+(1 row)
+
+ROLLBACK TO sp5;
+SELECT pgv_get('vars', 'any1',NULL::text);
+ pgv_get 
+---------
+ sp4
+(1 row)
+
+RELEASE sp4;
+SELECT pgv_get('vars', 'any1',NULL::text);
+ pgv_get 
+---------
+ sp4
+(1 row)
+
+ROLLBACK TO sp3;
+SELECT pgv_get('vars', 'any1',NULL::text);
+ pgv_get 
+---------
+ sp2
+(1 row)
+
+RELEASE sp2;
+SELECT pgv_get('vars', 'any1',NULL::text);
+ pgv_get 
+---------
+ sp2
+(1 row)
+
+ROLLBACK TO sp1;
+SELECT pgv_get('vars', 'any1',NULL::text);
+ pgv_get 
+---------
+ begin
+(1 row)
+
+ROLLBACK;
+SELECT pgv_get('vars', 'any1',NULL::text);
+ pgv_get 
+---------
+ outer
+(1 row)
+
+BEGIN;
+SELECT pgv_set('vars', 'any1', 'wrong type'::varchar, true);
+ERROR:  variable "any1" requires "text" value
+COMMIT;
+-- THE REMOVAL OF THE VARIABLE MUST BE CANCELED ON ROLLBACK
+SELECT pgv_set('vars', 'any1', 'variable exists'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+BEGIN;
+SELECT pgv_remove('vars', 'any1');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+SELECT pgv_exists('vars', 'any1');
+ pgv_exists 
+------------
+ f
+(1 row)
+
+ROLLBACK;
+SELECT pgv_exists('vars', 'any1');
+ pgv_exists 
+------------
+ t
+(1 row)
+
+SELECT pgv_get('vars', 'any1',NULL::text);
+     pgv_get     
+-----------------
+ variable exists
+(1 row)
+
+BEGIN;
+SELECT pgv_remove('vars', 'any1');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+SELECT pgv_exists('vars', 'any1');
+ pgv_exists 
+------------
+ f
+(1 row)
+
+COMMIT;
+SELECT pgv_exists('vars', 'any1');
+ pgv_exists 
+------------
+ f
+(1 row)
+
+SELECT pgv_get('vars', 'any1',NULL::text);
+ERROR:  unrecognized package "vars"
+SELECT * FROM pgv_list() ORDER BY package, name;
+ package | name | is_transactional 
+---------+------+------------------
+ vars3   | r1   | t
+(1 row)
+
+BEGIN;
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+ROLLBACK;
+SELECT * FROM pgv_list() ORDER BY package, name;
+ package | name | is_transactional 
+---------+------+------------------
+ vars3   | r1   | t
+(1 row)
+
+BEGIN;
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+COMMIT;
+SELECT * FROM pgv_list() ORDER BY package, name;
+ package | name | is_transactional 
+---------+------+------------------
+(0 rows)
+
+SELECT pgv_set('vars', 'regular', 'regular variable exists'::text);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT pgv_set('vars', 'trans1', 'trans1 variable exists'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+BEGIN;
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+SELECT pgv_free(); -- Check sequential package removal in one subtransaction
+ pgv_free 
+----------
+ 
+(1 row)
+
+SELECT * FROM pgv_list() ORDER BY package, name;
+ package | name | is_transactional 
+---------+------+------------------
+(0 rows)
+
+SELECT pgv_set('vars', 'trans2', 'trans2 variable exists'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT * FROM pgv_list() ORDER BY package, name;
+ package |  name  | is_transactional 
+---------+--------+------------------
+ vars    | trans2 | t
+(1 row)
+
+SELECT pgv_remove('vars');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+SELECT * FROM pgv_list() ORDER BY package, name;
+ package | name | is_transactional 
+---------+------+------------------
+(0 rows)
+
+ROLLBACK;
+SELECT * FROM pgv_list() ORDER BY package, name;
+ package |  name  | is_transactional 
+---------+--------+------------------
+ vars    | trans1 | t
+(1 row)
+
+BEGIN;
+SAVEPOINT sp1;
+SAVEPOINT sp2;
+SAVEPOINT sp3;
+SELECT pgv_set('vars2', 'trans2', 'trans2 variable exists'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SAVEPOINT sp4;
+SAVEPOINT sp5;
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+SELECT package FROM pgv_stats() ORDER BY package;
+ package 
+---------
+ vars
+ vars2
+(2 rows)
+
+SELECT * FROM pgv_list() ORDER BY package, name;
+ package | name | is_transactional 
+---------+------+------------------
+(0 rows)
+
+RELEASE sp5;
+SELECT package FROM pgv_stats() ORDER BY package;
+ package 
+---------
+ vars
+ vars2
+(2 rows)
+
+SELECT * FROM pgv_list() ORDER BY package, name;
+ package | name | is_transactional 
+---------+------+------------------
+(0 rows)
+
+RELEASE sp4;
+SELECT package FROM pgv_stats() ORDER BY package;
+ package 
+---------
+ vars
+ vars2
+(2 rows)
+
+SELECT * FROM pgv_list() ORDER BY package, name;
+ package | name | is_transactional 
+---------+------+------------------
+(0 rows)
+
+COMMIT;
+SELECT package FROM pgv_stats() ORDER BY package;
+ package 
+---------
+(0 rows)
+
+BEGIN;
+SELECT pgv_set('vars', 'trans1', 'package created'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT pgv_remove('vars');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+SELECT * FROM pgv_list() ORDER BY package, name;
+ package | name | is_transactional 
+---------+------+------------------
+(0 rows)
+
+SELECT pgv_set('vars', 'trans1', 'package restored'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT * FROM pgv_list() ORDER BY package, name;
+ package |  name  | is_transactional 
+---------+--------+------------------
+ vars    | trans1 | t
+(1 row)
+
+COMMIT;
+SELECT pgv_remove('vars');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+-- REMOVED TRANSACTIONAL VARIABLE SHOULD BE NOT ACCESSIBLE THROUGH LastVariable
+SELECT pgv_insert('package', 'errs',row(n), true)
+FROM generate_series(1,5) AS gs(n) WHERE 1.0/(n-3)<>0;
+ERROR:  division by zero
+SELECT pgv_insert('package', 'errs',row(1), true);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+-- Variable should not exists in case when error occurs during creation
+SELECT pgv_insert('vars4', 'r1', row('str1', 'str1'));
+ERROR:  could not identify a hash function for type unknown
+SELECT pgv_select('vars4', 'r1', 0);
+ERROR:  unrecognized package "vars4"
+-- If variable created and removed in same transaction level,
+-- it should be totally removed and should not be present
+-- in changes list and cache.
+BEGIN;
+SELECT pgv_set('vars', 'any1', 'some value'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SAVEPOINT comm;
+SELECT pgv_remove('vars', 'any1');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+RELEASE comm;
+SELECT pgv_get('vars', 'any1',NULL::text);
+ERROR:  unrecognized package "vars"
+COMMIT;
+-- Tests for PGPRO-2440
+SELECT pgv_insert('vars3', 'r3', row(1 :: integer, NULL::varchar), true);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+SELECT pgv_insert('vars3', 'r3', row(2 :: integer, NULL::varchar), true);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SAVEPOINT comm;
+SELECT pgv_insert('vars3', 'r3', row(3 :: integer, NULL::varchar), true);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+COMMIT;
+SELECT pgv_delete('vars3', 'r3', 3);
+ pgv_delete 
+------------
+ t
+(1 row)
+
+BEGIN;
+SELECT pgv_set('vars1', 't1', ''::text);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT pgv_set('vars2', 't2', ''::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SAVEPOINT sp1;
+SAVEPOINT sp2;
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+ERROR;
+ERROR:  syntax error at or near "ERROR"
+LINE 1: ERROR;
+        ^
+COMMIT;
+BEGIN;
+SELECT pgv_set('vars', 'any1', 'some value'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+SAVEPOINT sp_to_rollback;
+SELECT pgv_set('vars', 'any1', 'some value'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+ROLLBACK TO sp_to_rollback;
+COMMIT;
+SELECT package FROM pgv_stats() ORDER BY package;
+ package 
+---------
+(0 rows)
+
+-- Package should exist after rollback if it contains regular variable
+BEGIN;
+SELECT pgv_set('vars', 'any1', 'some value'::text);
+ pgv_set 
+---------
+ 
+(1 row)
+
+ROLLBACK;
+SELECT package FROM pgv_stats() ORDER BY package;
+ package 
+---------
+ vars
+(1 row)
+
+-- Package should not exist if it becomes empty in rolled back transaction
+BEGIN;
+SAVEPOINT comm2;
+SELECT pgv_remove('vars');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+ROLLBACK TO comm2;
+SELECT pgv_exists('vars');
+ pgv_exists 
+------------
+ f
+(1 row)
+
+SELECT package FROM pgv_stats() ORDER BY package;
+ package 
+---------
+ vars
+(1 row)
+
+COMMIT;
+SELECT package FROM pgv_stats() ORDER BY package;
+ package 
+---------
+(0 rows)
+
+SELECT pgv_set('vars', 'any1', 'some value'::text);
+ pgv_set 
+---------
+ 
+(1 row)
+
+BEGIN;
+SELECT pgv_remove('vars');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+ROLLBACK;
+SELECT package FROM pgv_stats() ORDER BY package;
+ package 
+---------
+(0 rows)
+
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+-- Variables should be insertable after pgv_remove (variable)
+BEGIN;
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_remove('test', 'x');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'x', ROW (1::int, 3::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,3)
+(1 row)
+
+SELECT pgv_insert('test', 'x', ROW (2::int, 4::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,3)
+ (2,4)
+(2 rows)
+
+ROLLBACK;
+SELECT * FROM pgv_list() order by package, name;
+ package | name | is_transactional 
+---------+------+------------------
+(0 rows)
+
+BEGIN;
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_remove('test', 'x');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'x', ROW (1::int, 3::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,3)
+(1 row)
+
+SELECT pgv_insert('test', 'x', ROW (2::int, 4::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,3)
+ (2,4)
+(2 rows)
+
+COMMIT;
+SELECT * FROM pgv_list() order by package, name;
+ package | name | is_transactional 
+---------+------+------------------
+ test    | x    | t
+(1 row)
+
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,3)
+ (2,4)
+(2 rows)
+
+-- Variables should be insertable after pgv_remove (package)
+BEGIN;
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'y');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_remove('test');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'y', ROW (1::int, 3::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'y');
+ pgv_select 
+------------
+ (1,3)
+(1 row)
+
+SELECT pgv_insert('test', 'y', ROW (2::int, 4::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'y');
+ pgv_select 
+------------
+ (1,3)
+ (2,4)
+(2 rows)
+
+ROLLBACK;
+SELECT * FROM pgv_list() order by package, name;
+ package | name | is_transactional 
+---------+------+------------------
+ test    | x    | t
+(1 row)
+
+BEGIN;
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'y');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_remove('test');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'y', ROW (1::int, 3::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'y');
+ pgv_select 
+------------
+ (1,3)
+(1 row)
+
+SELECT pgv_insert('test', 'y', ROW (2::int, 4::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'y');
+ pgv_select 
+------------
+ (1,3)
+ (2,4)
+(2 rows)
+
+COMMIT;
+SELECT * FROM pgv_list() order by package, name;
+ package | name | is_transactional 
+---------+------+------------------
+ test    | y    | t
+(1 row)
+
+SELECT pgv_select('test', 'y');
+ pgv_select 
+------------
+ (1,3)
+ (2,4)
+(2 rows)
+
+-- Variables should be insertable after pgv_free
+BEGIN;
+SELECT pgv_insert('test', 'z', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'z');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'z', ROW (1::int, 3::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'z');
+ pgv_select 
+------------
+ (1,3)
+(1 row)
+
+SELECT pgv_insert('test', 'z', ROW (2::int, 4::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'z');
+ pgv_select 
+------------
+ (1,3)
+ (2,4)
+(2 rows)
+
+ROLLBACK;
+SELECT * FROM pgv_list() order by package, name;
+ package | name | is_transactional 
+---------+------+------------------
+ test    | y    | t
+(1 row)
+
+BEGIN;
+SELECT pgv_insert('test', 'z', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'z');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'z', ROW (1::int, 3::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'z');
+ pgv_select 
+------------
+ (1,3)
+(1 row)
+
+SELECT pgv_insert('test', 'z', ROW (2::int, 4::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'z');
+ pgv_select 
+------------
+ (1,3)
+ (2,4)
+(2 rows)
+
+COMMIT;
+SELECT * FROM pgv_list() order by package, name;
+ package | name | is_transactional 
+---------+------+------------------
+ test    | z    | t
+(1 row)
+
+SELECT pgv_select('test', 'z');
+ pgv_select 
+------------
+ (1,3)
+ (2,4)
+(2 rows)
+
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+-- Variables should be rollbackable if transactional
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'x', ROW (2::int, 3::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+BEGIN;
+SELECT pgv_remove('test', 'x');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+BEGIN;
+SELECT pgv_remove('test');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+BEGIN;
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+---
+--- Variables should not be rollbackable if not transactional
+---
+-- case 1 (remove var)
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'y', ROW (2::int, 3::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'y');
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+BEGIN;
+SELECT pgv_remove('test', 'y');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+ROLLBACK;
+SELECT pgv_select('test', 'y');
+ERROR:  unrecognized variable "y"
+-- case 2 (remove pack)
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'y', ROW (2::int, 3::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'y');
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+BEGIN;
+SELECT pgv_remove('test');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+ROLLBACK;
+SELECT pgv_select('test', 'y');
+ERROR:  unrecognized variable "y"
+-- case 3 (free)
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'y', ROW (2::int, 3::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'y');
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+BEGIN;
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+ROLLBACK;
+SELECT pgv_select('test', 'y');
+ERROR:  unrecognized variable "y"
+-- clear all
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+---
+--- Cursors test #1 (remove var)
+---
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+SELECT pgv_remove('test', 'x');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'y');
+SELECT pgv_remove('test', 'y');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized variable "y"
+ROLLBACK;
+SELECT pgv_select('test', 'y');
+ERROR:  unrecognized variable "y"
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+---
+--- Cursors test #2 (remove pack)
+---
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+SELECT pgv_remove('test');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'y');
+SELECT pgv_remove('test');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test');
+ERROR:  function pgv_select(unknown) does not exist
+LINE 1: SELECT pgv_select('test');
+               ^
+HINT:  No function matches the given name and argument types. You might need to add explicit type casts.
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+---
+--- Cursors test #3 (free)
+---
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'y');
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test');
+ERROR:  function pgv_select(unknown) does not exist
+LINE 1: SELECT pgv_select('test');
+               ^
+HINT:  No function matches the given name and argument types. You might need to add explicit type casts.
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+---
+--- Cursor test #4
+---
+-- non transactional, remove var
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+SELECT pgv_remove('test', 'x');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ERROR:  unrecognized package "test"
+-- non transactional, remove pac
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+SELECT pgv_remove('test');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ERROR:  unrecognized package "test"
+-- non transactional, free
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ERROR:  unrecognized package "test"
+-- transactional, remove var
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'y');
+SELECT pgv_remove('test', 'y');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'y');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+-- transactional, remove pack
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'y');
+SELECT pgv_remove('test');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'y');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+-- transactional, free
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'y');
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'y');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+---
+--- Cursor test #5
+---
+-- non transactional
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+CLOSE r1_cur;
+SELECT pgv_remove('test', 'x');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ERROR:  unrecognized package "test"
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+CLOSE r1_cur;
+SELECT pgv_remove('test');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ERROR:  unrecognized package "test"
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+CLOSE r1_cur;
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ERROR:  unrecognized package "test"
+-- transactional
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_remove('test', 'x');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_remove('test');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+---
+--- Cursor test #6
+---
+--SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), TRUE);
+--BEGIN;
+--DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+--FETCH 1 in r1_cur;
+--CLOSE r1_cur;
+--SELECT pgv_remove('test', 'x');
+--COMMIT;
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+---
+--- Tests for "leaked hash_seq_search scan for hash table"
+---
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'x', ROW (2::int, 3::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'x', ROW (3::int, 4::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'x') LIMIT 1;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_select('test', 'x') LIMIT 2;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+SELECT pgv_select('test', 'x') LIMIT 3;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+BEGIN;
+SELECT pgv_select('test', 'x') LIMIT 1;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_select('test', 'x') LIMIT 2;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+SELECT pgv_select('test', 'x') LIMIT 3;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+ROLLBACK;
+BEGIN;
+SELECT pgv_select('test', 'x') LIMIT 1;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_select('test', 'x') LIMIT 2;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+SELECT pgv_select('test', 'x') LIMIT 3;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+COMMIT;
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'y', ROW (2::int, 3::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'y', ROW (3::int, 4::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'y') LIMIT 1;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_select('test', 'y') LIMIT 2;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+SELECT pgv_select('test', 'y') LIMIT 3;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+BEGIN;
+SELECT pgv_select('test', 'y') LIMIT 1;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_select('test', 'y') LIMIT 2;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+SELECT pgv_select('test', 'y') LIMIT 3;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+ROLLBACK;
+BEGIN;
+SELECT pgv_select('test', 'y') LIMIT 1;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_select('test', 'y') LIMIT 2;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+SELECT pgv_select('test', 'y') LIMIT 3;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+COMMIT;
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+DECLARE r2_cur CURSOR FOR SELECT pgv_select('test', 'y');
+DECLARE r3_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+FETCH 1 in r2_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+FETCH 1 in r3_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+ROLLBACK;
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+DECLARE r2_cur CURSOR FOR SELECT pgv_select('test', 'y');
+DECLARE r3_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 2 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+FETCH 2 in r2_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+FETCH 2 in r3_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+ROLLBACK;
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+DECLARE r2_cur CURSOR FOR SELECT pgv_select('test', 'y');
+DECLARE r3_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 3 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+FETCH 3 in r2_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+FETCH 3 in r3_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+ROLLBACK;
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+DECLARE r2_cur CURSOR FOR SELECT pgv_select('test', 'y');
+DECLARE r3_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+FETCH 1 in r2_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+FETCH 1 in r3_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+COMMIT;
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+DECLARE r2_cur CURSOR FOR SELECT pgv_select('test', 'y');
+DECLARE r3_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 2 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+FETCH 2 in r2_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+FETCH 2 in r3_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+COMMIT;
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+DECLARE r2_cur CURSOR FOR SELECT pgv_select('test', 'y');
+DECLARE r3_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 3 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+FETCH 3 in r2_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+FETCH 3 in r3_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+COMMIT;
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+DECLARE r2_cur CURSOR FOR SELECT pgv_select('test', 'y');
+DECLARE r3_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+FETCH 2 in r2_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+FETCH 3 in r3_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+ROLLBACK;
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+DECLARE r2_cur CURSOR FOR SELECT pgv_select('test', 'y');
+DECLARE r3_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+FETCH 2 in r2_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+FETCH 3 in r3_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+COMMIT;
+---
+--- Some special cases
+---
+-- take #1
+SELECT pgv_insert('test', 'z1', ROW (2::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'z1');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (2,2)
+(1 row)
+
+SELECT pgv_remove('test', 'z1');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized variable "z1"
+ROLLBACK;
+SELECT pgv_select('test', 'z1');
+ pgv_select 
+------------
+ (2,2)
+(1 row)
+
+-- take #2
+SELECT pgv_insert('test', 'z2', ROW (2::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'z2');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (2,2)
+(1 row)
+
+CLOSE r1_cur;
+SELECT pgv_remove('test', 'z2');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  cursor "r1_cur" does not exist
+ROLLBACK;
+SELECT pgv_select('test', 'z2');
+ERROR:  unrecognized variable "z2"
+SELECT pgv_insert('test', 'z2', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+-- take #3
+SELECT pgv_insert('test', 'z3', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'z3');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+CLOSE r1_cur;
+SELECT pgv_remove('test', 'z3');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  cursor "r1_cur" does not exist
+ROLLBACK;
+SELECT pgv_select('test', 'z3');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+--BEGIN;
+--DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'z3');
+--FETCH 1 in r1_cur;
+--SELECT pgv_remove('test', 'z3');
+--COMMIT;
+--SELECT pgv_select('test', 'z3');
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+-- take #4
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'x', ROW (2::int, 3::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+SAVEPOINT sp1;
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+ROLLBACK TO SAVEPOINT sp1;
+COMMIT;
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+SAVEPOINT sp1;
+FETCH 2 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+ROLLBACK TO SAVEPOINT sp1;
+COMMIT;
+BEGIN;
+SAVEPOINT sp1;
+SELECT pgv_select('test', 'x') LIMIT 1;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+ROLLBACK TO SAVEPOINT sp1;
+COMMIT;
+---
+--- Test cases for pgv_stats
+---
+SELECT pgv_insert('test1', 'y', ROW (2::float, 1::float), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test1', 'x', ROW (2::float, 1::float), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+FETCH 1 in r1_cur;
+ pgv_stats 
+-----------
+ (test,0)
+(1 row)
+
+FETCH 1 in r2_cur;
+ pgv_stats 
+-----------
+ (test,0)
+(1 row)
+
+COMMIT;
+SELECT pgv_insert('test1', 'y', ROW (2::float, 1::float), TRUE);
+ERROR:  there is a record in the variable "y" with same key
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+FETCH 1 in r1_cur;
+ pgv_stats 
+-----------
+ (test,0)
+(1 row)
+
+FETCH 1 in r2_cur;
+ pgv_stats 
+-----------
+ (test,0)
+(1 row)
+
+ROLLBACK;
+SELECT pgv_insert('test1', 'y', ROW (2::float, 1::float), FALSE);
+ERROR:  variable "y" already created as TRANSACTIONAL
+SELECT pgv_insert('test1', 'y', ROW (2::float, 1::float), FALSE);
+ERROR:  variable "y" already created as TRANSACTIONAL
+SELECT pgv_insert('test1', 'x', ROW (2::float, 1::float), FALSE);
+ERROR:  variable "x" already created as TRANSACTIONAL
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+FETCH 1 in r1_cur;
+ pgv_stats 
+-----------
+ (test,0)
+(1 row)
+
+FETCH 1 in r2_cur;
+ pgv_stats 
+-----------
+ (test,0)
+(1 row)
+
+COMMIT;
+SELECT pgv_insert('test1', 'y', ROW (2::float, 1::float), FALSE);
+ERROR:  variable "y" already created as TRANSACTIONAL
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+FETCH 1 in r1_cur;
+ pgv_stats 
+-----------
+ (test,0)
+(1 row)
+
+FETCH 1 in r2_cur;
+ pgv_stats 
+-----------
+ (test,0)
+(1 row)
+
+ROLLBACK;
+SELECT pgv_insert('test1', 'y', ROW (2::float, 1::float), FALSE);
+ERROR:  variable "y" already created as TRANSACTIONAL
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+---
+--- Some special cases
+---
+-- 1
+BEGIN;
+SAVEPOINT comm2;
+SELECT pgv_insert('test', 'x1', ROW (2::float, 1::float), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+FETCH 1 in r1_cur;
+ pgv_stats 
+-----------
+ (test,0)
+(1 row)
+
+FETCH 1 in r2_cur;
+ pgv_stats 
+-----------
+ (test,0)
+(1 row)
+
+COMMIT;
+-- 2
+BEGIN;
+SELECT pgv_insert('test', 'x2', ROW (2::float, 1::float), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SAVEPOINT comm2;
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+FETCH 1 in r1_cur;
+ pgv_stats 
+-----------
+ (test,0)
+(1 row)
+
+FETCH 1 in r2_cur;
+ pgv_stats 
+-----------
+ (test,0)
+(1 row)
+
+COMMIT;
+-- 3
+BEGIN;
+SELECT pgv_insert('test', 'x3', ROW (2::float, 1::float), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+SAVEPOINT comm2;
+FETCH 1 in r1_cur;
+ pgv_stats 
+-----------
+ (test,0)
+(1 row)
+
+FETCH 1 in r2_cur;
+ pgv_stats 
+-----------
+ (test,0)
+(1 row)
+
+COMMIT;
+-- 4
+BEGIN;
+SELECT pgv_insert('test', 'x4', ROW (2::float, 1::float), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+FETCH 1 in r1_cur;
+ pgv_stats 
+-----------
+ (test,0)
+(1 row)
+
+SAVEPOINT comm2;
+FETCH 1 in r2_cur;
+ pgv_stats 
+-----------
+ (test,0)
+(1 row)
+
+COMMIT;
+-- 5
+BEGIN;
+SELECT pgv_insert('test', 'x5', ROW (2::float, 1::float), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+FETCH 1 in r1_cur;
+ pgv_stats 
+-----------
+ (test,0)
+(1 row)
+
+FETCH 1 in r2_cur;
+ pgv_stats 
+-----------
+ (test,0)
+(1 row)
+
+SAVEPOINT comm2;
+COMMIT;
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
diff --git a/expected/pg_variables_trans_2.out b/expected/pg_variables_trans_2.out
new file mode 100644
index 0000000..a07ad7d
--- /dev/null
+++ b/expected/pg_variables_trans_2.out
@@ -0,0 +1,3764 @@
+SET timezone = 'Europe/Moscow'; -- Need to proper output of datetime variables
+--CHECK SAVEPOINT RELEASE
+BEGIN;
+-- Declare variables
+SELECT pgv_set('vars', 'any1', 'some value'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT pgv_set('vars', 'any2', 'some value'::text);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT pgv_set_int('vars', 'int1', 101, true);
+ pgv_set_int 
+-------------
+ 
+(1 row)
+
+SELECT pgv_set_int('vars', 'int2', 102);
+ pgv_set_int 
+-------------
+ 
+(1 row)
+
+SELECT pgv_set_int('vars', 'intNULL', NULL, true);
+ pgv_set_int 
+-------------
+ 
+(1 row)
+
+SELECT pgv_set_text('vars', 'str1', 's101', true);
+ pgv_set_text 
+--------------
+ 
+(1 row)
+
+SELECT pgv_set_text('vars', 'str2', 's102');
+ pgv_set_text 
+--------------
+ 
+(1 row)
+
+SELECT pgv_set_numeric('vars', 'num1', 1.01, true);
+ pgv_set_numeric 
+-----------------
+ 
+(1 row)
+
+SELECT pgv_set_numeric('vars', 'num2', 1.02);
+ pgv_set_numeric 
+-----------------
+ 
+(1 row)
+
+SELECT pgv_set_timestamp('vars', 'ts1', '2016-03-30 10:00:00', true);
+ pgv_set_timestamp 
+-------------------
+ 
+(1 row)
+
+SELECT pgv_set_timestamp('vars', 'ts2', '2016-03-30 11:00:00');
+ pgv_set_timestamp 
+-------------------
+ 
+(1 row)
+
+SELECT pgv_set_timestamptz('vars', 'tstz1', '2016-03-30 10:00:00 GMT+01', true);
+ pgv_set_timestamptz 
+---------------------
+ 
+(1 row)
+
+SELECT pgv_set_timestamptz('vars', 'tstz2', '2016-03-30 11:00:00 GMT+02');
+ pgv_set_timestamptz 
+---------------------
+ 
+(1 row)
+
+SELECT pgv_set_date('vars', 'd1', '2016-03-29', true);
+ pgv_set_date 
+--------------
+ 
+(1 row)
+
+SELECT pgv_set_date('vars', 'd2', '2016-03-30');
+ pgv_set_date 
+--------------
+ 
+(1 row)
+
+SELECT pgv_set_jsonb('vars2', 'j1', '[1, 2, "foo", null]', true);
+ pgv_set_jsonb 
+---------------
+ 
+(1 row)
+
+SELECT pgv_set_jsonb('vars2', 'j2', '{"bar": "baz", "balance": 7.77, "active": false}');
+ pgv_set_jsonb 
+---------------
+ 
+(1 row)
+
+SAVEPOINT comm;
+-- Set new values
+SELECT pgv_set('vars', 'any1', 'another value'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT pgv_set('vars', 'any2', 'another value'::text);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT pgv_set_int('vars', 'int1', 103, true);
+ pgv_set_int 
+-------------
+ 
+(1 row)
+
+SELECT pgv_set_int('vars', 'int2', 103);
+ pgv_set_int 
+-------------
+ 
+(1 row)
+
+SELECT pgv_set_int('vars', 'intNULL', 104, true);
+ pgv_set_int 
+-------------
+ 
+(1 row)
+
+SELECT pgv_set_text('vars', 'str1', 's103', true);
+ pgv_set_text 
+--------------
+ 
+(1 row)
+
+SELECT pgv_set_text('vars', 'str2', 's103');
+ pgv_set_text 
+--------------
+ 
+(1 row)
+
+SELECT pgv_set_numeric('vars', 'num1', 1.03, true);
+ pgv_set_numeric 
+-----------------
+ 
+(1 row)
+
+SELECT pgv_set_numeric('vars', 'num2', 1.03);
+ pgv_set_numeric 
+-----------------
+ 
+(1 row)
+
+SELECT pgv_set_timestamp('vars', 'ts1', '2016-03-30 12:00:00', true);
+ pgv_set_timestamp 
+-------------------
+ 
+(1 row)
+
+SELECT pgv_set_timestamp('vars', 'ts2', '2016-03-30 12:00:00');
+ pgv_set_timestamp 
+-------------------
+ 
+(1 row)
+
+SELECT pgv_set_timestamptz('vars', 'tstz1', '2016-03-30 12:00:00 GMT+03', true);
+ pgv_set_timestamptz 
+---------------------
+ 
+(1 row)
+
+SELECT pgv_set_timestamptz('vars', 'tstz2', '2016-03-30 12:00:00 GMT+03');
+ pgv_set_timestamptz 
+---------------------
+ 
+(1 row)
+
+SELECT pgv_set_date('vars', 'd1', '2016-04-02', true);
+ pgv_set_date 
+--------------
+ 
+(1 row)
+
+SELECT pgv_set_date('vars', 'd2', '2016-04-02');
+ pgv_set_date 
+--------------
+ 
+(1 row)
+
+SELECT pgv_set_jsonb('vars2', 'j1', '{"foo": [true, "bar"], "tags": {"a": 1, "b": null}}', true);
+ pgv_set_jsonb 
+---------------
+ 
+(1 row)
+
+SELECT pgv_set_jsonb('vars2', 'j2', '{"foo": [true, "bar"], "tags": {"a": 1, "b": null}}');
+ pgv_set_jsonb 
+---------------
+ 
+(1 row)
+
+-- Check values before releasing savepoint
+SELECT pgv_get('vars', 'any1',NULL::text);
+    pgv_get    
+---------------
+ another value
+(1 row)
+
+SELECT pgv_get('vars', 'any2',NULL::text);
+    pgv_get    
+---------------
+ another value
+(1 row)
+
+SELECT pgv_get_int('vars', 'int1');
+ pgv_get_int 
+-------------
+         103
+(1 row)
+
+SELECT pgv_get_int('vars', 'int2');
+ pgv_get_int 
+-------------
+         103
+(1 row)
+
+SELECT pgv_get_int('vars', 'intNULL');
+ pgv_get_int 
+-------------
+         104
+(1 row)
+
+SELECT pgv_get_text('vars', 'str1');
+ pgv_get_text 
+--------------
+ s103
+(1 row)
+
+SELECT pgv_get_text('vars', 'str2');
+ pgv_get_text 
+--------------
+ s103
+(1 row)
+
+SELECT pgv_get_numeric('vars', 'num1');
+ pgv_get_numeric 
+-----------------
+            1.03
+(1 row)
+
+SELECT pgv_get_numeric('vars', 'num2');
+ pgv_get_numeric 
+-----------------
+            1.03
+(1 row)
+
+SELECT pgv_get_timestamp('vars', 'ts1');
+    pgv_get_timestamp     
+--------------------------
+ Wed Mar 30 12:00:00 2016
+(1 row)
+
+SELECT pgv_get_timestamp('vars', 'ts2');
+    pgv_get_timestamp     
+--------------------------
+ Wed Mar 30 12:00:00 2016
+(1 row)
+
+SELECT pgv_get_timestamptz('vars', 'tstz1');
+     pgv_get_timestamptz      
+------------------------------
+ Wed Mar 30 18:00:00 2016 MSK
+(1 row)
+
+SELECT pgv_get_timestamptz('vars', 'tstz2');
+     pgv_get_timestamptz      
+------------------------------
+ Wed Mar 30 18:00:00 2016 MSK
+(1 row)
+
+SELECT pgv_get_date('vars', 'd1');
+ pgv_get_date 
+--------------
+ 04-02-2016
+(1 row)
+
+SELECT pgv_get_date('vars', 'd2');
+ pgv_get_date 
+--------------
+ 04-02-2016
+(1 row)
+
+SELECT pgv_get_jsonb('vars2', 'j1');
+                    pgv_get_jsonb                    
+-----------------------------------------------------
+ {"foo": [true, "bar"], "tags": {"a": 1, "b": null}}
+(1 row)
+
+SELECT pgv_get_jsonb('vars2', 'j2');
+                    pgv_get_jsonb                    
+-----------------------------------------------------
+ {"foo": [true, "bar"], "tags": {"a": 1, "b": null}}
+(1 row)
+
+-- Check values after releasing savepoint
+RELEASE comm;
+SELECT pgv_get('vars', 'any1',NULL::text);
+    pgv_get    
+---------------
+ another value
+(1 row)
+
+SELECT pgv_get('vars', 'any2',NULL::text);
+    pgv_get    
+---------------
+ another value
+(1 row)
+
+SELECT pgv_get_int('vars', 'int1');
+ pgv_get_int 
+-------------
+         103
+(1 row)
+
+SELECT pgv_get_int('vars', 'int2');
+ pgv_get_int 
+-------------
+         103
+(1 row)
+
+SELECT pgv_get_int('vars', 'intNULL');
+ pgv_get_int 
+-------------
+         104
+(1 row)
+
+SELECT pgv_get_text('vars', 'str1');
+ pgv_get_text 
+--------------
+ s103
+(1 row)
+
+SELECT pgv_get_text('vars', 'str2');
+ pgv_get_text 
+--------------
+ s103
+(1 row)
+
+SELECT pgv_get_numeric('vars', 'num1');
+ pgv_get_numeric 
+-----------------
+            1.03
+(1 row)
+
+SELECT pgv_get_numeric('vars', 'num2');
+ pgv_get_numeric 
+-----------------
+            1.03
+(1 row)
+
+SELECT pgv_get_timestamp('vars', 'ts1');
+    pgv_get_timestamp     
+--------------------------
+ Wed Mar 30 12:00:00 2016
+(1 row)
+
+SELECT pgv_get_timestamp('vars', 'ts2');
+    pgv_get_timestamp     
+--------------------------
+ Wed Mar 30 12:00:00 2016
+(1 row)
+
+SELECT pgv_get_timestamptz('vars', 'tstz1');
+     pgv_get_timestamptz      
+------------------------------
+ Wed Mar 30 18:00:00 2016 MSK
+(1 row)
+
+SELECT pgv_get_timestamptz('vars', 'tstz2');
+     pgv_get_timestamptz      
+------------------------------
+ Wed Mar 30 18:00:00 2016 MSK
+(1 row)
+
+SELECT pgv_get_date('vars', 'd1');
+ pgv_get_date 
+--------------
+ 04-02-2016
+(1 row)
+
+SELECT pgv_get_date('vars', 'd2');
+ pgv_get_date 
+--------------
+ 04-02-2016
+(1 row)
+
+SELECT pgv_get_jsonb('vars2', 'j1');
+                    pgv_get_jsonb                    
+-----------------------------------------------------
+ {"foo": [true, "bar"], "tags": {"a": 1, "b": null}}
+(1 row)
+
+SELECT pgv_get_jsonb('vars2', 'j2');
+                    pgv_get_jsonb                    
+-----------------------------------------------------
+ {"foo": [true, "bar"], "tags": {"a": 1, "b": null}}
+(1 row)
+
+COMMIT;
+CREATE TABLE tab (id int, t varchar);
+INSERT INTO tab VALUES (0, 'str00'), (1, 'str33'), (2, NULL), (NULL, 'strNULL');
+BEGIN;
+SELECT pgv_insert('vars3', 'r1', tab, true) FROM tab;
+ pgv_insert 
+------------
+ 
+ 
+ 
+ 
+(4 rows)
+
+SELECT pgv_insert('vars3', 'r2', tab) FROM tab;
+ pgv_insert 
+------------
+ 
+ 
+ 
+ 
+(4 rows)
+
+SAVEPOINT comm;
+SELECT pgv_insert('vars3', 'r1', row(5 :: integer, 'str55' :: varchar),true);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('vars3', 'r2', row(5 :: integer, 'str55' :: varchar));
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('vars3', 'r1');
+ pgv_select 
+------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (5,str55)
+ (0,str00)
+(5 rows)
+
+SELECT pgv_select('vars3', 'r2');
+ pgv_select 
+------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (5,str55)
+ (0,str00)
+(5 rows)
+
+RELEASE comm;
+SELECT pgv_select('vars3', 'r1');
+ pgv_select 
+------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (5,str55)
+ (0,str00)
+(5 rows)
+
+SELECT pgv_select('vars3', 'r2');
+ pgv_select 
+------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (5,str55)
+ (0,str00)
+(5 rows)
+
+COMMIT;
+--CHECK SAVEPOINT ROLLBACK
+BEGIN;
+-- Variables are already declared
+SAVEPOINT comm2;
+-- Set new values
+SELECT pgv_set('vars', 'any1', 'one more value'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT pgv_set('vars', 'any2', 'one more value'::text);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT pgv_set_int('vars', 'int1', 101, true);
+ pgv_set_int 
+-------------
+ 
+(1 row)
+
+SELECT pgv_set_int('vars', 'int2', 102);
+ pgv_set_int 
+-------------
+ 
+(1 row)
+
+SELECT pgv_set_int('vars', 'intNULL', NULL, true);
+ pgv_set_int 
+-------------
+ 
+(1 row)
+
+SELECT pgv_set_text('vars', 'str1', 's101', true);
+ pgv_set_text 
+--------------
+ 
+(1 row)
+
+SELECT pgv_set_text('vars', 'str2', 's102');
+ pgv_set_text 
+--------------
+ 
+(1 row)
+
+SELECT pgv_set_numeric('vars', 'num1', 1.01, true);
+ pgv_set_numeric 
+-----------------
+ 
+(1 row)
+
+SELECT pgv_set_numeric('vars', 'num2', 1.02);
+ pgv_set_numeric 
+-----------------
+ 
+(1 row)
+
+SELECT pgv_set_timestamp('vars', 'ts1', '2016-03-30 10:00:00', true);
+ pgv_set_timestamp 
+-------------------
+ 
+(1 row)
+
+SELECT pgv_set_timestamp('vars', 'ts2', '2016-03-30 11:00:00');
+ pgv_set_timestamp 
+-------------------
+ 
+(1 row)
+
+SELECT pgv_set_timestamptz('vars', 'tstz1', '2016-03-30 10:00:00 GMT+01', true);
+ pgv_set_timestamptz 
+---------------------
+ 
+(1 row)
+
+SELECT pgv_set_timestamptz('vars', 'tstz2', '2016-03-30 11:00:00 GMT+02');
+ pgv_set_timestamptz 
+---------------------
+ 
+(1 row)
+
+SELECT pgv_set_date('vars', 'd1', '2016-03-29', true);
+ pgv_set_date 
+--------------
+ 
+(1 row)
+
+SELECT pgv_set_date('vars', 'd2', '2016-03-30');
+ pgv_set_date 
+--------------
+ 
+(1 row)
+
+SELECT pgv_set_jsonb('vars2', 'j1', '[1, 2, "foo", null]', true);
+ pgv_set_jsonb 
+---------------
+ 
+(1 row)
+
+SELECT pgv_set_jsonb('vars2', 'j2', '{"bar": "baz", "balance": 7.77, "active": false}');
+ pgv_set_jsonb 
+---------------
+ 
+(1 row)
+
+-- Check values before rollback to savepoint
+SELECT pgv_get('vars', 'any1',NULL::text);
+    pgv_get     
+----------------
+ one more value
+(1 row)
+
+SELECT pgv_get('vars', 'any2',NULL::text);
+    pgv_get     
+----------------
+ one more value
+(1 row)
+
+SELECT pgv_get_int('vars', 'int1');
+ pgv_get_int 
+-------------
+         101
+(1 row)
+
+SELECT pgv_get_int('vars', 'int2');
+ pgv_get_int 
+-------------
+         102
+(1 row)
+
+SELECT pgv_get_int('vars', 'intNULL');
+ pgv_get_int 
+-------------
+            
+(1 row)
+
+SELECT pgv_get_text('vars', 'str1');
+ pgv_get_text 
+--------------
+ s101
+(1 row)
+
+SELECT pgv_get_text('vars', 'str2');
+ pgv_get_text 
+--------------
+ s102
+(1 row)
+
+SELECT pgv_get_numeric('vars', 'num1');
+ pgv_get_numeric 
+-----------------
+            1.01
+(1 row)
+
+SELECT pgv_get_numeric('vars', 'num2');
+ pgv_get_numeric 
+-----------------
+            1.02
+(1 row)
+
+SELECT pgv_get_timestamp('vars', 'ts1');
+    pgv_get_timestamp     
+--------------------------
+ Wed Mar 30 10:00:00 2016
+(1 row)
+
+SELECT pgv_get_timestamp('vars', 'ts2');
+    pgv_get_timestamp     
+--------------------------
+ Wed Mar 30 11:00:00 2016
+(1 row)
+
+SELECT pgv_get_timestamptz('vars', 'tstz1');
+     pgv_get_timestamptz      
+------------------------------
+ Wed Mar 30 14:00:00 2016 MSK
+(1 row)
+
+SELECT pgv_get_timestamptz('vars', 'tstz2');
+     pgv_get_timestamptz      
+------------------------------
+ Wed Mar 30 16:00:00 2016 MSK
+(1 row)
+
+SELECT pgv_get_date('vars', 'd1');
+ pgv_get_date 
+--------------
+ 03-29-2016
+(1 row)
+
+SELECT pgv_get_date('vars', 'd2');
+ pgv_get_date 
+--------------
+ 03-30-2016
+(1 row)
+
+SELECT pgv_get_jsonb('vars2', 'j1');
+    pgv_get_jsonb    
+---------------------
+ [1, 2, "foo", null]
+(1 row)
+
+SELECT pgv_get_jsonb('vars2', 'j2');
+                  pgv_get_jsonb                   
+--------------------------------------------------
+ {"bar": "baz", "active": false, "balance": 7.77}
+(1 row)
+
+-- Check values after rollback to savepoint
+ROLLBACK TO comm2;
+SELECT pgv_get('vars', 'any1',NULL::text);
+    pgv_get    
+---------------
+ another value
+(1 row)
+
+SELECT pgv_get('vars', 'any2',NULL::text);
+    pgv_get     
+----------------
+ one more value
+(1 row)
+
+SELECT pgv_get_int('vars', 'int1');
+ pgv_get_int 
+-------------
+         103
+(1 row)
+
+SELECT pgv_get_int('vars', 'int2');
+ pgv_get_int 
+-------------
+         102
+(1 row)
+
+SELECT pgv_get_int('vars', 'intNULL');
+ pgv_get_int 
+-------------
+         104
+(1 row)
+
+SELECT pgv_get_text('vars', 'str1');
+ pgv_get_text 
+--------------
+ s103
+(1 row)
+
+SELECT pgv_get_text('vars', 'str2');
+ pgv_get_text 
+--------------
+ s102
+(1 row)
+
+SELECT pgv_get_numeric('vars', 'num1');
+ pgv_get_numeric 
+-----------------
+            1.03
+(1 row)
+
+SELECT pgv_get_numeric('vars', 'num2');
+ pgv_get_numeric 
+-----------------
+            1.02
+(1 row)
+
+SELECT pgv_get_timestamp('vars', 'ts1');
+    pgv_get_timestamp     
+--------------------------
+ Wed Mar 30 12:00:00 2016
+(1 row)
+
+SELECT pgv_get_timestamp('vars', 'ts2');
+    pgv_get_timestamp     
+--------------------------
+ Wed Mar 30 11:00:00 2016
+(1 row)
+
+SELECT pgv_get_timestamptz('vars', 'tstz1');
+     pgv_get_timestamptz      
+------------------------------
+ Wed Mar 30 18:00:00 2016 MSK
+(1 row)
+
+SELECT pgv_get_timestamptz('vars', 'tstz2');
+     pgv_get_timestamptz      
+------------------------------
+ Wed Mar 30 16:00:00 2016 MSK
+(1 row)
+
+SELECT pgv_get_date('vars', 'd1');
+ pgv_get_date 
+--------------
+ 04-02-2016
+(1 row)
+
+SELECT pgv_get_date('vars', 'd2');
+ pgv_get_date 
+--------------
+ 03-30-2016
+(1 row)
+
+SELECT pgv_get_jsonb('vars2', 'j1');
+                    pgv_get_jsonb                    
+-----------------------------------------------------
+ {"foo": [true, "bar"], "tags": {"a": 1, "b": null}}
+(1 row)
+
+SELECT pgv_get_jsonb('vars2', 'j2');
+                  pgv_get_jsonb                   
+--------------------------------------------------
+ {"bar": "baz", "active": false, "balance": 7.77}
+(1 row)
+
+COMMIT;
+-- Record variables
+BEGIN;
+SAVEPOINT comm2;
+SELECT pgv_delete('vars3', 'r1', 5);
+ pgv_delete 
+------------
+ t
+(1 row)
+
+SELECT pgv_delete('vars3', 'r2', 5);
+ pgv_delete 
+------------
+ t
+(1 row)
+
+SELECT pgv_select('vars3', 'r1');
+ pgv_select 
+------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (0,str00)
+(4 rows)
+
+SELECT pgv_select('vars3', 'r2');
+ pgv_select 
+------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (0,str00)
+(4 rows)
+
+ROLLBACK to comm2;
+SELECT pgv_select('vars3', 'r1');
+ pgv_select 
+------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (5,str55)
+ (0,str00)
+(5 rows)
+
+SELECT pgv_select('vars3', 'r2');
+ pgv_select 
+------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (0,str00)
+(4 rows)
+
+COMMIT;
+-- TRYING TO CHANGE FLAG 'IS_TRANSACTIONAL'
+SELECT pgv_set('vars', 'any1', 'value'::text);
+ERROR:  variable "any1" already created as TRANSACTIONAL
+SELECT pgv_set('vars', 'any2', 'value'::text, true);
+ERROR:  variable "any2" already created as NOT TRANSACTIONAL
+SELECT pgv_set_int('vars', 'int1', 301);
+ERROR:  variable "int1" already created as TRANSACTIONAL
+SELECT pgv_set_int('vars', 'int2', 302, true);
+ERROR:  variable "int2" already created as NOT TRANSACTIONAL
+SELECT pgv_set_text('vars', 'str1', 's301');
+ERROR:  variable "str1" already created as TRANSACTIONAL
+SELECT pgv_set_text('vars', 'str2', 's302', true);
+ERROR:  variable "str2" already created as NOT TRANSACTIONAL
+SELECT pgv_set_numeric('vars', 'num1', 3.01);
+ERROR:  variable "num1" already created as TRANSACTIONAL
+SELECT pgv_set_numeric('vars', 'num2', 3.02, true);
+ERROR:  variable "num2" already created as NOT TRANSACTIONAL
+SELECT pgv_set_timestamp('vars', 'ts1', '2016-03-30 20:00:00');
+ERROR:  variable "ts1" already created as TRANSACTIONAL
+SELECT pgv_set_timestamp('vars', 'ts2', '2016-03-30 21:00:00', true);
+ERROR:  variable "ts2" already created as NOT TRANSACTIONAL
+SELECT pgv_set_timestamptz('vars', 'tstz1', '2016-03-30 20:00:00 GMT+01');
+ERROR:  variable "tstz1" already created as TRANSACTIONAL
+SELECT pgv_set_timestamptz('vars', 'tstz2', '2016-03-30 21:00:00 GMT+02', true);
+ERROR:  variable "tstz2" already created as NOT TRANSACTIONAL
+SELECT pgv_set_date('vars', 'd1', '2016-04-29');
+ERROR:  variable "d1" already created as TRANSACTIONAL
+SELECT pgv_set_date('vars', 'd2', '2016-04-30', true);
+ERROR:  variable "d2" already created as NOT TRANSACTIONAL
+SELECT pgv_set_jsonb('vars2', 'j1', '[1, 2, "foo2", null]');
+ERROR:  variable "j1" already created as TRANSACTIONAL
+SELECT pgv_set_jsonb('vars2', 'j2', '{"bar": "baz2", "balance": 7.77, "active": true}', true);
+ERROR:  variable "j2" already created as NOT TRANSACTIONAL
+SELECT pgv_insert('vars3', 'r1', row(6 :: integer, 'str66' :: varchar));
+ERROR:  variable "r1" already created as TRANSACTIONAL
+SELECT pgv_insert('vars3', 'r2', row(6 :: integer, 'str66' :: varchar),true);
+ERROR:  variable "r2" already created as NOT TRANSACTIONAL
+-- CHECK pgv_list() WHILE WE HAVE A LOT OF MISCELLANEOUS VARIABLES
+SELECT * FROM pgv_list() order by package, name;
+ package |  name   | is_transactional 
+---------+---------+------------------
+ vars    | any1    | t
+ vars    | any2    | f
+ vars    | d1      | t
+ vars    | d2      | f
+ vars    | int1    | t
+ vars    | int2    | f
+ vars    | intNULL | t
+ vars    | num1    | t
+ vars    | num2    | f
+ vars    | str1    | t
+ vars    | str2    | f
+ vars    | ts1     | t
+ vars    | ts2     | f
+ vars    | tstz1   | t
+ vars    | tstz2   | f
+ vars2   | j1      | t
+ vars2   | j2      | f
+ vars3   | r1      | t
+ vars3   | r2      | f
+(19 rows)
+
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+-- VARIABLES DECLARED IN SUBTRANSACTION SHOULD BE DESTROYED AFTER ROLLBACK TO SAVEPOINT
+-- For better readability we don't use deprecated api functions in test below
+BEGIN;
+SAVEPOINT sp_to_rollback;
+SELECT pgv_set('vars', 'any1', 'text value'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT pgv_set('vars', 'any2', 'text value'::text);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT pgv_insert('vars3', 'r1', row(6 :: integer, 'str44' :: varchar), true);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('vars3', 'r2', row(6 :: integer, 'str44' :: varchar));
+ pgv_insert 
+------------
+ 
+(1 row)
+
+ROLLBACK TO sp_to_rollback;
+COMMIT;
+SELECT pgv_get('vars', 'any1',NULL::text);
+ERROR:  unrecognized variable "any1"
+SELECT pgv_get('vars', 'any2',NULL::text);
+  pgv_get   
+------------
+ text value
+(1 row)
+
+SELECT pgv_select('vars3', 'r1');
+ERROR:  unrecognized variable "r1"
+SELECT pgv_select('vars3', 'r2');
+ pgv_select 
+------------
+ (6,str44)
+(1 row)
+
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+-- CHECK ROLLBACK AFTER COMMITTING SUBTRANSACTION
+BEGIN;
+SELECT pgv_set('vars', 'any1', 'before savepoint sp1'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SAVEPOINT sp1;
+SELECT pgv_set('vars', 'any1', 'after savepoint sp1'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SAVEPOINT sp2;
+SELECT pgv_set('vars', 'any1', 'after savepoint sp2'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+RELEASE sp2;
+SELECT pgv_get('vars', 'any1',NULL::text);
+       pgv_get       
+---------------------
+ after savepoint sp2
+(1 row)
+
+ROLLBACK TO sp1;
+SELECT pgv_get('vars', 'any1',NULL::text);
+       pgv_get        
+----------------------
+ before savepoint sp1
+(1 row)
+
+COMMIT;
+BEGIN;
+SAVEPOINT sp1;
+SAVEPOINT sp2;
+SELECT pgv_set('vars2', 'any1', 'variable exists'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+RELEASE sp2;
+SELECT pgv_get('vars2', 'any1',NULL::text);
+     pgv_get     
+-----------------
+ variable exists
+(1 row)
+
+ROLLBACK TO sp1;
+COMMIT;
+SELECT pgv_get('vars2', 'any1',NULL::text);
+ERROR:  unrecognized package "vars2"
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+--CHECK TRANSACTION COMMIT
+-- Declare variables
+SELECT pgv_set('vars', 'any1', 'some value'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT pgv_set('vars', 'any2', 'some value'::text);
+ pgv_set 
+---------
+ 
+(1 row)
+
+BEGIN;
+-- Set new values
+SELECT pgv_set('vars', 'any1', 'another value'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT pgv_set('vars', 'any2', 'another value'::text);
+ pgv_set 
+---------
+ 
+(1 row)
+
+-- Check values before committing transaction
+SELECT pgv_get('vars', 'any1',NULL::text);
+    pgv_get    
+---------------
+ another value
+(1 row)
+
+SELECT pgv_get('vars', 'any2',NULL::text);
+    pgv_get    
+---------------
+ another value
+(1 row)
+
+-- Check values after committing transaction
+COMMIT;
+SELECT pgv_get('vars', 'any1',NULL::text);
+    pgv_get    
+---------------
+ another value
+(1 row)
+
+SELECT pgv_get('vars', 'any2',NULL::text);
+    pgv_get    
+---------------
+ another value
+(1 row)
+
+SELECT pgv_insert('vars3', 'r1', tab, true) FROM tab;
+ pgv_insert 
+------------
+ 
+ 
+ 
+ 
+(4 rows)
+
+SELECT pgv_insert('vars3', 'r2', tab) FROM tab;
+ pgv_insert 
+------------
+ 
+ 
+ 
+ 
+(4 rows)
+
+BEGIN;
+SELECT pgv_insert('vars3', 'r1', row(5 :: integer, 'str55' :: varchar),true);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('vars3', 'r2', row(5 :: integer, 'str55' :: varchar));
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('vars3', 'r1');
+ pgv_select 
+------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (5,str55)
+ (0,str00)
+(5 rows)
+
+SELECT pgv_select('vars3', 'r2');
+ pgv_select 
+------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (5,str55)
+ (0,str00)
+(5 rows)
+
+COMMIT;
+SELECT pgv_select('vars3', 'r1');
+ pgv_select 
+------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (5,str55)
+ (0,str00)
+(5 rows)
+
+SELECT pgv_select('vars3', 'r2');
+ pgv_select 
+------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (5,str55)
+ (0,str00)
+(5 rows)
+
+-- CHECK TRANSACTION ROLLBACK
+-- Variables are already declared
+BEGIN;
+-- Set new values
+SELECT pgv_set('vars', 'any1', 'one more value'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT pgv_set('vars', 'any2', 'one more value'::text);
+ pgv_set 
+---------
+ 
+(1 row)
+
+-- Check values before rollback
+SELECT pgv_get('vars', 'any1',NULL::text);
+    pgv_get     
+----------------
+ one more value
+(1 row)
+
+SELECT pgv_get('vars', 'any2',NULL::text);
+    pgv_get     
+----------------
+ one more value
+(1 row)
+
+-- Check values after rollback
+ROLLBACK;
+SELECT pgv_get('vars', 'any1',NULL::text);
+    pgv_get    
+---------------
+ another value
+(1 row)
+
+SELECT pgv_get('vars', 'any2',NULL::text);
+    pgv_get     
+----------------
+ one more value
+(1 row)
+
+-- Record variables
+BEGIN;
+SELECT pgv_delete('vars3', 'r1', 5);
+ pgv_delete 
+------------
+ t
+(1 row)
+
+SELECT pgv_delete('vars3', 'r2', 5);
+ pgv_delete 
+------------
+ t
+(1 row)
+
+SELECT pgv_select('vars3', 'r1');
+ pgv_select 
+------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (0,str00)
+(4 rows)
+
+SELECT pgv_select('vars3', 'r2');
+ pgv_select 
+------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (0,str00)
+(4 rows)
+
+ROLLBACK;
+SELECT pgv_select('vars3', 'r1');
+ pgv_select 
+------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (5,str55)
+ (0,str00)
+(5 rows)
+
+SELECT pgv_select('vars3', 'r2');
+ pgv_select 
+------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (0,str00)
+(4 rows)
+
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+-- VARIABLES DECLARED IN TRANSACTION SHOULD BE DESTROYED AFTER ROLLBACK
+BEGIN;
+SELECT pgv_set('vars', 'any1', 'text value'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT pgv_set('vars', 'any2', 'text value'::text);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT pgv_insert('vars', 'r1', row(6 :: integer, 'str44' :: varchar), true);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('vars', 'r2', row(6 :: integer, 'str44' :: varchar));
+ pgv_insert 
+------------
+ 
+(1 row)
+
+ROLLBACK;
+SELECT pgv_get('vars', 'any1',NULL::text);
+ERROR:  unrecognized variable "any1"
+SELECT pgv_get('vars', 'any2',NULL::text);
+  pgv_get   
+------------
+ text value
+(1 row)
+
+SELECT pgv_select('vars', 'r1');
+ERROR:  unrecognized variable "r1"
+SELECT pgv_select('vars', 'r2');
+ pgv_select 
+------------
+ (6,str44)
+(1 row)
+
+SELECT pgv_remove('vars');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+-- CHECK ROLLBACK AFTER COMMITTING SUBTRANSACTION
+SELECT pgv_set('vars', 'any1', 'before transaction block'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+BEGIN;
+SELECT pgv_set('vars', 'any1', 'before savepoint sp1'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SAVEPOINT sp1;
+SELECT pgv_set('vars', 'any1', 'after savepoint sp1'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SAVEPOINT sp2;
+SELECT pgv_set('vars', 'any1', 'after savepoint sp2'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+RELEASE sp2;
+SELECT pgv_get('vars', 'any1',NULL::text);
+       pgv_get       
+---------------------
+ after savepoint sp2
+(1 row)
+
+ROLLBACK TO sp1;
+SELECT pgv_get('vars', 'any1',NULL::text);
+       pgv_get        
+----------------------
+ before savepoint sp1
+(1 row)
+
+ROLLBACK;
+SELECT pgv_get('vars', 'any1',NULL::text);
+         pgv_get          
+--------------------------
+ before transaction block
+(1 row)
+
+BEGIN;
+SAVEPOINT sp1;
+SELECT pgv_set('vars2', 'any1', 'variable exists'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+RELEASE sp1;
+SELECT pgv_get('vars2', 'any1',NULL::text);
+     pgv_get     
+-----------------
+ variable exists
+(1 row)
+
+ROLLBACK;
+SELECT pgv_get('vars2', 'any1',NULL::text);
+ERROR:  unrecognized package "vars2"
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+-- Additional tests
+SELECT pgv_insert('vars3', 'r1', tab, true) FROM tab;
+ pgv_insert 
+------------
+ 
+ 
+ 
+ 
+(4 rows)
+
+BEGIN;
+SELECT pgv_insert('vars3', 'r1', row(5 :: integer, 'before savepoint sp1' :: varchar),true);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SAVEPOINT sp1;
+SELECT pgv_update('vars3', 'r1', row(5 :: integer, 'after savepoint sp1' :: varchar));
+ pgv_update 
+------------
+ t
+(1 row)
+
+SAVEPOINT sp2;
+SELECT pgv_insert('vars3', 'r1', row(7 :: integer, 'row after sp2 to remove in sp4' :: varchar),true);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SAVEPOINT sp3;
+SAVEPOINT sp4;
+SELECT pgv_delete('vars3', 'r1', 7);
+ pgv_delete 
+------------
+ t
+(1 row)
+
+SAVEPOINT sp5;
+SELECT pgv_select('vars3', 'r1');
+        pgv_select         
+---------------------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (5,"after savepoint sp1")
+ (0,str00)
+(5 rows)
+
+ROLLBACK TO sp5;
+SELECT pgv_select('vars3', 'r1');
+        pgv_select         
+---------------------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (5,"after savepoint sp1")
+ (0,str00)
+(5 rows)
+
+RELEASE sp4;
+SELECT pgv_select('vars3', 'r1');
+        pgv_select         
+---------------------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (5,"after savepoint sp1")
+ (0,str00)
+(5 rows)
+
+ROLLBACK TO sp3;
+SELECT pgv_select('vars3', 'r1');
+              pgv_select              
+--------------------------------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (5,"after savepoint sp1")
+ (0,str00)
+ (7,"row after sp2 to remove in sp4")
+(6 rows)
+
+RELEASE sp2;
+SELECT pgv_select('vars3', 'r1');
+              pgv_select              
+--------------------------------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (5,"after savepoint sp1")
+ (0,str00)
+ (7,"row after sp2 to remove in sp4")
+(6 rows)
+
+ROLLBACK TO sp1;
+SELECT pgv_select('vars3', 'r1');
+         pgv_select         
+----------------------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (5,"before savepoint sp1")
+ (0,str00)
+(5 rows)
+
+COMMIT;
+SELECT pgv_select('vars3', 'r1');
+         pgv_select         
+----------------------------
+ (,strNULL)
+ (1,str33)
+ (2,)
+ (5,"before savepoint sp1")
+ (0,str00)
+(5 rows)
+
+SELECT pgv_set('vars', 'any1', 'outer'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+BEGIN;
+SELECT pgv_set('vars', 'any1', 'begin'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SAVEPOINT sp1;
+SELECT pgv_set('vars', 'any1', 'sp1'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SAVEPOINT sp2;
+SELECT pgv_set('vars', 'any1', 'sp2'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SAVEPOINT sp3;
+SAVEPOINT sp4;
+SELECT pgv_set('vars', 'any1', 'sp4'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SAVEPOINT sp5;
+SELECT pgv_get('vars', 'any1',NULL::text);
+ pgv_get 
+---------
+ sp4
+(1 row)
+
+ROLLBACK TO sp5;
+SELECT pgv_get('vars', 'any1',NULL::text);
+ pgv_get 
+---------
+ sp4
+(1 row)
+
+RELEASE sp4;
+SELECT pgv_get('vars', 'any1',NULL::text);
+ pgv_get 
+---------
+ sp4
+(1 row)
+
+ROLLBACK TO sp3;
+SELECT pgv_get('vars', 'any1',NULL::text);
+ pgv_get 
+---------
+ sp2
+(1 row)
+
+RELEASE sp2;
+SELECT pgv_get('vars', 'any1',NULL::text);
+ pgv_get 
+---------
+ sp2
+(1 row)
+
+ROLLBACK TO sp1;
+SELECT pgv_get('vars', 'any1',NULL::text);
+ pgv_get 
+---------
+ begin
+(1 row)
+
+ROLLBACK;
+SELECT pgv_get('vars', 'any1',NULL::text);
+ pgv_get 
+---------
+ outer
+(1 row)
+
+BEGIN;
+SELECT pgv_set('vars', 'any1', 'wrong type'::varchar, true);
+ERROR:  variable "any1" requires "text" value
+COMMIT;
+-- THE REMOVAL OF THE VARIABLE MUST BE CANCELED ON ROLLBACK
+SELECT pgv_set('vars', 'any1', 'variable exists'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+BEGIN;
+SELECT pgv_remove('vars', 'any1');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+SELECT pgv_exists('vars', 'any1');
+ pgv_exists 
+------------
+ f
+(1 row)
+
+ROLLBACK;
+SELECT pgv_exists('vars', 'any1');
+ pgv_exists 
+------------
+ t
+(1 row)
+
+SELECT pgv_get('vars', 'any1',NULL::text);
+     pgv_get     
+-----------------
+ variable exists
+(1 row)
+
+BEGIN;
+SELECT pgv_remove('vars', 'any1');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+SELECT pgv_exists('vars', 'any1');
+ pgv_exists 
+------------
+ f
+(1 row)
+
+COMMIT;
+SELECT pgv_exists('vars', 'any1');
+ pgv_exists 
+------------
+ f
+(1 row)
+
+SELECT pgv_get('vars', 'any1',NULL::text);
+ERROR:  unrecognized package "vars"
+SELECT * FROM pgv_list() ORDER BY package, name;
+ package | name | is_transactional 
+---------+------+------------------
+ vars3   | r1   | t
+(1 row)
+
+BEGIN;
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+ROLLBACK;
+SELECT * FROM pgv_list() ORDER BY package, name;
+ package | name | is_transactional 
+---------+------+------------------
+ vars3   | r1   | t
+(1 row)
+
+BEGIN;
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+COMMIT;
+SELECT * FROM pgv_list() ORDER BY package, name;
+ package | name | is_transactional 
+---------+------+------------------
+(0 rows)
+
+SELECT pgv_set('vars', 'regular', 'regular variable exists'::text);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT pgv_set('vars', 'trans1', 'trans1 variable exists'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+BEGIN;
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+SELECT pgv_free(); -- Check sequential package removal in one subtransaction
+ pgv_free 
+----------
+ 
+(1 row)
+
+SELECT * FROM pgv_list() ORDER BY package, name;
+ package | name | is_transactional 
+---------+------+------------------
+(0 rows)
+
+SELECT pgv_set('vars', 'trans2', 'trans2 variable exists'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT * FROM pgv_list() ORDER BY package, name;
+ package |  name  | is_transactional 
+---------+--------+------------------
+ vars    | trans2 | t
+(1 row)
+
+SELECT pgv_remove('vars');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+SELECT * FROM pgv_list() ORDER BY package, name;
+ package | name | is_transactional 
+---------+------+------------------
+(0 rows)
+
+ROLLBACK;
+SELECT * FROM pgv_list() ORDER BY package, name;
+ package |  name  | is_transactional 
+---------+--------+------------------
+ vars    | trans1 | t
+(1 row)
+
+BEGIN;
+SAVEPOINT sp1;
+SAVEPOINT sp2;
+SAVEPOINT sp3;
+SELECT pgv_set('vars2', 'trans2', 'trans2 variable exists'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SAVEPOINT sp4;
+SAVEPOINT sp5;
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+SELECT package FROM pgv_stats() ORDER BY package;
+ package 
+---------
+ vars
+ vars2
+(2 rows)
+
+SELECT * FROM pgv_list() ORDER BY package, name;
+ package | name | is_transactional 
+---------+------+------------------
+(0 rows)
+
+RELEASE sp5;
+SELECT package FROM pgv_stats() ORDER BY package;
+ package 
+---------
+ vars
+ vars2
+(2 rows)
+
+SELECT * FROM pgv_list() ORDER BY package, name;
+ package | name | is_transactional 
+---------+------+------------------
+(0 rows)
+
+RELEASE sp4;
+SELECT package FROM pgv_stats() ORDER BY package;
+ package 
+---------
+ vars
+ vars2
+(2 rows)
+
+SELECT * FROM pgv_list() ORDER BY package, name;
+ package | name | is_transactional 
+---------+------+------------------
+(0 rows)
+
+COMMIT;
+SELECT package FROM pgv_stats() ORDER BY package;
+ package 
+---------
+(0 rows)
+
+BEGIN;
+SELECT pgv_set('vars', 'trans1', 'package created'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT pgv_remove('vars');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+SELECT * FROM pgv_list() ORDER BY package, name;
+ package | name | is_transactional 
+---------+------+------------------
+(0 rows)
+
+SELECT pgv_set('vars', 'trans1', 'package restored'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT * FROM pgv_list() ORDER BY package, name;
+ package |  name  | is_transactional 
+---------+--------+------------------
+ vars    | trans1 | t
+(1 row)
+
+COMMIT;
+SELECT pgv_remove('vars');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+-- REMOVED TRANSACTIONAL VARIABLE SHOULD BE NOT ACCESSIBLE THROUGH LastVariable
+SELECT pgv_insert('package', 'errs',row(n), true)
+FROM generate_series(1,5) AS gs(n) WHERE 1.0/(n-3)<>0;
+ERROR:  division by zero
+SELECT pgv_insert('package', 'errs',row(1), true);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+-- Variable should not exists in case when error occurs during creation
+SELECT pgv_insert('vars4', 'r1', row('str1', 'str1'));
+ERROR:  could not identify a hash function for type unknown
+SELECT pgv_select('vars4', 'r1', 0);
+ERROR:  unrecognized package "vars4"
+-- If variable created and removed in same transaction level,
+-- it should be totally removed and should not be present
+-- in changes list and cache.
+BEGIN;
+SELECT pgv_set('vars', 'any1', 'some value'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SAVEPOINT comm;
+SELECT pgv_remove('vars', 'any1');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+RELEASE comm;
+SELECT pgv_get('vars', 'any1',NULL::text);
+ERROR:  unrecognized package "vars"
+COMMIT;
+-- Tests for PGPRO-2440
+SELECT pgv_insert('vars3', 'r3', row(1 :: integer, NULL::varchar), true);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+SELECT pgv_insert('vars3', 'r3', row(2 :: integer, NULL::varchar), true);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SAVEPOINT comm;
+SELECT pgv_insert('vars3', 'r3', row(3 :: integer, NULL::varchar), true);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+COMMIT;
+SELECT pgv_delete('vars3', 'r3', 3);
+ pgv_delete 
+------------
+ t
+(1 row)
+
+BEGIN;
+SELECT pgv_set('vars1', 't1', ''::text);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT pgv_set('vars2', 't2', ''::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SAVEPOINT sp1;
+SAVEPOINT sp2;
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+ERROR;
+ERROR:  syntax error at or near "ERROR"
+LINE 1: ERROR;
+        ^
+COMMIT;
+BEGIN;
+SELECT pgv_set('vars', 'any1', 'some value'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+SAVEPOINT sp_to_rollback;
+SELECT pgv_set('vars', 'any1', 'some value'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+ROLLBACK TO sp_to_rollback;
+COMMIT;
+SELECT package FROM pgv_stats() ORDER BY package;
+ package 
+---------
+(0 rows)
+
+-- Package should exist after rollback if it contains regular variable
+BEGIN;
+SELECT pgv_set('vars', 'any1', 'some value'::text);
+ pgv_set 
+---------
+ 
+(1 row)
+
+ROLLBACK;
+SELECT package FROM pgv_stats() ORDER BY package;
+ package 
+---------
+ vars
+(1 row)
+
+-- Package should not exist if it becomes empty in rolled back transaction
+BEGIN;
+SAVEPOINT comm2;
+SELECT pgv_remove('vars');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+ROLLBACK TO comm2;
+SELECT pgv_exists('vars');
+ pgv_exists 
+------------
+ f
+(1 row)
+
+SELECT package FROM pgv_stats() ORDER BY package;
+ package 
+---------
+ vars
+(1 row)
+
+COMMIT;
+SELECT package FROM pgv_stats() ORDER BY package;
+ package 
+---------
+(0 rows)
+
+SELECT pgv_set('vars', 'any1', 'some value'::text);
+ pgv_set 
+---------
+ 
+(1 row)
+
+BEGIN;
+SELECT pgv_remove('vars');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+ROLLBACK;
+SELECT package FROM pgv_stats() ORDER BY package;
+ package 
+---------
+(0 rows)
+
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+-- Variables should be insertable after pgv_remove (variable)
+BEGIN;
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_remove('test', 'x');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'x', ROW (1::int, 3::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,3)
+(1 row)
+
+SELECT pgv_insert('test', 'x', ROW (2::int, 4::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,3)
+ (2,4)
+(2 rows)
+
+ROLLBACK;
+SELECT * FROM pgv_list() order by package, name;
+ package | name | is_transactional 
+---------+------+------------------
+(0 rows)
+
+BEGIN;
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_remove('test', 'x');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'x', ROW (1::int, 3::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,3)
+(1 row)
+
+SELECT pgv_insert('test', 'x', ROW (2::int, 4::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,3)
+ (2,4)
+(2 rows)
+
+COMMIT;
+SELECT * FROM pgv_list() order by package, name;
+ package | name | is_transactional 
+---------+------+------------------
+ test    | x    | t
+(1 row)
+
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,3)
+ (2,4)
+(2 rows)
+
+-- Variables should be insertable after pgv_remove (package)
+BEGIN;
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'y');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_remove('test');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'y', ROW (1::int, 3::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'y');
+ pgv_select 
+------------
+ (1,3)
+(1 row)
+
+SELECT pgv_insert('test', 'y', ROW (2::int, 4::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'y');
+ pgv_select 
+------------
+ (1,3)
+ (2,4)
+(2 rows)
+
+ROLLBACK;
+SELECT * FROM pgv_list() order by package, name;
+ package | name | is_transactional 
+---------+------+------------------
+ test    | x    | t
+(1 row)
+
+BEGIN;
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'y');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_remove('test');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'y', ROW (1::int, 3::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'y');
+ pgv_select 
+------------
+ (1,3)
+(1 row)
+
+SELECT pgv_insert('test', 'y', ROW (2::int, 4::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'y');
+ pgv_select 
+------------
+ (1,3)
+ (2,4)
+(2 rows)
+
+COMMIT;
+SELECT * FROM pgv_list() order by package, name;
+ package | name | is_transactional 
+---------+------+------------------
+ test    | y    | t
+(1 row)
+
+SELECT pgv_select('test', 'y');
+ pgv_select 
+------------
+ (1,3)
+ (2,4)
+(2 rows)
+
+-- Variables should be insertable after pgv_free
+BEGIN;
+SELECT pgv_insert('test', 'z', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'z');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'z', ROW (1::int, 3::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'z');
+ pgv_select 
+------------
+ (1,3)
+(1 row)
+
+SELECT pgv_insert('test', 'z', ROW (2::int, 4::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'z');
+ pgv_select 
+------------
+ (1,3)
+ (2,4)
+(2 rows)
+
+ROLLBACK;
+SELECT * FROM pgv_list() order by package, name;
+ package | name | is_transactional 
+---------+------+------------------
+ test    | y    | t
+(1 row)
+
+BEGIN;
+SELECT pgv_insert('test', 'z', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'z');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'z', ROW (1::int, 3::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'z');
+ pgv_select 
+------------
+ (1,3)
+(1 row)
+
+SELECT pgv_insert('test', 'z', ROW (2::int, 4::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'z');
+ pgv_select 
+------------
+ (1,3)
+ (2,4)
+(2 rows)
+
+COMMIT;
+SELECT * FROM pgv_list() order by package, name;
+ package | name | is_transactional 
+---------+------+------------------
+ test    | z    | t
+(1 row)
+
+SELECT pgv_select('test', 'z');
+ pgv_select 
+------------
+ (1,3)
+ (2,4)
+(2 rows)
+
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+-- Variables should be rollbackable if transactional
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'x', ROW (2::int, 3::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+BEGIN;
+SELECT pgv_remove('test', 'x');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+BEGIN;
+SELECT pgv_remove('test');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+BEGIN;
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+---
+--- Variables should not be rollbackable if not transactional
+---
+-- case 1 (remove var)
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'y', ROW (2::int, 3::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'y');
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+BEGIN;
+SELECT pgv_remove('test', 'y');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+ROLLBACK;
+SELECT pgv_select('test', 'y');
+ERROR:  unrecognized variable "y"
+-- case 2 (remove pack)
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'y', ROW (2::int, 3::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'y');
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+BEGIN;
+SELECT pgv_remove('test');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+ROLLBACK;
+SELECT pgv_select('test', 'y');
+ERROR:  unrecognized variable "y"
+-- case 3 (free)
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'y', ROW (2::int, 3::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'y');
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+BEGIN;
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+ROLLBACK;
+SELECT pgv_select('test', 'y');
+ERROR:  unrecognized variable "y"
+-- clear all
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+---
+--- Cursors test #1 (remove var)
+---
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+SELECT pgv_remove('test', 'x');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'y');
+SELECT pgv_remove('test', 'y');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized variable "y"
+ROLLBACK;
+SELECT pgv_select('test', 'y');
+ERROR:  unrecognized variable "y"
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+---
+--- Cursors test #2 (remove pack)
+---
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+SELECT pgv_remove('test');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'y');
+SELECT pgv_remove('test');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test');
+ERROR:  function pgv_select(unknown) does not exist
+LINE 1: SELECT pgv_select('test');
+               ^
+HINT:  No function matches the given name and argument types. You might need to add explicit type casts.
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+---
+--- Cursors test #3 (free)
+---
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'y');
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test');
+ERROR:  function pgv_select(unknown) does not exist
+LINE 1: SELECT pgv_select('test');
+               ^
+HINT:  No function matches the given name and argument types. You might need to add explicit type casts.
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+---
+--- Cursor test #4
+---
+-- non transactional, remove var
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+SELECT pgv_remove('test', 'x');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ERROR:  unrecognized package "test"
+-- non transactional, remove pac
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+SELECT pgv_remove('test');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ERROR:  unrecognized package "test"
+-- non transactional, free
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ERROR:  unrecognized package "test"
+-- transactional, remove var
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'y');
+SELECT pgv_remove('test', 'y');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'y');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+-- transactional, remove pack
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'y');
+SELECT pgv_remove('test');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'y');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+-- transactional, free
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'y');
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'y');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+---
+--- Cursor test #5
+---
+-- non transactional
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+CLOSE r1_cur;
+SELECT pgv_remove('test', 'x');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ERROR:  unrecognized package "test"
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+CLOSE r1_cur;
+SELECT pgv_remove('test');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ERROR:  unrecognized package "test"
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+CLOSE r1_cur;
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ERROR:  unrecognized package "test"
+-- transactional
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_remove('test', 'x');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_remove('test');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+---
+--- Cursor test #6
+---
+--SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), TRUE);
+--BEGIN;
+--DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+--FETCH 1 in r1_cur;
+--CLOSE r1_cur;
+--SELECT pgv_remove('test', 'x');
+--COMMIT;
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+---
+--- Tests for "leaked hash_seq_search scan for hash table"
+---
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'x', ROW (2::int, 3::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'x', ROW (3::int, 4::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'x') LIMIT 1;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_select('test', 'x') LIMIT 2;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+SELECT pgv_select('test', 'x') LIMIT 3;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+BEGIN;
+SELECT pgv_select('test', 'x') LIMIT 1;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_select('test', 'x') LIMIT 2;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+SELECT pgv_select('test', 'x') LIMIT 3;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+ROLLBACK;
+BEGIN;
+SELECT pgv_select('test', 'x') LIMIT 1;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_select('test', 'x') LIMIT 2;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+SELECT pgv_select('test', 'x') LIMIT 3;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+COMMIT;
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'y', ROW (2::int, 3::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'y', ROW (3::int, 4::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_select('test', 'y') LIMIT 1;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_select('test', 'y') LIMIT 2;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+SELECT pgv_select('test', 'y') LIMIT 3;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+BEGIN;
+SELECT pgv_select('test', 'y') LIMIT 1;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_select('test', 'y') LIMIT 2;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+SELECT pgv_select('test', 'y') LIMIT 3;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+ROLLBACK;
+BEGIN;
+SELECT pgv_select('test', 'y') LIMIT 1;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+SELECT pgv_select('test', 'y') LIMIT 2;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+SELECT pgv_select('test', 'y') LIMIT 3;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+COMMIT;
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+DECLARE r2_cur CURSOR FOR SELECT pgv_select('test', 'y');
+DECLARE r3_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+FETCH 1 in r2_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+FETCH 1 in r3_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+ROLLBACK;
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+DECLARE r2_cur CURSOR FOR SELECT pgv_select('test', 'y');
+DECLARE r3_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 2 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+FETCH 2 in r2_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+FETCH 2 in r3_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+ROLLBACK;
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+DECLARE r2_cur CURSOR FOR SELECT pgv_select('test', 'y');
+DECLARE r3_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 3 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+FETCH 3 in r2_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+FETCH 3 in r3_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+ROLLBACK;
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+DECLARE r2_cur CURSOR FOR SELECT pgv_select('test', 'y');
+DECLARE r3_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+FETCH 1 in r2_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+FETCH 1 in r3_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+COMMIT;
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+DECLARE r2_cur CURSOR FOR SELECT pgv_select('test', 'y');
+DECLARE r3_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 2 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+FETCH 2 in r2_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+FETCH 2 in r3_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+COMMIT;
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+DECLARE r2_cur CURSOR FOR SELECT pgv_select('test', 'y');
+DECLARE r3_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 3 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+FETCH 3 in r2_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+FETCH 3 in r3_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+COMMIT;
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+DECLARE r2_cur CURSOR FOR SELECT pgv_select('test', 'y');
+DECLARE r3_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+FETCH 2 in r2_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+FETCH 3 in r3_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+ROLLBACK;
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+DECLARE r2_cur CURSOR FOR SELECT pgv_select('test', 'y');
+DECLARE r3_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+FETCH 2 in r2_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+FETCH 3 in r3_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+ (3,4)
+(3 rows)
+
+COMMIT;
+---
+--- Some special cases
+---
+-- take #1
+SELECT pgv_insert('test', 'z1', ROW (2::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'z1');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (2,2)
+(1 row)
+
+SELECT pgv_remove('test', 'z1');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  unrecognized variable "z1"
+ROLLBACK;
+SELECT pgv_select('test', 'z1');
+ pgv_select 
+------------
+ (2,2)
+(1 row)
+
+-- take #2
+SELECT pgv_insert('test', 'z2', ROW (2::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'z2');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (2,2)
+(1 row)
+
+CLOSE r1_cur;
+SELECT pgv_remove('test', 'z2');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  cursor "r1_cur" does not exist
+ROLLBACK;
+SELECT pgv_select('test', 'z2');
+ERROR:  unrecognized variable "z2"
+SELECT pgv_insert('test', 'z2', ROW (1::int, 2::int), FALSE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+-- take #3
+SELECT pgv_insert('test', 'z3', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'z3');
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+CLOSE r1_cur;
+SELECT pgv_remove('test', 'z3');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+FETCH 1 in r1_cur;
+ERROR:  cursor "r1_cur" does not exist
+ROLLBACK;
+SELECT pgv_select('test', 'z3');
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+--BEGIN;
+--DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'z3');
+--FETCH 1 in r1_cur;
+--SELECT pgv_remove('test', 'z3');
+--COMMIT;
+--SELECT pgv_select('test', 'z3');
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+-- take #4
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test', 'x', ROW (2::int, 3::int), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+SAVEPOINT sp1;
+FETCH 1 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+ROLLBACK TO SAVEPOINT sp1;
+COMMIT;
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+SAVEPOINT sp1;
+FETCH 2 in r1_cur;
+ pgv_select 
+------------
+ (1,2)
+ (2,3)
+(2 rows)
+
+ROLLBACK TO SAVEPOINT sp1;
+COMMIT;
+BEGIN;
+SAVEPOINT sp1;
+SELECT pgv_select('test', 'x') LIMIT 1;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+ROLLBACK TO SAVEPOINT sp1;
+COMMIT;
+---
+--- Test cases for pgv_stats
+---
+SELECT pgv_insert('test1', 'y', ROW (2::float, 1::float), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_insert('test1', 'x', ROW (2::float, 1::float), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+FETCH 1 in r1_cur;
+  pgv_stats   
+--------------
+ (test,32768)
+(1 row)
+
+FETCH 1 in r2_cur;
+  pgv_stats   
+--------------
+ (test,32768)
+(1 row)
+
+COMMIT;
+SELECT pgv_insert('test1', 'y', ROW (2::float, 1::float), TRUE);
+ERROR:  there is a record in the variable "y" with same key
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+FETCH 1 in r1_cur;
+  pgv_stats   
+--------------
+ (test,32768)
+(1 row)
+
+FETCH 1 in r2_cur;
+  pgv_stats   
+--------------
+ (test,32768)
+(1 row)
+
+ROLLBACK;
+SELECT pgv_insert('test1', 'y', ROW (2::float, 1::float), FALSE);
+ERROR:  variable "y" already created as TRANSACTIONAL
+SELECT pgv_insert('test1', 'y', ROW (2::float, 1::float), FALSE);
+ERROR:  variable "y" already created as TRANSACTIONAL
+SELECT pgv_insert('test1', 'x', ROW (2::float, 1::float), FALSE);
+ERROR:  variable "x" already created as TRANSACTIONAL
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+FETCH 1 in r1_cur;
+  pgv_stats   
+--------------
+ (test,32768)
+(1 row)
+
+FETCH 1 in r2_cur;
+  pgv_stats   
+--------------
+ (test,32768)
+(1 row)
+
+COMMIT;
+SELECT pgv_insert('test1', 'y', ROW (2::float, 1::float), FALSE);
+ERROR:  variable "y" already created as TRANSACTIONAL
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+FETCH 1 in r1_cur;
+  pgv_stats   
+--------------
+ (test,32768)
+(1 row)
+
+FETCH 1 in r2_cur;
+  pgv_stats   
+--------------
+ (test,32768)
+(1 row)
+
+ROLLBACK;
+SELECT pgv_insert('test1', 'y', ROW (2::float, 1::float), FALSE);
+ERROR:  variable "y" already created as TRANSACTIONAL
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+---
+--- Some special cases
+---
+-- 1
+BEGIN;
+SAVEPOINT comm2;
+SELECT pgv_insert('test', 'x1', ROW (2::float, 1::float), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+FETCH 1 in r1_cur;
+  pgv_stats   
+--------------
+ (test,24576)
+(1 row)
+
+FETCH 1 in r2_cur;
+  pgv_stats   
+--------------
+ (test,24576)
+(1 row)
+
+COMMIT;
+-- 2
+BEGIN;
+SELECT pgv_insert('test', 'x2', ROW (2::float, 1::float), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SAVEPOINT comm2;
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+FETCH 1 in r1_cur;
+  pgv_stats   
+--------------
+ (test,40960)
+(1 row)
+
+FETCH 1 in r2_cur;
+  pgv_stats   
+--------------
+ (test,40960)
+(1 row)
+
+COMMIT;
+-- 3
+BEGIN;
+SELECT pgv_insert('test', 'x3', ROW (2::float, 1::float), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+SAVEPOINT comm2;
+FETCH 1 in r1_cur;
+  pgv_stats   
+--------------
+ (test,57344)
+(1 row)
+
+FETCH 1 in r2_cur;
+  pgv_stats   
+--------------
+ (test,57344)
+(1 row)
+
+COMMIT;
+-- 4
+BEGIN;
+SELECT pgv_insert('test', 'x4', ROW (2::float, 1::float), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+FETCH 1 in r1_cur;
+  pgv_stats   
+--------------
+ (test,73728)
+(1 row)
+
+SAVEPOINT comm2;
+FETCH 1 in r2_cur;
+  pgv_stats   
+--------------
+ (test,73728)
+(1 row)
+
+COMMIT;
+-- 5
+BEGIN;
+SELECT pgv_insert('test', 'x5', ROW (2::float, 1::float), TRUE);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+FETCH 1 in r1_cur;
+  pgv_stats   
+--------------
+ (test,90112)
+(1 row)
+
+FETCH 1 in r2_cur;
+  pgv_stats   
+--------------
+ (test,90112)
+(1 row)
+
+SAVEPOINT comm2;
+COMMIT;
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
diff --git a/pg_variables.c b/pg_variables.c
index ee1fa3d..4bd6bdd 100644
--- a/pg_variables.c
+++ b/pg_variables.c
@@ -10,11 +10,13 @@
 #include "postgres.h"
 #include "fmgr.h"
 #include "funcapi.h"
+#include "miscadmin.h"
 
 #include "access/htup_details.h"
 #include "access/xact.h"
 #include "catalog/pg_type.h"
 #include "parser/scansup.h"
+#include "storage/proc.h"
 #include "utils/builtins.h"
 #include "utils/datum.h"
 #include "utils/lsyscache.h"
@@ -129,6 +131,313 @@ static ExecutorEnd_hook_type prev_ExecutorEnd = NULL;
 static dlist_head *changesStack = NULL;
 static MemoryContext changesStackContext = NULL;
 
+/*
+ * List to store all the running hash_seq_search, variable and package scan for
+ * hash table.
+ *
+ * NOTE: In function variable_select we use hash_seq_search to find next tuple.
+ * So, in case user do not get all the data from set at once (use cursors or
+ * LIMIT) we have to call hash_seq_term to not to leak hash_seq_search scans.
+ *
+ * For doing this, we alloc all of the rstats in the TopTransactionContext and
+ * save pointers to the rstats into list. Once transaction ended (commited or
+ * aborted) we clear all the "active" hash_seq_search by calling hash_seq_term.
+ *
+ * TopTransactionContext is handy here, because it would not be reset by the
+ * time pgvTransCallback is called.
+ */
+static List *variables_stats = NIL;
+static List *packages_stats = NIL;
+
+typedef struct tagVariableStatEntry
+{
+	HTAB			*hash;
+	HASH_SEQ_STATUS	*status;
+	Variable		*variable;
+	Package			*package;
+	int				 level;
+} VariableStatEntry;
+
+typedef struct tagPackageStatEntry
+{
+	HASH_SEQ_STATUS	*status;
+	int				 level;
+} PackageStatEntry;
+
+/*
+ * Compare functions for VariableStatEntry and PackageStatEntry members.
+ */
+static bool
+VariableStatEntry_status_eq(void *entry, void *value)
+{
+	return ((VariableStatEntry *) entry)->status == (HASH_SEQ_STATUS *) value;
+}
+
+static bool
+VariableStatEntry_variable_eq(void *entry, void *value)
+{
+	return ((VariableStatEntry *) entry)->variable == (Variable *) value;
+}
+
+static bool
+VariableStatEntry_package_eq(void *entry, void *value)
+{
+	return ((VariableStatEntry *) entry)->package == (Package *) value;
+}
+
+static bool
+VariableStatEntry_eq_all(void *entry, void *value)
+{
+	return true;
+}
+
+static bool
+VariableStatEntry_level_eq(void *entry, void *value)
+{
+	return ((VariableStatEntry *) entry)->level == *(int *) value;
+}
+
+static bool
+PackageStatEntry_status_eq(void *entry, void *value)
+{
+	return ((PackageStatEntry *) entry)->status == (HASH_SEQ_STATUS *) value;
+}
+
+static bool
+PackageStatEntry_level_eq(void *entry, void *value)
+{
+	return ((PackageStatEntry *) entry)->level == *(int *) value;
+}
+
+/*
+ * VariableStatEntry and PackageStatEntry status member getters.
+ */
+static HASH_SEQ_STATUS *
+VariableStatEntry_status_ptr(void *entry)
+{
+	return ((VariableStatEntry *) entry)->status;
+}
+
+static HASH_SEQ_STATUS *
+PackageStatEntry_status_ptr(void *entry)
+{
+	return ((PackageStatEntry *) entry)->status;
+}
+
+/*
+ * Generic remove_if algorithm.
+ *
+ * For every item in the list:
+ *  1. Comapare item with value by eq function call.
+ *  2. If eq return true, then step 3, else goto 7.
+ *  3. Delete item from list.
+ *  4. If term is true, call hash_seq_term.
+ *  5. Free memory.
+ *  6. If match_first if true return.
+ *  7. Fetch next item.
+ *
+ */
+typedef struct tagRemoveIfContext
+{
+	List 				**list;					/* target list */
+	void 				*value;					/* value to compare with */
+	bool 				(*eq)(void *, void *);	/* list item eq to value func */
+	HASH_SEQ_STATUS * 	(*getter)(void *);		/* status getter */
+	bool 				match_first;			/* return on first match */
+	bool 				term;					/* hash_seq_term on match */
+} RemoveIfContext;
+
+static void
+list_remove_if(RemoveIfContext ctx)
+{
+#if (PG_VERSION_NUM < 130000)
+	ListCell *cell, *next, *prev = NULL;
+	void	 *entry = NULL;
+
+	for (cell = list_head(*ctx.list); cell; cell = next)
+	{
+		entry = lfirst(cell);
+		next = lnext(cell);
+
+		if (ctx.eq(entry, ctx.value))
+		{
+			*ctx.list = list_delete_cell(*ctx.list, cell, prev);
+
+			if (ctx.term)
+				hash_seq_term(ctx.getter(entry));
+
+			pfree(ctx.getter(entry));
+			pfree(entry);
+
+			if (ctx.match_first)
+				return;
+		}
+		else
+		{
+			prev = cell;
+		}
+	}
+#else
+	/*
+	 * See https://git.postgresql.org/gitweb/?p=postgresql.git;a=commit;h=1cff1b95ab6ddae32faa3efe0d95a820dbfdc164
+	 *
+	 * Version >= 13 have different lists interface.
+	 */
+	ListCell *cell;
+	void	 *entry = NULL;
+
+	foreach(cell, *ctx.list)
+	{
+		entry = lfirst(cell);
+
+		if (ctx.eq(entry, ctx.value))
+		{
+			*ctx.list = foreach_delete_current(*ctx.list, cell);
+
+			if (ctx.term)
+				hash_seq_term(ctx.getter(entry));
+
+			pfree(ctx.getter(entry));
+			pfree(entry);
+
+			if (ctx.match_first)
+				return;
+		}
+	}
+#endif
+}
+
+/*
+ * Remove first entry for status.
+ */
+static void
+remove_variables_status(List **list, HASH_SEQ_STATUS *status)
+{
+	RemoveIfContext ctx =
+	{
+		.list		 = list,
+		.value		 = status,
+		.eq			 = VariableStatEntry_status_eq,
+		.getter		 = VariableStatEntry_status_ptr,
+		.match_first = true,
+		.term		 = false
+	};
+	list_remove_if(ctx);
+}
+
+/*
+ * Remove first entry for variable.
+ */
+static void
+remove_variables_variable(List **list, Variable *variable)
+{
+	/*
+	 * It may be more than one item in the list for each variable in case of
+	 * cursor. So match_first is false here.
+	 */
+	RemoveIfContext ctx =
+	{
+		.list		 = list,
+		.value		 = variable,
+		.eq			 = VariableStatEntry_variable_eq,
+		.getter		 = VariableStatEntry_status_ptr,
+		.match_first = false,
+		.term		 = true
+	};
+	list_remove_if(ctx);
+}
+
+/*
+ * Remove all the entries for package.
+ */
+static void
+remove_variables_package(List **list, Package *package)
+{
+	RemoveIfContext ctx =
+	{
+		.list		 = list,
+		.value		 = package,
+		.eq			 = VariableStatEntry_package_eq,
+		.getter		 = VariableStatEntry_status_ptr,
+		.match_first = false,
+		.term		 = true
+	};
+	list_remove_if(ctx);
+}
+
+/*
+ * Remove all the entries for level.
+ */
+static void
+remove_variables_level(List **list, int level)
+{
+	RemoveIfContext ctx =
+	{
+		.list		 = list,
+		.value		 = &level,
+		.eq			 = VariableStatEntry_level_eq,
+		.getter		 = VariableStatEntry_status_ptr,
+		.match_first = false,
+		.term		 = false
+	};
+	list_remove_if(ctx);
+}
+
+/*
+ * Delete variables stats list.
+ */
+static void
+remove_variables_all(List **list)
+{
+	RemoveIfContext ctx =
+	{
+		.list		 = list,
+		.value		 = NULL,
+		.eq			 = VariableStatEntry_eq_all,
+		.getter		 = VariableStatEntry_status_ptr,
+		.match_first = false,
+		.term		 = true
+	};
+	list_remove_if(ctx);
+}
+
+/*
+ * Remove first entrie with status for packages list.
+ */
+static void
+remove_packages_status(List **list, HASH_SEQ_STATUS *status)
+{
+	RemoveIfContext ctx =
+	{
+		.list		 = list,
+		.value		 = status,
+		.eq			 = PackageStatEntry_status_eq,
+		.getter		 = PackageStatEntry_status_ptr,
+		.match_first = true,
+		.term		 = false
+	};
+	list_remove_if(ctx);
+}
+
+/*
+ * Remove all the entries with level for packages list.
+ */
+static void
+remove_packages_level(List **list, int level)
+{
+	RemoveIfContext ctx =
+	{
+		.list		 = list,
+		.value		 = &level,
+		.eq			 = PackageStatEntry_level_eq,
+		.getter		 = PackageStatEntry_status_ptr,
+		.match_first = false,
+		.term		 = true
+	};
+	list_remove_if(ctx);
+}
+
+static void freeStatsLists(void);
 /* Returns a lists of packages and variables changed at current subxact level */
 #define get_actual_changes_list() \
 	( \
@@ -595,30 +904,31 @@ variable_select(PG_FUNCTION_ARGS)
 	FuncCallContext *funcctx;
 	HASH_SEQ_STATUS *rstat;
 	HashRecordEntry *item;
+	text			*package_name;
+	text			*var_name;
+	Package			*package;
+	Variable		*variable;
 
-	if (SRF_IS_FIRSTCALL())
-	{
-		text	   *package_name;
-		text	   *var_name;
-		Package	   *package;
-		Variable   *variable;
-		MemoryContext oldcontext;
-		RecordVar  *record;
+	CHECK_ARGS_FOR_NULL();
 
-		CHECK_ARGS_FOR_NULL();
+	/* Get arguments */
+	package_name = PG_GETARG_TEXT_PP(0);
+	var_name = PG_GETARG_TEXT_PP(1);
 
-		/* Get arguments */
-		package_name = PG_GETARG_TEXT_PP(0);
-		var_name = PG_GETARG_TEXT_PP(1);
+	package = getPackage(package_name, true);
+	variable = getVariableInternal(package, var_name, RECORDOID, true,
+								   true);
 
-		package = getPackage(package_name, true);
-		variable = getVariableInternal(package, var_name, RECORDOID, true,
-									   true);
+	if (SRF_IS_FIRSTCALL())
+	{
+		MemoryContext	 	 oldcontext;
+		RecordVar			*record;
+		VariableStatEntry	*entry;
 
 		record = &(GetActualValue(variable).record);
-
 		funcctx = SRF_FIRSTCALL_INIT();
-		oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
+
+		oldcontext = MemoryContextSwitchTo(TopTransactionContext);
 
 		funcctx->tuple_desc = record->tupdesc;
 
@@ -626,6 +936,14 @@ variable_select(PG_FUNCTION_ARGS)
 		hash_seq_init(rstat, record->rhash);
 		funcctx->user_fctx = rstat;
 
+		entry = palloc0(sizeof(VariableStatEntry));
+		entry->hash = record->rhash;
+		entry->status = rstat;
+		entry->variable = variable;
+		entry->package = package;
+		entry->level = GetCurrentTransactionNestLevel();
+		variables_stats = lcons((void *)entry, variables_stats);
+
 		MemoryContextSwitchTo(oldcontext);
 		PG_FREE_IF_COPY(package_name, 0);
 		PG_FREE_IF_COPY(var_name, 1);
@@ -645,7 +963,7 @@ variable_select(PG_FUNCTION_ARGS)
 	}
 	else
 	{
-		pfree(rstat);
+		remove_variables_status(&variables_stats, rstat);
 		SRF_RETURN_DONE(funcctx);
 	}
 }
@@ -947,6 +1265,8 @@ remove_package(PG_FUNCTION_ARGS)
 
 	resetVariablesCache();
 
+	remove_variables_package(&variables_stats, package);
+
 	PG_FREE_IF_COPY(package_name, 0);
 	PG_RETURN_VOID();
 }
@@ -1042,6 +1362,7 @@ remove_packages(PG_FUNCTION_ARGS)
 	}
 
 	resetVariablesCache();
+	remove_variables_all(&variables_stats);
 
 	PG_RETURN_VOID();
 }
@@ -1213,7 +1534,7 @@ get_packages_stats(PG_FUNCTION_ARGS)
 {
 	FuncCallContext *funcctx;
 	MemoryContext oldcontext;
-	HASH_SEQ_STATUS *pstat;
+	HASH_SEQ_STATUS *rstat;
 	Package	   *package;
 
 	if (SRF_IS_FIRSTCALL())
@@ -1238,11 +1559,20 @@ get_packages_stats(PG_FUNCTION_ARGS)
 		 */
 		if (packagesHash)
 		{
-			pstat = (HASH_SEQ_STATUS *) palloc0(sizeof(HASH_SEQ_STATUS));
-			/* Get packages list */
-			hash_seq_init(pstat, packagesHash);
+			MemoryContext	 ctx;
+			PackageStatEntry *entry;
 
-			funcctx->user_fctx = pstat;
+			ctx = MemoryContextSwitchTo(TopTransactionContext);
+			rstat = (HASH_SEQ_STATUS *) palloc0(sizeof(HASH_SEQ_STATUS));
+			/* Get packages list */
+			hash_seq_init(rstat, packagesHash);
+
+			funcctx->user_fctx = rstat;
+			entry = palloc0(sizeof(PackageStatEntry));
+			entry->status = rstat;
+			entry->level = GetCurrentTransactionNestLevel();
+			packages_stats = lcons((void *)entry, packages_stats);
+			MemoryContextSwitchTo(ctx);
 		}
 		else
 			funcctx->user_fctx = NULL;
@@ -1255,9 +1585,9 @@ get_packages_stats(PG_FUNCTION_ARGS)
 		SRF_RETURN_DONE(funcctx);
 
 	/* Get packages list */
-	pstat = (HASH_SEQ_STATUS *) funcctx->user_fctx;
+	rstat = (HASH_SEQ_STATUS *) funcctx->user_fctx;
 
-	package = (Package *) hash_seq_search(pstat);
+	package = (Package *) hash_seq_search(rstat);
 	if (package != NULL)
 	{
 		Datum		values[2];
@@ -1289,7 +1619,7 @@ get_packages_stats(PG_FUNCTION_ARGS)
 	}
 	else
 	{
-		pfree(pstat);
+		remove_packages_status(&packages_stats, rstat);
 		SRF_RETURN_DONE(funcctx);
 	}
 }
@@ -1749,6 +2079,7 @@ removeObject(TransObject *object, TransObjectType type)
 
 	/* Remove object from hash table */
 	hash_search(hash, object->name, HASH_REMOVE, &found);
+	remove_variables_variable(&variables_stats, (Variable *) object);
 
 	/* Remove package if it became empty */
 	if (type == TRANS_VARIABLE && isPackageEmpty(package))
@@ -2131,16 +2462,60 @@ processChanges(Action action)
 	}
 }
 
+/*
+ * ATX and connection pooling are not compatible with pg_variables.
+ */
 static void
 compatibility_check(void)
 {
+	/*
+	 *  | Edition | ConnPool | ATX | COMPAT_CHECK |
+	 *  -------------------------------------------
+	 *  | std 9.6 | no       | no  | no           |
+	 *  | std 10  | no       | no  | yes          |
+	 *  | std 11  | no       | no  | yes          |
+	 *  | std 12  | no       | no  | yes          |
+	 *  | std 13  | no       | no  | yes          |
+	 *  |  ee 9.6 | no       | yes | no           |
+	 *  |  ee 10  | no       | yes | yes          |
+	 *  |  ee 11  | yes      | yes | yes          |
+	 *  |  ee 12  | yes      | yes | yes          |
+	 *  |  ee 13  | yes      | yes | yes          |
+	 */
 #ifdef PGPRO_EE
-#	if (PG_VERSION_NUM < 130000) || \
-		((PG_VERSION_NUM >= 130000) && (defined PGPRO_FEATURE_ATX))
+
+#	if (PG_VERSION_NUM < 100000)
+		/*
+		 * This versions does not have dedicated macro to check compatibility.
+		 * So, use simple check here for ATX.
+		 */
 		if (getNestLevelATX() != 0)
-				elog(ERROR, "pg_variable extension is not compatible with autonomous transactions and connection pooling");
-#	endif
-#endif
+		{
+			freeStatsLists();
+			elog(ERROR, "pg_variables extension is not compatible with "
+						"autonomous transactions");
+		}
+#	else
+		/*
+		 * Since ee10 there is PG_COMPATIBILITY_CHECK macro to check compatibility.
+		 * But for some reasons it may not be present at the moment.
+		 * So, if PG_COMPATIBILITY_CHECK macro is not present pg_variables are
+		 * always compatible.
+		 */
+#		ifdef PG_COMPATIBILITY_CHECK
+		{
+			if (!pg_compatibility_check_no_error())
+				freeStatsLists();
+
+			PG_COMPATIBILITY_CHECK("pg_variables");
+		}
+#		endif /* PG_COMPATIBILITY_CHECK */
+#	endif /* PG_VERSION_NUM */
+
+#	undef ATX_CHECK
+#	undef CONNPOOL_CHECK
+
+#endif /* PGPRO_EE */
 }
 
 /*
@@ -2168,6 +2543,9 @@ pgvSubTransCallback(SubXactEvent event, SubTransactionId mySubid,
 				break;
 		}
 	}
+
+	remove_variables_level(&variables_stats, GetCurrentTransactionNestLevel());
+	remove_packages_level(&packages_stats, GetCurrentTransactionNestLevel());
 }
 
 /*
@@ -2197,6 +2575,9 @@ pgvTransCallback(XactEvent event, void *arg)
 				break;
 		}
 	}
+
+	if (event == XACT_EVENT_PRE_COMMIT || event == XACT_EVENT_ABORT)
+		freeStatsLists();
 }
 
 /*
@@ -2209,6 +2590,33 @@ variable_ExecutorEnd(QueryDesc *queryDesc)
 		prev_ExecutorEnd(queryDesc);
 	else
 		standard_ExecutorEnd(queryDesc);
+
+	freeStatsLists();
+}
+
+/*
+ * Free hash_seq_search scans 
+ */
+static void
+freeStatsLists(void)
+{
+	ListCell		*cell;
+
+	foreach(cell, variables_stats)
+	{
+		VariableStatEntry *entry = (VariableStatEntry *) lfirst(cell);
+		hash_seq_term(entry->status);
+	}
+
+	variables_stats = NIL;
+
+	foreach(cell, packages_stats)
+	{
+		PackageStatEntry *entry = (PackageStatEntry *) lfirst(cell);
+		hash_seq_term(entry->status);
+	}
+
+	packages_stats = NIL;
 }
 
 /*
diff --git a/sql/pg_variables_trans.sql b/sql/pg_variables_trans.sql
index c4b8c90..8cb1d2f 100644
--- a/sql/pg_variables_trans.sql
+++ b/sql/pg_variables_trans.sql
@@ -614,3 +614,522 @@ SELECT * FROM pgv_list() order by package, name;
 SELECT pgv_select('test', 'z');
 
 SELECT pgv_free();
+
+-- Variables should be rollbackable if transactional
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), TRUE);
+SELECT pgv_insert('test', 'x', ROW (2::int, 3::int), TRUE);
+SELECT pgv_select('test', 'x');
+
+BEGIN;
+SELECT pgv_remove('test', 'x');
+ROLLBACK;
+
+SELECT pgv_select('test', 'x');
+
+BEGIN;
+SELECT pgv_remove('test');
+ROLLBACK;
+
+SELECT pgv_select('test', 'x');
+
+BEGIN;
+SELECT pgv_free();
+ROLLBACK;
+
+SELECT pgv_select('test', 'x');
+
+---
+--- Variables should not be rollbackable if not transactional
+---
+-- case 1 (remove var)
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), FALSE);
+SELECT pgv_insert('test', 'y', ROW (2::int, 3::int), FALSE);
+SELECT pgv_select('test', 'y');
+
+BEGIN;
+SELECT pgv_remove('test', 'y');
+ROLLBACK;
+
+SELECT pgv_select('test', 'y');
+-- case 2 (remove pack)
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), FALSE);
+SELECT pgv_insert('test', 'y', ROW (2::int, 3::int), FALSE);
+SELECT pgv_select('test', 'y');
+
+BEGIN;
+SELECT pgv_remove('test');
+ROLLBACK;
+
+SELECT pgv_select('test', 'y');
+-- case 3 (free)
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), FALSE);
+SELECT pgv_insert('test', 'y', ROW (2::int, 3::int), FALSE);
+SELECT pgv_select('test', 'y');
+
+BEGIN;
+SELECT pgv_free();
+ROLLBACK;
+
+SELECT pgv_select('test', 'y');
+-- clear all
+SELECT pgv_free();
+
+---
+--- Cursors test #1 (remove var)
+---
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), TRUE);
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+SELECT pgv_remove('test', 'x');
+FETCH 1 in r1_cur;
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), FALSE);
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'y');
+SELECT pgv_remove('test', 'y');
+FETCH 1 in r1_cur;
+ROLLBACK;
+SELECT pgv_select('test', 'y');
+
+SELECT pgv_free();
+---
+--- Cursors test #2 (remove pack)
+---
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), TRUE);
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+SELECT pgv_remove('test');
+FETCH 1 in r1_cur;
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), FALSE);
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'y');
+SELECT pgv_remove('test');
+FETCH 1 in r1_cur;
+ROLLBACK;
+SELECT pgv_select('test');
+
+SELECT pgv_free();
+---
+--- Cursors test #3 (free)
+---
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), TRUE);
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+SELECT pgv_free();
+FETCH 1 in r1_cur;
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), FALSE);
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'y');
+SELECT pgv_free();
+FETCH 1 in r1_cur;
+ROLLBACK;
+SELECT pgv_select('test');
+
+SELECT pgv_free();
+---
+--- Cursor test #4
+---
+
+-- non transactional, remove var
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), FALSE);
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+SELECT pgv_remove('test', 'x');
+FETCH 1 in r1_cur;
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+
+-- non transactional, remove pac
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), FALSE);
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+SELECT pgv_remove('test');
+FETCH 1 in r1_cur;
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+
+-- non transactional, free
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), FALSE);
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+SELECT pgv_free();
+FETCH 1 in r1_cur;
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+
+-- transactional, remove var
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), TRUE);
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'y');
+SELECT pgv_remove('test', 'y');
+FETCH 1 in r1_cur;
+ROLLBACK;
+SELECT pgv_select('test', 'y');
+
+-- transactional, remove pack
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), TRUE);
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'y');
+SELECT pgv_remove('test');
+FETCH 1 in r1_cur;
+ROLLBACK;
+SELECT pgv_select('test', 'y');
+
+-- transactional, free
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), TRUE);
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'y');
+SELECT pgv_free();
+FETCH 1 in r1_cur;
+ROLLBACK;
+SELECT pgv_select('test', 'y');
+
+SELECT pgv_free();
+---
+--- Cursor test #5
+---
+
+-- non transactional
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), FALSE);
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+CLOSE r1_cur;
+SELECT pgv_remove('test', 'x');
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), FALSE);
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+CLOSE r1_cur;
+SELECT pgv_remove('test');
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), FALSE);
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+CLOSE r1_cur;
+SELECT pgv_free();
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+
+-- transactional
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), TRUE);
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+SELECT pgv_remove('test', 'x');
+FETCH 1 in r1_cur;
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+SELECT pgv_remove('test');
+FETCH 1 in r1_cur;
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+SELECT pgv_free();
+FETCH 1 in r1_cur;
+ROLLBACK;
+SELECT pgv_select('test', 'x');
+
+---
+--- Cursor test #6
+---
+--SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), TRUE);
+--BEGIN;
+--DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+--FETCH 1 in r1_cur;
+--CLOSE r1_cur;
+--SELECT pgv_remove('test', 'x');
+--COMMIT;
+SELECT pgv_free();
+---
+--- Tests for "leaked hash_seq_search scan for hash table"
+---
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), FALSE);
+SELECT pgv_insert('test', 'x', ROW (2::int, 3::int), FALSE);
+SELECT pgv_insert('test', 'x', ROW (3::int, 4::int), FALSE);
+SELECT pgv_select('test', 'x') LIMIT 1;
+SELECT pgv_select('test', 'x') LIMIT 2;
+SELECT pgv_select('test', 'x') LIMIT 3;
+BEGIN;
+SELECT pgv_select('test', 'x') LIMIT 1;
+SELECT pgv_select('test', 'x') LIMIT 2;
+SELECT pgv_select('test', 'x') LIMIT 3;
+ROLLBACK;
+BEGIN;
+SELECT pgv_select('test', 'x') LIMIT 1;
+SELECT pgv_select('test', 'x') LIMIT 2;
+SELECT pgv_select('test', 'x') LIMIT 3;
+COMMIT;
+
+SELECT pgv_insert('test', 'y', ROW (1::int, 2::int), TRUE);
+SELECT pgv_insert('test', 'y', ROW (2::int, 3::int), TRUE);
+SELECT pgv_insert('test', 'y', ROW (3::int, 4::int), TRUE);
+SELECT pgv_select('test', 'y') LIMIT 1;
+SELECT pgv_select('test', 'y') LIMIT 2;
+SELECT pgv_select('test', 'y') LIMIT 3;
+BEGIN;
+SELECT pgv_select('test', 'y') LIMIT 1;
+SELECT pgv_select('test', 'y') LIMIT 2;
+SELECT pgv_select('test', 'y') LIMIT 3;
+ROLLBACK;
+BEGIN;
+SELECT pgv_select('test', 'y') LIMIT 1;
+SELECT pgv_select('test', 'y') LIMIT 2;
+SELECT pgv_select('test', 'y') LIMIT 3;
+COMMIT;
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+DECLARE r2_cur CURSOR FOR SELECT pgv_select('test', 'y');
+DECLARE r3_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+FETCH 1 in r2_cur;
+FETCH 1 in r3_cur;
+ROLLBACK;
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+DECLARE r2_cur CURSOR FOR SELECT pgv_select('test', 'y');
+DECLARE r3_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 2 in r1_cur;
+FETCH 2 in r2_cur;
+FETCH 2 in r3_cur;
+ROLLBACK;
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+DECLARE r2_cur CURSOR FOR SELECT pgv_select('test', 'y');
+DECLARE r3_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 3 in r1_cur;
+FETCH 3 in r2_cur;
+FETCH 3 in r3_cur;
+ROLLBACK;
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+DECLARE r2_cur CURSOR FOR SELECT pgv_select('test', 'y');
+DECLARE r3_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+FETCH 1 in r2_cur;
+FETCH 1 in r3_cur;
+COMMIT;
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+DECLARE r2_cur CURSOR FOR SELECT pgv_select('test', 'y');
+DECLARE r3_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 2 in r1_cur;
+FETCH 2 in r2_cur;
+FETCH 2 in r3_cur;
+COMMIT;
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+DECLARE r2_cur CURSOR FOR SELECT pgv_select('test', 'y');
+DECLARE r3_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 3 in r1_cur;
+FETCH 3 in r2_cur;
+FETCH 3 in r3_cur;
+COMMIT;
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+DECLARE r2_cur CURSOR FOR SELECT pgv_select('test', 'y');
+DECLARE r3_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+FETCH 2 in r2_cur;
+FETCH 3 in r3_cur;
+ROLLBACK;
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+DECLARE r2_cur CURSOR FOR SELECT pgv_select('test', 'y');
+DECLARE r3_cur CURSOR FOR SELECT pgv_select('test', 'x');
+FETCH 1 in r1_cur;
+FETCH 2 in r2_cur;
+FETCH 3 in r3_cur;
+COMMIT;
+
+---
+--- Some special cases
+---
+-- take #1
+SELECT pgv_insert('test', 'z1', ROW (2::int, 2::int), TRUE);
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'z1');
+FETCH 1 in r1_cur;
+SELECT pgv_remove('test', 'z1');
+FETCH 1 in r1_cur;
+ROLLBACK;
+SELECT pgv_select('test', 'z1');
+-- take #2
+SELECT pgv_insert('test', 'z2', ROW (2::int, 2::int), FALSE);
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'z2');
+FETCH 1 in r1_cur;
+CLOSE r1_cur;
+SELECT pgv_remove('test', 'z2');
+FETCH 1 in r1_cur;
+ROLLBACK;
+SELECT pgv_select('test', 'z2');
+SELECT pgv_insert('test', 'z2', ROW (1::int, 2::int), FALSE);
+-- take #3
+SELECT pgv_insert('test', 'z3', ROW (1::int, 2::int), TRUE);
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'z3');
+FETCH 1 in r1_cur;
+CLOSE r1_cur;
+SELECT pgv_remove('test', 'z3');
+FETCH 1 in r1_cur;
+ROLLBACK;
+SELECT pgv_select('test', 'z3');
+
+--BEGIN;
+--DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'z3');
+--FETCH 1 in r1_cur;
+--SELECT pgv_remove('test', 'z3');
+--COMMIT;
+--SELECT pgv_select('test', 'z3');
+
+SELECT pgv_free();
+-- take #4
+SELECT pgv_insert('test', 'x', ROW (1::int, 2::int), TRUE);
+SELECT pgv_insert('test', 'x', ROW (2::int, 3::int), TRUE);
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+SAVEPOINT sp1;
+FETCH 1 in r1_cur;
+ROLLBACK TO SAVEPOINT sp1;
+COMMIT;
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+SAVEPOINT sp1;
+FETCH 2 in r1_cur;
+ROLLBACK TO SAVEPOINT sp1;
+COMMIT;
+
+BEGIN;
+SAVEPOINT sp1;
+SELECT pgv_select('test', 'x') LIMIT 1;
+ROLLBACK TO SAVEPOINT sp1;
+COMMIT;
+
+---
+--- Test cases for pgv_stats
+---
+SELECT pgv_insert('test1', 'y', ROW (2::float, 1::float), TRUE);
+SELECT pgv_insert('test1', 'x', ROW (2::float, 1::float), TRUE);
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+FETCH 1 in r1_cur;
+FETCH 1 in r2_cur;
+COMMIT;
+
+SELECT pgv_insert('test1', 'y', ROW (2::float, 1::float), TRUE);
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+FETCH 1 in r1_cur;
+FETCH 1 in r2_cur;
+ROLLBACK;
+
+SELECT pgv_insert('test1', 'y', ROW (2::float, 1::float), FALSE);
+
+SELECT pgv_insert('test1', 'y', ROW (2::float, 1::float), FALSE);
+SELECT pgv_insert('test1', 'x', ROW (2::float, 1::float), FALSE);
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+FETCH 1 in r1_cur;
+FETCH 1 in r2_cur;
+COMMIT;
+
+SELECT pgv_insert('test1', 'y', ROW (2::float, 1::float), FALSE);
+
+BEGIN;
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+FETCH 1 in r1_cur;
+FETCH 1 in r2_cur;
+ROLLBACK;
+
+SELECT pgv_insert('test1', 'y', ROW (2::float, 1::float), FALSE);
+
+SELECT pgv_free();
+
+---
+--- Some special cases
+---
+-- 1
+BEGIN;
+SAVEPOINT comm2;
+SELECT pgv_insert('test', 'x1', ROW (2::float, 1::float), TRUE);
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+FETCH 1 in r1_cur;
+FETCH 1 in r2_cur;
+COMMIT;
+
+-- 2
+BEGIN;
+SELECT pgv_insert('test', 'x2', ROW (2::float, 1::float), TRUE);
+SAVEPOINT comm2;
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+FETCH 1 in r1_cur;
+FETCH 1 in r2_cur;
+COMMIT;
+
+-- 3
+BEGIN;
+SELECT pgv_insert('test', 'x3', ROW (2::float, 1::float), TRUE);
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+SAVEPOINT comm2;
+FETCH 1 in r1_cur;
+FETCH 1 in r2_cur;
+COMMIT;
+
+-- 4
+BEGIN;
+SELECT pgv_insert('test', 'x4', ROW (2::float, 1::float), TRUE);
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+FETCH 1 in r1_cur;
+SAVEPOINT comm2;
+FETCH 1 in r2_cur;
+COMMIT;
+
+-- 5
+BEGIN;
+SELECT pgv_insert('test', 'x5', ROW (2::float, 1::float), TRUE);
+DECLARE r1_cur CURSOR FOR SELECT pgv_stats();
+DECLARE r2_cur CURSOR FOR SELECT pgv_stats();
+FETCH 1 in r1_cur;
+FETCH 1 in r2_cur;
+SAVEPOINT comm2;
+COMMIT;
+
+SELECT pgv_free();