Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Be confident about pg_tde not existing in tests #431

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contrib/pg_tde/expected/access_control.out
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
\! rm -f '/tmp/pg_tde_test_keyring.per'
CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;
SELECT pg_tde_add_database_key_provider_file('local-file-provider', '/tmp/pg_tde_test_keyring.per');
pg_tde_add_database_key_provider_file
---------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/expected/alter_index.out
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
\! rm -f '/tmp/pg_tde_test_keyring.per'
CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;
SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');
pg_tde_add_database_key_provider_file
---------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/expected/cache_alloc.out
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
\! rm -f '/tmp/pg_tde_test_keyring.per'
-- Just checking there are no mem debug WARNINGs during the cache population
CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;
SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');
pg_tde_add_database_key_provider_file
---------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/expected/change_access_method.out
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
\! rm -f '/tmp/pg_tde_test_keyring.per'
CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;
SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/pg_tde_test_keyring.per');
pg_tde_add_database_key_provider_file
---------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/expected/create_database.out
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
\! rm -f '/tmp/template_provider_global.per'
\! rm -f '/tmp/template_provider.per'
CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;
CREATE DATABASE template_db;
SELECT current_database() AS regress_database
\gset
Expand Down
4 changes: 2 additions & 2 deletions contrib/pg_tde/expected/default_principal_key.out
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
\! rm -f '/tmp/pg_tde_regression_default_key.per'
CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION IF NOT EXISTS pg_buffercache;
CREATE EXTENSION pg_tde;
CREATE EXTENSION pg_buffercache;
SELECT pg_tde_add_global_key_provider_file('file-provider','/tmp/pg_tde_regression_default_key.per');
pg_tde_add_global_key_provider_file
-------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/expected/delete_principal_key.out
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
\! rm -f '/tmp/pg_tde_test_keyring.per'
CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;
SELECT pg_tde_add_global_key_provider_file('file-provider','/tmp/pg_tde_test_keyring.per');
pg_tde_add_global_key_provider_file
-------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/expected/insert_update_delete.out
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
\! rm -f '/tmp/pg_tde_test_keyring.per'
CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;
SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');
pg_tde_add_database_key_provider_file
---------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/expected/key_provider.out
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
\! rm -f '/tmp/global-provider-file-1'
\! rm -f '/tmp/pg_tde_test_keyring.per'
\! rm -f '/tmp/pg_tde_test_keyring2.per'
CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;
SELECT * FROM pg_tde_key_info();
key_name | provider_name | provider_id | key_creation_time
----------+---------------+-------------+-------------------
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/expected/pg_tde_is_encrypted.out
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
\! rm -f '/tmp/pg_tde_test_keyring.per'
CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;
SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');
pg_tde_add_database_key_provider_file
---------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/expected/recreate_storage.out
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
\! rm -f '/tmp/pg_tde_test_keyring.per'
CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;
SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');
pg_tde_add_database_key_provider_file
---------------------------------------
Expand Down
3 changes: 0 additions & 3 deletions contrib/pg_tde/expected/relocate.out
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
-- Support pg_tde already being installed
SET client_min_messages = 'warning';
DROP EXTENSION IF EXISTS pg_tde;
CREATE SCHEMA other;
CREATE EXTENSION pg_tde SCHEMA other;
SELECT other.pg_tde_add_database_key_provider_file('file-vault', '/tmp/pg_tde_test_keyring.per');
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/expected/tablespace.out
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
\! rm -f '/tmp/pg_tde_test_keyring.per'
CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;
SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');
pg_tde_add_database_key_provider_file
---------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/expected/toast_decrypt.out
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
\! rm -f '/tmp/pg_tde_test_keyring.per'
CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;
SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');
pg_tde_add_database_key_provider_file
---------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/expected/vault_v2_test.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;
\getenv root_token_file VAULT_ROOT_TOKEN_FILE
\getenv cacert_file VAULT_CACERT_FILE
SELECT pg_tde_add_database_key_provider_vault_v2('vault-incorrect', 'https://127.0.0.1:8200', 'DUMMY-TOKEN', :'root_token_file', :'cacert_file');
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/sql/access_control.sql
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
\! rm -f '/tmp/pg_tde_test_keyring.per'

CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;

SELECT pg_tde_add_database_key_provider_file('local-file-provider', '/tmp/pg_tde_test_keyring.per');

Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/sql/alter_index.sql
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
\! rm -f '/tmp/pg_tde_test_keyring.per'

CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;

SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');
SELECT pg_tde_create_key_using_database_key_provider('test-db-key','file-vault');
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/sql/cache_alloc.sql
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

-- Just checking there are no mem debug WARNINGs during the cache population

CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;

SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');
SELECT pg_tde_create_key_using_database_key_provider('test-db-key','file-vault');
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/sql/change_access_method.sql
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
\! rm -f '/tmp/pg_tde_test_keyring.per'

CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;

SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/pg_tde_test_keyring.per');
SELECT pg_tde_create_key_using_database_key_provider('test-db-key', 'file-vault');
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/sql/create_database.sql
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
\! rm -f '/tmp/template_provider_global.per'
\! rm -f '/tmp/template_provider.per'

CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;

CREATE DATABASE template_db;

Expand Down
4 changes: 2 additions & 2 deletions contrib/pg_tde/sql/default_principal_key.sql
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
\! rm -f '/tmp/pg_tde_regression_default_key.per'

CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION IF NOT EXISTS pg_buffercache;
CREATE EXTENSION pg_tde;
CREATE EXTENSION pg_buffercache;

SELECT pg_tde_add_global_key_provider_file('file-provider','/tmp/pg_tde_regression_default_key.per');

Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/sql/delete_principal_key.sql
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
\! rm -f '/tmp/pg_tde_test_keyring.per'

CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;

SELECT pg_tde_add_global_key_provider_file('file-provider','/tmp/pg_tde_test_keyring.per');
SELECT pg_tde_create_key_using_global_key_provider('defalut-key','file-provider');
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/sql/insert_update_delete.sql
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
\! rm -f '/tmp/pg_tde_test_keyring.per'

CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;

SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');
SELECT pg_tde_create_key_using_database_key_provider('test-db-key','file-vault');
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/sql/key_provider.sql
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
\! rm -f '/tmp/pg_tde_test_keyring.per'
\! rm -f '/tmp/pg_tde_test_keyring2.per'

CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;

SELECT * FROM pg_tde_key_info();

Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/sql/pg_tde_is_encrypted.sql
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
\! rm -f '/tmp/pg_tde_test_keyring.per'

CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;

SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');
SELECT pg_tde_create_key_using_database_key_provider('test-db-key','file-vault');
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/sql/recreate_storage.sql
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
\! rm -f '/tmp/pg_tde_test_keyring.per'

CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;

SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');
SELECT pg_tde_create_key_using_database_key_provider('test-db-key','file-vault');
Expand Down
4 changes: 0 additions & 4 deletions contrib/pg_tde/sql/relocate.sql
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
-- Support pg_tde already being installed
SET client_min_messages = 'warning';
DROP EXTENSION IF EXISTS pg_tde;

CREATE SCHEMA other;

CREATE EXTENSION pg_tde SCHEMA other;
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/sql/tablespace.sql
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
\! rm -f '/tmp/pg_tde_test_keyring.per'

CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;

SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');
SELECT pg_tde_create_key_using_database_key_provider('test-db-key','file-vault');
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/sql/toast_decrypt.sql
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
\! rm -f '/tmp/pg_tde_test_keyring.per'

CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;

SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');
SELECT pg_tde_create_key_using_database_key_provider('test-db-key','file-vault');
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/sql/vault_v2_test.sql
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;

\getenv root_token_file VAULT_ROOT_TOKEN_FILE
\getenv cacert_file VAULT_CACERT_FILE
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/t/basic.pl
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
$node->append_conf('postgresql.conf', "shared_preload_libraries = 'pg_tde'");
$node->start;

PGTDE::psql($node, 'postgres', 'CREATE EXTENSION IF NOT EXISTS pg_tde;');
PGTDE::psql($node, 'postgres', 'CREATE EXTENSION pg_tde;');

# Only whitelisted C or security definer functions are granted to public by default
PGTDE::psql(
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/t/change_key_provider.pl
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
$node->append_conf('postgresql.conf', "shared_preload_libraries = 'pg_tde'");
$node->start;

PGTDE::psql($node, 'postgres', 'CREATE EXTENSION IF NOT EXISTS pg_tde;');
PGTDE::psql($node, 'postgres', 'CREATE EXTENSION pg_tde;');

PGTDE::psql($node, 'postgres',
"SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/change_key_provider_1.per');"
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/t/crash_recovery.pl
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
});
$node->start;

PGTDE::psql($node, 'postgres', 'CREATE EXTENSION IF NOT EXISTS pg_tde;');
PGTDE::psql($node, 'postgres', 'CREATE EXTENSION pg_tde;');
PGTDE::psql($node, 'postgres',
"SELECT pg_tde_add_global_key_provider_file('global_keyring', '/tmp/crash_recovery.per');"
);
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/t/expected/basic.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;
SELECT
pg_proc.oid::regprocedure
FROM
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/t/expected/change_key_provider.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;
SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/change_key_provider_1.per');
pg_tde_add_database_key_provider_file
---------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/t/expected/crash_recovery.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;
SELECT pg_tde_add_global_key_provider_file('global_keyring', '/tmp/crash_recovery.per');
pg_tde_add_global_key_provider_file
-------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/t/expected/key_rotate_tablespace.out
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SET allow_in_place_tablespaces = true; CREATE TABLESPACE test_tblspace LOCATION '';
CREATE DATABASE tbc TABLESPACE = test_tblspace;
CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;
SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/key_rotate_tablespace.per');
pg_tde_add_database_key_provider_file
---------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/t/expected/multiple_extensions.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;
CREATE TABLE test_enc1 (id SERIAL, k INTEGER, PRIMARY KEY (id)) USING tde_heap;
INSERT INTO test_enc1 (k) VALUES (5), (6);
SELECT * FROM test_enc1 ORDER BY id;
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/t/expected/replication.out
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
-- At primary
CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;
SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/replication.per');
pg_tde_add_database_key_provider_file
---------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/t/expected/rotate_key.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;
SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/rotate_key.per');
pg_tde_add_database_key_provider_file
---------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/t/expected/tde_heap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;
SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/tde_heap.per');
pg_tde_add_database_key_provider_file
---------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/t/expected/unlogged_tables.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;
SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/unlogged_tables.per');
pg_tde_add_database_key_provider_file
---------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/t/expected/wal_encrypt.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CREATE EXTENSION IF NOT EXISTS pg_tde;
CREATE EXTENSION pg_tde;
SELECT pg_tde_add_global_key_provider_file('file-keyring-010', '/tmp/wal_encrypt.per');
pg_tde_add_global_key_provider_file
-------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/t/key_rotate_tablespace.pl
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
PGTDE::psql($node, 'postgres',
'CREATE DATABASE tbc TABLESPACE = test_tblspace;');

PGTDE::psql($node, 'tbc', 'CREATE EXTENSION IF NOT EXISTS pg_tde;');
PGTDE::psql($node, 'tbc', 'CREATE EXTENSION pg_tde;');
PGTDE::psql($node, 'tbc',
"SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/key_rotate_tablespace.per');"
);
Expand Down
6 changes: 2 additions & 4 deletions contrib/pg_tde/t/multiple_extensions.pl
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,8 @@
PGTDE::append_to_debug_file($stdout);

# Create pg_tde extension
($cmdret, $stdout, $stderr) = $node->psql(
'postgres',
'CREATE EXTENSION IF NOT EXISTS pg_tde;',
extra_params => ['-a']);
($cmdret, $stdout, $stderr) =
$node->psql('postgres', 'CREATE EXTENSION pg_tde;', extra_params => ['-a']);
ok($cmdret == 0, "CREATE PGTDE EXTENSION");
PGTDE::append_to_result_file($stdout);

Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/t/pg_tde_change_key_provider.pl
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
$node->append_conf('postgresql.conf', q{shared_preload_libraries = 'pg_tde'});
$node->start;

$node->safe_psql('postgres', q{CREATE EXTENSION IF NOT EXISTS pg_tde});
$node->safe_psql('postgres', q{CREATE EXTENSION pg_tde});
$node->safe_psql('postgres',
q{SELECT pg_tde_add_global_key_provider_file('global-provider', '/tmp/pg_tde_change_key_provider-global')}
);
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/t/pg_waldump_basic.pl
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
});
$node->start;

$node->safe_psql('postgres', "CREATE EXTENSION IF NOT EXISTS pg_tde;");
$node->safe_psql('postgres', "CREATE EXTENSION pg_tde;");
$node->safe_psql('postgres',
"SELECT pg_tde_add_global_key_provider_file('file-keyring-wal', '/tmp/pg_waldump_basic.per');"
);
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/t/pg_waldump_fullpage.pl
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ sub get_block_lsn
});
$node->start;

$node->safe_psql('postgres', "CREATE EXTENSION IF NOT EXISTS pg_tde;");
$node->safe_psql('postgres', "CREATE EXTENSION pg_tde;");
$node->safe_psql('postgres',
"SELECT pg_tde_add_global_key_provider_file('file-keyring-wal', '/tmp/pg_waldump_fullpage.per');"
);
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/t/replication.pl
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

PGTDE::append_to_result_file("-- At primary");

PGTDE::psql($primary, 'postgres', 'CREATE EXTENSION IF NOT EXISTS pg_tde;');
PGTDE::psql($primary, 'postgres', 'CREATE EXTENSION pg_tde;');
PGTDE::psql($primary, 'postgres',
"SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/replication.per');"
);
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/t/rotate_key.pl
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
$node->append_conf('postgresql.conf', "shared_preload_libraries = 'pg_tde'");
$node->start;

PGTDE::psql($node, 'postgres', 'CREATE EXTENSION IF NOT EXISTS pg_tde;');
PGTDE::psql($node, 'postgres', 'CREATE EXTENSION pg_tde;');

PGTDE::psql($node, 'postgres',
"SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/rotate_key.per');"
Expand Down
2 changes: 1 addition & 1 deletion contrib/pg_tde/t/tde_heap.pl
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
$node->append_conf('postgresql.conf', "shared_preload_libraries = 'pg_tde'");
$node->start;

PGTDE::psql($node, 'postgres', 'CREATE EXTENSION IF NOT EXISTS pg_tde;');
PGTDE::psql($node, 'postgres', 'CREATE EXTENSION pg_tde;');

PGTDE::psql($node, 'postgres',
"SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/tde_heap.per');"
Expand Down
Loading