Skip to content

Commit ffa8928

Browse files
committed
Make sure subtransaction test actually tests something
I accidentally broke rollback while working and this test did not catch it due to not even using tde_heap.
1 parent 21a4b1f commit ffa8928

File tree

2 files changed

+16
-17
lines changed

2 files changed

+16
-17
lines changed

contrib/pg_tde/expected/subtransaction.out

+8-8
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@ SELECT pg_tde_set_key_using_database_key_provider('test-db-key','file-vault');
1111

1212
(1 row)
1313

14-
BEGIN; -- Nesting level 1
14+
BEGIN; -- Nesting level 1
1515
SAVEPOINT sp;
16-
CREATE TABLE foo(s TEXT); -- Nesting level 2
16+
CREATE TABLE foo(s TEXT) USING tde_heap; -- Nesting level 2
1717
RELEASE SAVEPOINT sp;
1818
SAVEPOINT sp;
19-
CREATE TABLE bar(s TEXT); -- Nesting level 2
20-
ROLLBACK TO sp; -- Rollback should not affect first subtransaction
19+
CREATE TABLE bar(s TEXT) USING tde_heap; -- Nesting level 2
20+
ROLLBACK TO sp; -- Rollback should not affect first subtransaction
2121
COMMIT;
22-
BEGIN; -- Nesting level 1
22+
BEGIN; -- Nesting level 1
2323
SAVEPOINT sp;
24-
DROP TABLE foo; -- Nesting level 2
24+
DROP TABLE foo; -- Nesting level 2
2525
RELEASE SAVEPOINT sp;
2626
SAVEPOINT sp;
27-
CREATE TABLE bar(s TEXT); -- Nesting level 2
28-
ROLLBACK TO sp; -- Rollback should not affect first subtransaction
27+
CREATE TABLE bar(s TEXT) USING tde_heap; -- Nesting level 2
28+
ROLLBACK TO sp; -- Rollback should not affect first subtransaction
2929
COMMIT;
3030
DROP EXTENSION pg_tde;

contrib/pg_tde/sql/subtransaction.sql

+8-9
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,22 @@ CREATE EXTENSION IF NOT EXISTS pg_tde;
33
SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');
44
SELECT pg_tde_set_key_using_database_key_provider('test-db-key','file-vault');
55

6-
7-
BEGIN; -- Nesting level 1
6+
BEGIN; -- Nesting level 1
87
SAVEPOINT sp;
9-
CREATE TABLE foo(s TEXT); -- Nesting level 2
8+
CREATE TABLE foo(s TEXT) USING tde_heap; -- Nesting level 2
109
RELEASE SAVEPOINT sp;
1110
SAVEPOINT sp;
12-
CREATE TABLE bar(s TEXT); -- Nesting level 2
13-
ROLLBACK TO sp; -- Rollback should not affect first subtransaction
11+
CREATE TABLE bar(s TEXT) USING tde_heap; -- Nesting level 2
12+
ROLLBACK TO sp; -- Rollback should not affect first subtransaction
1413
COMMIT;
1514

16-
BEGIN; -- Nesting level 1
15+
BEGIN; -- Nesting level 1
1716
SAVEPOINT sp;
18-
DROP TABLE foo; -- Nesting level 2
17+
DROP TABLE foo; -- Nesting level 2
1918
RELEASE SAVEPOINT sp;
2019
SAVEPOINT sp;
21-
CREATE TABLE bar(s TEXT); -- Nesting level 2
22-
ROLLBACK TO sp; -- Rollback should not affect first subtransaction
20+
CREATE TABLE bar(s TEXT) USING tde_heap; -- Nesting level 2
21+
ROLLBACK TO sp; -- Rollback should not affect first subtransaction
2322
COMMIT;
2423

2524
DROP EXTENSION pg_tde;

0 commit comments

Comments
 (0)