Skip to content

Commit 1a2a757

Browse files
committed
PG-1457 Fix some tests
1 parent 384fcd8 commit 1a2a757

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

ci_scripts/tde_setup_global.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ CREATE SCHEMA tde;
22
CREATE EXTENSION IF NOT EXISTS pg_tde SCHEMA tde;
33

44
SELECT tde.pg_tde_add_global_key_provider_file('reg_file-global', '/tmp/pg_tde_test_keyring.per');
5-
SELECT tde.pg_tde_set_server_principal_key('global-principal-key', 'reg_file-global');
5+
SELECT tde.pg_tde_set_server_principal_key_global_provider('global-principal-key', 'reg_file-global');
66
ALTER SYSTEM SET pg_tde.wal_encrypt = on;
77
ALTER SYSTEM SET default_table_access_method = 'tde_heap';
88
ALTER SYSTEM SET search_path = "$user",public,tde;

src/bin/pg_waldump/t/003_basic_encrypted.pl

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
$node->safe_psql('postgres', "CREATE EXTENSION IF NOT EXISTS pg_tde;");
3030
$node->safe_psql('postgres', "SELECT pg_tde_add_global_key_provider_file('file-keyring-wal','/tmp/pg_tde_test_keyring-wal.per');");;
31-
$node->safe_psql('postgres', "SELECT pg_tde_set_server_principal_key('global-db-principal-key', 'file-keyring-wal');");
31+
$node->safe_psql('postgres', "SELECT pg_tde_set_server_principal_key_global_provider('global-db-principal-key', 'file-keyring-wal');");
3232

3333
$node->append_conf(
3434
'postgresql.conf', q{

src/bin/pg_waldump/t/004_save_fullpage_encrypted.pl

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ sub get_block_lsn
4242

4343
$node->safe_psql('postgres', "CREATE EXTENSION IF NOT EXISTS pg_tde;");
4444
$node->safe_psql('postgres', "SELECT pg_tde_add_global_key_provider_file('file-keyring-wal','/tmp/pg_tde_test_keyring-wal.per');");;
45-
$node->safe_psql('postgres', "SELECT pg_tde_set_server_principal_key('global-db-principal-key', 'file-keyring-wal');");
45+
$node->safe_psql('postgres', "SELECT pg_tde_set_server_principal_key_global_provider('global-db-principal-key', 'file-keyring-wal');");
4646

4747
$node->append_conf(
4848
'postgresql.conf', q{

0 commit comments

Comments
 (0)