8000 Remove double prefix from provider name and id · percona/postgres@fcc9f25 · GitHub
[go: up one dir, main page]
Skip to content

Commit fcc9f25

Browse files
AndersAstrandAndersAstrand
committed
Remove double prefix from provider name and id
In the output from the key info functions the key_ prefix for the provider name and id columns doesn't add any value so let's harmonize them with how we name arguments to the key creation functions.
1 parent ab09583 commit fcc9f25

12 files changed

+134
-134
lines changed

‎contrib/pg_tde/expected/default_principal_key.out

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ SELECT pg_tde_add_global_key_provider_file('file-provider','/tmp/pg_tde_regressi
1010
SELECT pg_tde_verify_default_key();
1111
ERROR: principal key not configured for current database
1212
-- Should fail: no default principal key for the server yet
13-
SELECT key_provider_id, key_provider_name, key_name
13+
SELECT provider_id, provider_name, key_name
1414
FROM pg_tde_default_key_info();
15-
key_provider_id | key_provider_name | key_name
16-
-----------------+-------------------+----------
17-
| |
15+
provider_id | provider_name | key_name
16+
-------------+---------------+----------
17+
| |
1818
(1 row)
1919

2020
SELECT pg_tde_set_default_key_using_global_key_provider('default-key', 'file-provider', false);
@@ -29,11 +29,11 @@ SELECT pg_tde_verify_default_key();
2929

3030
(1 row)
3131

32-
SELECT key_provider_id, key_provider_name, key_name
32+
SELECT provider_id, provider_name, key_name
3333
FROM pg_tde_default_key_info();
34-
key_provider_id | key_provider_name | key_name
35-
-----------------+-------------------+-------------
36-
-2 | file-provider | default-key
34+
provider_id | provider_name | key_name
35+
-------------+---------------+-------------
36+
-2 | file-provider | default-key
3737
(1 row)
3838

3939
-- fails
@@ -46,11 +46,11 @@ SELECT id, name FROM pg_tde_list_all_global_key_providers();
4646
(1 row)
4747

4848
-- Should fail: no principal key for the database yet
49-
SELECT key_provider_id, key_provider_name, key_name
49+
SELECT provider_id, provider_name, key_name
5050
FROM pg_tde_key_info();
51-
key_provider_id | key_provider_name | key_name
52-
-----------------+-------------------+----------
53-
| |
51+
provider_id | provider_name | key_name
52+
-------------+---------------+----------
53+
| |
5454
(1 row)
5555

5656
-- Should succeed: "localizes" the default principal key for the database
@@ -61,11 +61,11 @@ CREATE TABLE test_enc(
6161
) USING tde_heap;
6262
INSERT INTO test_enc (k) VALUES (1), (2), (3);
6363
-- Should succeed: create table localized the principal key
64-
SELECT key_provider_id, key_provider_name, key_name
64+
SELECT provider_id, provider_name, key_name
6565
FROM pg_tde_key_info();
66-
key_provider_id | key_provider_name | key_name
67-
-----------------+-------------------+-------------
68-
-2 | file-provider | default-key
66+
provider_id | provider_name | key_name
67+
-------------+---------------+-------------
68+
-2 | file-provider | default-key
6969
(1 row)
7070

7171
SELECT current_database() AS regress_database
@@ -75,11 +75,11 @@ CREATE DATABASE regress_pg_tde_other;
7575
CREATE EXTENSION pg_tde;
7676
CREATE EXTENSION pg_buffercache;
7777
-- Should fail: no principal key for the database yet
78-
SELECT key_provider_id, key_provider_name, key_name
78+
SELECT provider_id, provider_name, key_name
7979
FROM pg_tde_key_info();
80-
key_provider_id | key_provider_name | key_name
81-
-----------------+-------------------+----------
82-
| |
80+
provider_id | provider_name | key_name
81+
-------------+---------------+----------
82+
| |
8383
(1 row)
8484

8585
-- Should succeed: "localizes" the default principal key for the database
@@ -90,11 +90,11 @@ CREATE TABLE test_enc(
9090
) USING tde_heap;
9191
INSERT INTO test_enc (k) VALUES (1), (2), (3);
9292
-- Should succeed: create table localized the principal key
93-
SELECT key_provider_id, key_provider_name, key_name
93+
SELECT provider_id, provider_name, key_name
9494
FROM pg_tde_key_info();
95-
key_provider_id | key_provider_name | key_name
96-
-----------------+-------------------+-------------
97-
-2 | file-provider | default-key
95+
provider_id | provider_name | key_name
96+
-------------+---------------+-------------
97+
-2 | file-provider | default-key
9898
(1 row)
9999

100100
\c :regress_database
@@ -105,19 +105,19 @@ SELECT pg_tde_set_default_key_using_global_key_provider('new-default-key', 'file
105105

106106
(1 row)
107107

108-
SELECT key_provider_id, key_provider_name, key_name
108+
SELECT provider_id, provider_name, key_name
109109
FROM pg_tde_key_info();
110-
key_provider_id | key_provider_name | key_name
111-
-----------------+-------------------+-----------------
112-
-2 | file-provider | new-default-key
110+
provider_id | provider_name | key_name
111+
-------------+---------------+-----------------
112+
-2 | file-provider | new-default-key
113113
(1 row)
114114

115115
\c regress_pg_tde_other
116-
SELECT key_provider_id, key_provider_name, key_name
116+
SELECT provider_id, provider_name, key_name
117117
FROM pg_tde_key_info();
118-
key_provider_id | key_provider_name | key_name
119-
-----------------+-------------------+-----------------
120-
-2 | file-provider | new-default-key
118+
provider_id | provider_name | key_name
119+
-------------+---------------+-----------------
120+
-2 | file-provider | new-default-key
121121
(1 row)
122122

123123
SELECT pg_buffercache_evict(bufferid) FROM pg_buffercache WHERE relfilenode = (SELECT relfilenode FROM pg_class WHERE oid = 'test_enc'::regclass);

‎contrib/pg_tde/expected/delete_principal_key.out

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ SELECT pg_tde_set_key_using_global_key_provider('test-db-key','file-provider');
1313

1414
(1 row)
1515

16-
SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_key_info();
17-
key_provider_id | key_provider_name | key_name
18-
-----------------+-------------------+-------------
19-
-3 | file-provider | test-db-key
16+
SELECT provider_id, provider_name, key_name FROM pg_tde_key_info();
17+
provider_id | provider_name | key_name
18+
-------------+---------------+-------------
19+
-3 | file-provider | test-db-key
2020
(1 row)
2121

2222
SELECT pg_tde_delete_key();
@@ -84,10 +84,10 @@ SELECT pg_tde_delete_key();
8484

8585
(1 row)
8686

87-
SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_key_info();
88-
key_provider_id | key_provider_name | key_name
89-
-----------------+-------------------+-------------
90-
-3 | file-provider | defalut-key
87+
SELECT provider_id, provider_name, key_name FROM pg_tde_key_info();
88+
provider_id | provider_name | key_name
89+
-------------+---------------+-------------
90+
-3 | file-provider | defalut-key
9191
(1 row)
9292

9393
-- Try to delete key when default key is used

‎contrib/pg_tde/expected/key_provider.out

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
CREATE EXTENSION IF NOT EXISTS pg_tde;
22
SELECT * FROM pg_tde_key_info();
3-
key_name | key_provider_name | key_provider_id | key_creation_time
4-
----------+-------------------+-----------------+-------------------
5-
| | |
3+
key_name | provider_name | provider_id | key_creation_time
4+
----------+---------------+-------------+-------------------
5+
| | |
66
(1 row)
77

88
SELECT pg_tde_add_database_key_provider('file', 'incorrect-file-provider', '{"path": {"foo": "/tmp/pg_tde_test_keyring.per"}}');

‎contrib/pg_tde/expected/pg_tde_is_encrypted.out

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,11 @@ SELECT pg_tde_is_encrypted(NULL);
7777

7878
(1 row)
7979

80-
SELECT key_provider_id, key_provider_name, key_name
80+
SELECT provider_id, provider_name, key_name
8181
FROM pg_tde_key_info();
82-
key_provider_id | key_provider_name | key_name
83-
-----------------+-------------------+-------------
84-
1 | file-vault | test-db-key
82+
provider_id | provider_name | key_name
83+
-------------+---------------+-------------
84+
1 | file-vault | test-db-key
8585
(1 row)
8686

8787
DROP TABLE test_temp_norm;

‎contrib/pg_tde/pg_tde--1.0-rc.sql

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -271,26 +271,26 @@ REVOKE ALL ON FUNCTION pg_tde_delete_default_key() FROM PUBLIC;
271271

272272
CREATE FUNCTION pg_tde_key_info()
273273
RETURNS TABLE ( key_name TEXT,
274-
key_provider_name TEXT,
275-
key_provider_id INT,
274+
provider_name TEXT,
275+
provider_id INT,
276276
key_creation_time TIMESTAMP WITH TIME ZONE)
277277
LANGUAGE C
278278
AS 'MODULE_PATHNAME';
279279
REVOKE ALL ON FUNCTION pg_tde_key_info() FROM PUBLIC;
280280

281281
CREATE FUNCTION pg_tde_server_key_info()
282282
RETURNS TABLE ( key_name TEXT,
283-
key_provider_name TEXT,
284-
key_provider_id INT,
283+
provider_name TEXT,
284+
provider_id INT,
285285
key_creation_time TIMESTAMP WITH TIME ZONE)
286286
LANGUAGE C
287287
AS 'MODULE_PATHNAME';
288288
REVOKE ALL ON FUNCTION pg_tde_server_key_info() FROM PUBLIC;
289289

290290
CREATE FUNCTION pg_tde_default_key_info()
291291
RETURNS TABLE ( key_name TEXT,
292-
key_provider_name TEXT,
293-
key_provider_id INT,
292+
provider_name TEXT,
293+
provider_id INT,
294294
key_creation_time TIMESTAMP WITH TIME ZONE)
295295
LANGUAGE C
296296
AS 'MODULE_PATHNAME';

‎contrib/pg_tde/sql/default_principal_key.sql

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@ SELECT pg_tde_add_global_key_provider_file('file-provider','/tmp/pg_tde_regressi
77
SELECT pg_tde_verify_default_key();
88

99
-- Should fail: no default principal key for the server yet
10-
SELECT key_provider_id, key_provider_name, key_name
10+
SELECT provider_id, provider_name, key_name
1111
FROM pg_tde_default_key_info();
1212

1313
SELECT pg_tde_set_default_key_using_global_key_provider('default-key', 'file-provider', false);
1414
SELECT pg_tde_verify_default_key();
1515

16-
SELECT key_provider_id, key_provider_name, key_name
16+
SELECT provider_id, provider_name, key_name
1717
FROM pg_tde_default_key_info();
1818

1919
-- fails
2020
SELECT pg_tde_delete_global_key_provider('file-provider');
2121
SELECT id, name FROM pg_tde_list_all_global_key_providers();
2222

2323
-- Should fail: no principal key for the database yet
24-
SELECT key_provider_id, key_provider_name, key_name
24+
SELECT provider_id, provider_name, key_name
2525
FROM pg_tde_key_info();
2626

2727
-- Should succeed: "localizes" the default principal key for the database
@@ -34,7 +34,7 @@ CREATE TABLE test_enc(
3434
INSERT INTO test_enc (k) VALUES (1), (2), (3);
3535

3636
-- Should succeed: create table localized the principal key
37-
SELECT key_provider_id, key_provider_name, key_name
37+
SELECT provider_id, provider_name, key_name
3838
FROM pg_tde_key_info();
3939

4040
SELECT current_database() AS regress_database
@@ -48,7 +48,7 @@ CREATE EXTENSION pg_tde;
4848
CREATE EXTENSION pg_buffercache;
4949

5050
-- Should fail: no principal key for the database yet
51-
SELECT key_provider_id, key_provider_name, key_name
51+
SELECT provider_id, provider_name, key_name
5252
FROM pg_tde_key_info();
5353

5454
-- Should succeed: "localizes" the default principal key for the database
@@ -61,7 +61,7 @@ CREATE TABLE test_enc(
6161
INSERT INTO test_enc (k) VALUES (1), (2), (3);
6262

6363
-- Should succeed: create table localized the principal key
64-
SELECT key_provider_id, key_provider_name, key_name
64+
SELECT provider_id, provider_name, key_name
6565
FROM pg_tde_key_info();
6666

6767
\c :regress_database
@@ -70,12 +70,12 @@ CHECKPOINT;
7070

7171
SELECT pg_tde_set_default_key_using_global_key_provider('new-default-key', 'file-provider', false);
7272

73-
SELECT key_provider_id, key_provider_name, key_name
73+
SELECT provider_id, provider_name, key_name
7474
FROM pg_tde_key_info();
7575

7676
\c regress_pg_tde_other
7777

78-
SELECT key_provider_id, key_provider_name, key_name
78+
SELECT provider_id, provider_name, key_name
7979
FROM pg_tde_key_info();
8080

8181
SELECT pg_buffercache_evict(bufferid) FROM pg_buffercache WHERE relfilenode = (SELECT relfilenode FROM pg_class WHERE oid = 'test_enc'::regclass);

‎contrib/pg_tde/sql/delete_principal_key.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ SELECT pg_tde_add_global_key_provider_file('file-provider','/tmp/pg_tde_test_key
55
-- Set the local key and delete it without any encrypted tables
66
-- Should succeed: nothing used the key
77
SELECT pg_tde_set_key_using_global_key_provider('test-db-key','file-provider');
8-
SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_key_info();
8+
SELECT provider_id, provider_name, key_name FROM pg_tde_key_info();
99
SELECT pg_tde_delete_key();
1010

1111
-- Set local key, encrypt a table, and delete the key
@@ -32,7 +32,7 @@ SELECT pg_tde_set_default_key_using_global_key_provider('defalut-key','file-prov
3232
SELECT pg_tde_set_key_using_global_key_provider('test-db-key','file-provider');
3333
CREATE TABLE test_table (id int, data text) USING tde_heap;
3434
SELECT pg_tde_delete_key();
35-
SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_key_info();
35+
SELECT provider_id, provider_name, key_name FROM pg_tde_key_info();
3636

3737
-- Try to delete key when default key is used
3838
-- Should fail: table already uses the default key, so there is no key to fallback to

‎contrib/pg_tde/sql/pg_tde_is_encrypted.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ SELECT relname, pg_tde_is_encrypted(relname) FROM (VALUES ('test_enc_pkey'), ('t
3838

3939
SELECT pg_tde_is_encrypted(NULL);
4040

41-
SELECT key_provider_id, key_provider_name, key_name
41+
SELECT provider_id, provider_name, key_name
4242
FROM pg_tde_key_info();
4343

4444
DROP TABLE test_temp_norm;

0 commit comments

Comments
 (0)
0