diff --git a/contrib/pg_tde/expected/delete_key_provider.out b/contrib/pg_tde/expected/delete_key_provider.out deleted file mode 100644 index d5724272619..00000000000 --- a/contrib/pg_tde/expected/delete_key_provider.out +++ /dev/null @@ -1,74 +0,0 @@ -CREATE EXTENSION IF NOT EXISTS pg_tde; -SELECT * FROM pg_tde_key_info(); -ERROR: Principal key does not exists for the database -HINT: Use set_key interface to set the principal key -SELECT pg_tde_add_database_key_provider_file('file-provider','/tmp/pg_tde_test_keyring.per'); - pg_tde_add_database_key_provider_file ---------------------------------------- - 1 -(1 row) - -SELECT * FROM pg_tde_list_all_database_key_providers(); - id | provider_name | provider_type | options -----+---------------+---------------+------------------------------------------------------------ - 1 | file-provider | file | {"type" : "file", "path" : "/tmp/pg_tde_test_keyring.per"} -(1 row) - -SELECT pg_tde_delete_database_key_provider('file-provider'); - pg_tde_delete_database_key_provider -------------------------------------- - -(1 row) - -SELECT * FROM pg_tde_list_all_database_key_providers(); - id | provider_name | provider_type | options -----+---------------+---------------+--------- -(0 rows) - -SELECT pg_tde_add_database_key_provider_file('file-provider','/tmp/pg_tde_test_keyring.per'); - pg_tde_add_database_key_provider_file ---------------------------------------- - 2 -(1 row) - -SELECT * FROM pg_tde_list_all_database_key_providers(); - id | provider_name | provider_type | options -----+---------------+---------------+------------------------------------------------------------ - 2 | file-provider | file | {"type" : "file", "path" : "/tmp/pg_tde_test_keyring.per"} -(1 row) - -SELECT pg_tde_delete_database_key_provider('file-provider'); - pg_tde_delete_database_key_provider -------------------------------------- - -(1 row) - -SELECT * FROM pg_tde_list_all_database_key_providers(); - id | provider_name | provider_type | options -----+---------------+---------------+--------- -(0 rows) - -SELECT pg_tde_add_database_key_provider_file('file-provider','/tmp/pg_tde_test_keyring.per'); - pg_tde_add_database_key_provider_file ---------------------------------------- - 3 -(1 row) - -SELECT * FROM pg_tde_list_all_database_key_providers(); - id | provider_name | provider_type | options -----+---------------+---------------+------------------------------------------------------------ - 3 | file-provider | file | {"type" : "file", "path" : "/tmp/pg_tde_test_keyring.per"} -(1 row) - -SELECT pg_tde_delete_database_key_provider('file-provider'); - pg_tde_delete_database_key_provider -------------------------------------- - -(1 row) - -SELECT * FROM pg_tde_list_all_database_key_providers(); - id | provider_name | provider_type | options -----+---------------+---------------+--------- -(0 rows) - -DROP EXTENSION pg_tde; diff --git a/contrib/pg_tde/expected/no_provider_error.out b/contrib/pg_tde/expected/no_provider_error.out deleted file mode 100644 index 434781a6c77..00000000000 --- a/contrib/pg_tde/expected/no_provider_error.out +++ /dev/null @@ -1,8 +0,0 @@ -CREATE EXTENSION pg_tde; --- should fail -CREATE TABLE t1 (n INT) USING tde_heap; -ERROR: failed to retrieve principal key. Create one using pg_tde_set_key before using encrypted tables. --- should work -CREATE TABLE t2 (n INT) USING heap; -DROP TABLE t2; -DROP EXTENSION pg_tde; diff --git a/contrib/pg_tde/sql/delete_key_provider.sql b/contrib/pg_tde/sql/delete_key_provider.sql deleted file mode 100644 index 935782f2656..00000000000 --- a/contrib/pg_tde/sql/delete_key_provider.sql +++ /dev/null @@ -1,20 +0,0 @@ -CREATE EXTENSION IF NOT EXISTS pg_tde; - -SELECT * FROM pg_tde_key_info(); - -SELECT pg_tde_add_database_key_provider_file('file-provider','/tmp/pg_tde_test_keyring.per'); -SELECT * FROM pg_tde_list_all_database_key_providers(); -SELECT pg_tde_delete_database_key_provider('file-provider'); -SELECT * FROM pg_tde_list_all_database_key_providers(); - -SELECT pg_tde_add_database_key_provider_file('file-provider','/tmp/pg_tde_test_keyring.per'); -SELECT * FROM pg_tde_list_all_database_key_providers(); -SELECT pg_tde_delete_database_key_provider('file-provider'); -SELECT * FROM pg_tde_list_all_database_key_providers(); - -SELECT pg_tde_add_database_key_provider_file('file-provider','/tmp/pg_tde_test_keyring.per'); -SELECT * FROM pg_tde_list_all_database_key_providers(); -SELECT pg_tde_delete_database_key_provider('file-provider'); -SELECT * FROM pg_tde_list_all_database_key_providers(); - -DROP EXTENSION pg_tde; diff --git a/contrib/pg_tde/sql/no_provider_error.sql b/contrib/pg_tde/sql/no_provider_error.sql deleted file mode 100644 index abe2e18cbcc..00000000000 --- a/contrib/pg_tde/sql/no_provider_error.sql +++ /dev/null @@ -1,11 +0,0 @@ -CREATE EXTENSION pg_tde; - --- should fail -CREATE TABLE t1 (n INT) USING tde_heap; - --- should work -CREATE TABLE t2 (n INT) USING heap; - -DROP TABLE t2; - -DROP EXTENSION pg_tde;