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

Skip to content

Clean up some prefixes for function parameters #418

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.

Sign up for GitHub

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
merged 2 commits into from
Jun 12, 2025
Merged

Clean up some prefixes for function parameters #418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab09583
Remove provider_ prefix from parameter names
AndersAstrand Jun 11, 2025
324ac4c
Remove double prefix from provider name and id
AndersAstrand Jun 11, 2025
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
68 changes: 34 additions & 34 deletions contrib/pg_tde/expected/default_principal_key.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ SELECT pg_tde_add_global_key_provider_file('file-provider','/tmp/pg_tde_regressi
SELECT pg_tde_verify_default_key();
ERROR: principal key not configured for current database
-- Should fail: no default principal key for the server yet
SELECT key_provider_id, key_provider_name, key_name
SELECT provider_id, provider_name, key_name
FROM pg_tde_default_key_info();
key_provider_id | key_provider_name | key_name
-----------------+-------------------+----------
| |
provider_id | provider_name | key_name
-------------+---------------+----------
| |
(1 row)

SELECT pg_tde_set_default_key_using_global_key_provider('default-key', 'file-provider', false);
Expand All @@ -29,28 +29,28 @@ SELECT pg_tde_verify_default_key();

(1 row)

SELECT key_provider_id, key_provider_name, key_name
SELECT provider_id, provider_name, key_name
FROM pg_tde_default_key_info();
key_provider_id | key_provider_name | key_name
-----------------+-------------------+-------------
-2 | file-provider | default-key
provider_id | provider_name | key_name
-------------+---------------+-------------
-2 | file-provider | default-key
(1 row)

-- fails
SELECT pg_tde_delete_global_key_provider('file-provider');
ERROR: Can't delete a provider which is currently in use
SELECT id, provider_name FROM pg_tde_list_all_global_key_providers();
id | provider_name
SELECT id, name FROM pg_tde_list_all_global_key_providers();
id | name
----+---------------
-2 | file-provider
(1 row)

-- Should fail: no principal key for the database yet
SELECT key_provider_id, key_provider_name, key_name
SELECT provider_id, provider_name, key_name
FROM pg_tde_key_info();
key_provider_id | key_provider_name | key_name
-----------------+-------------------+----------
| |
provider_id | provider_name | key_name
-------------+---------------+----------
| |
(1 row)

-- Should succeed: "localizes" the default principal key for the database
Expand All @@ -61,11 +61,11 @@ CREATE TABLE test_enc(
) USING tde_heap;
INSERT INTO test_enc (k) VALUES (1), (2), (3);
-- Should succeed: create table localized the principal key
SELECT key_provider_id, key_provider_name, key_name
SELECT provider_id, provider_name, key_name
FROM pg_tde_key_info();
key_provider_id | key_provider_name | key_name
-----------------+-------------------+-------------
-2 | file-provider | default-key
provider_id | provider_name | key_name
-------------+---------------+-------------
-2 | file-provider | default-key
(1 row)

SELECT current_database() AS regress_database
Expand All @@ -75,11 +75,11 @@ CREATE DATABASE regress_pg_tde_other;
CREATE EXTENSION pg_tde;
CREATE EXTENSION pg_buffercache;
-- Should fail: no principal key for the database yet
SELECT key_provider_id, key_provider_name, key_name
SELECT provider_id, provider_name, key_name
FROM pg_tde_key_info();
key_provider_id | key_provider_name | key_name
-----------------+-------------------+----------
| |
provider_id | provider_name | key_name
-------------+---------------+----------
| |
(1 row)

-- Should succeed: "localizes" the default principal key for the database
Expand All @@ -90,11 +90,11 @@ CREATE TABLE test_enc(
) USING tde_heap;
INSERT INTO test_enc (k) VALUES (1), (2), (3);
-- Should succeed: create table localized the principal key
SELECT key_provider_id, key_provider_name, key_name
SELECT provider_id, provider_name, key_name
FROM pg_tde_key_info();
key_provider_id | key_provider_name | key_name
-----------------+-------------------+-------------
-2 | file-provider | default-key
provider_id | provider_name | key_name
-------------+---------------+-------------
-2 | file-provider | default-key
(1 row)

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

(1 row)

SELECT key_provider_id, key_provider_name, key_name
SELECT provider_id, provider_name, key_name
FROM pg_tde_key_info();
key_provider_id | key_provider_name | key_name
-----------------+-------------------+-----------------
-2 | file-provider | new-default-key
provider_id | provider_name | key_name
-------------+---------------+-----------------
-2 | file-provider | new-default-key
(1 row)

\c regress_pg_tde_other
SELECT key_provider_id, key_provider_name, key_name
SELECT provider_id, provider_name, key_name
FROM pg_tde_key_info();
key_provider_id | key_provider_name | key_name
-----------------+-------------------+-----------------
-2 | file-provider | new-default-key
provider_id | provider_name | key_name
-------------+---------------+-----------------
-2 | file-provider | new-default-key
(1 row)

SELECT pg_buffercache_evict(bufferid) FROM pg_buffercache WHERE relfilenode = (SELECT relfilenode FROM pg_class WHERE oid = 'test_enc'::regclass);
Expand Down
16 changes: 8 additions & 8 deletions contrib/pg_tde/expected/delete_principal_key.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ SELECT pg_tde_set_key_using_global_key_provider('test-db-key','file-provider');

(1 row)

SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_key_info();
key_provider_id | key_provider_name | key_name
-----------------+-------------------+-------------
-3 | file-provider | test-db-key
SELECT provider_id, provider_name, key_name FROM pg_tde_key_info();
provider_id | provider_name | key_name
-------------+---------------+-------------
-3 | file-provider | test-db-key
(1 row)

SELECT pg_tde_delete_key();
Expand Down Expand Up @@ -84,10 +84,10 @@ SELECT pg_tde_delete_key();

(1 row)

SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_key_info();
key_provider_id | key_provider_name | key_name
-----------------+-------------------+-------------
-3 | file-provider | defalut-key
SELECT provider_id, provider_name, key_name FROM pg_tde_key_info();
provider_id | provider_name | key_name
-------------+---------------+-------------
-3 | file-provider | defalut-key
(1 row)

-- Try to delete key when default key is used
Expand Down
56 changes: 28 additions & 28 deletions contrib/pg_tde/expected/key_provider.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
CREATE EXTENSION IF NOT EXISTS pg_tde;
SELECT * FROM pg_tde_key_info();
key_name | key_provider_name | key_provider_id | key_creation_time
----------+-------------------+-----------------+-------------------
| | |
key_name | provider_name | provider_id | key_creation_time
----------+---------------+-------------+-------------------
| | |
(1 row)

SELECT pg_tde_add_database_key_provider('file', 'incorrect-file-provider', '{"path": {"foo": "/tmp/pg_tde_test_keyring.per"}}');
Expand All @@ -22,10 +22,10 @@ SELECT pg_tde_add_database_key_provider_file('file-provider2','/tmp/pg_tde_test_
SELECT pg_tde_add_database_key_provider_file('file-provider','/tmp/pg_tde_test_keyring_dup.per');
ERROR: Key provider "file-provider" already exists.
SELECT * FROM pg_tde_list_all_database_key_providers();
id | provider_name | provider_type | options
----+----------------+---------------+--------------------------------------------
1 | file-provider | file | {"path" : "/tmp/pg_tde_test_keyring.per"}
2 | file-provider2 | file | {"path" : "/tmp/pg_tde_test_keyring2.per"}
id | name | type | options
----+----------------+------+--------------------------------------------
1 | file-provider | file | {"path" : "/tmp/pg_tde_test_keyring.per"}
2 | file-provider2 | file | {"path" : "/tmp/pg_tde_test_keyring2.per"}
(2 rows)

SELECT pg_tde_verify_key();
Expand All @@ -45,19 +45,19 @@ SELECT pg_tde_verify_key();
SELECT pg_tde_change_database_key_provider_file('not-existent-provider','/tmp/pg_tde_test_keyring.per');
ERROR: key provider "not-existent-provider" does not exists
SELECT * FROM pg_tde_list_all_database_key_providers();
id | provider_name | provider_type | options
----+----------------+---------------+--------------------------------------------
1 | file-provider | file | {"path" : "/tmp/pg_tde_test_keyring.per"}
2 | file-provider2 | file | {"path" : "/tmp/pg_tde_test_keyring2.per"}
id | name | type | options
----+----------------+------+--------------------------------------------
1 | file-provider | file | {"path" : "/tmp/pg_tde_test_keyring.per"}
2 | file-provider2 | file | {"path" : "/tmp/pg_tde_test_keyring2.per"}
(2 rows)

SELECT pg_tde_change_database_key_provider('file', 'file-provider', '{"path": {"foo": "/tmp/pg_tde_test_keyring.per"}}');
ERROR: key provider value cannot be an object
SELECT * FROM pg_tde_list_all_database_key_providers();
id | provider_name | provider_type | options
----+----------------+---------------+--------------------------------------------
1 | file-provider | file | {"path" : "/tmp/pg_tde_test_keyring.per"}
2 | file-provider2 | file | {"path" : "/tmp/pg_tde_test_keyring2.per"}
id | name | type | options
----+----------------+------+--------------------------------------------
1 | file-provider | file | {"path" : "/tmp/pg_tde_test_keyring.per"}
2 | file-provider2 | file | {"path" : "/tmp/pg_tde_test_keyring2.per"}
(2 rows)

SELECT pg_tde_add_global_key_provider_file('file-keyring','/tmp/pg_tde_test_keyring.per');
Expand All @@ -72,8 +72,8 @@ SELECT pg_tde_add_global_key_provider_file('file-keyring2','/tmp/pg_tde_test_key

(1 row)

SELECT id, provider_name FROM pg_tde_list_all_global_key_providers();
id | provider_name
SELECT id, name FROM pg_tde_list_all_global_key_providers();
id | name
----+---------------
-4 | file-keyring
-5 | file-keyring2
Expand All @@ -82,8 +82,8 @@ SELECT id, provider_name FROM pg_tde_list_all_global_key_providers();
-- fails
SELECT pg_tde_delete_database_key_provider('file-provider');
ERROR: Can't delete a provider which is currently in use
SELECT id, provider_name FROM pg_tde_list_all_database_key_providers();
id | provider_name
SELECT id, name FROM pg_tde_list_all_database_key_providers();
id | name
----+----------------
1 | file-provider
2 | file-provider2
Expand All @@ -96,14 +96,14 @@ SELECT pg_tde_delete_database_key_provider('file-provider2');

(1 row)

SELECT id, provider_name FROM pg_tde_list_all_database_key_providers();
id | provider_name
SELECT id, name FROM pg_tde_list_all_database_key_providers();
id | name
----+---------------
1 | file-provider
(1 row)

SELECT id, provider_name FROM pg_tde_list_all_global_key_providers();
id | provider_name
SELECT id, name FROM pg_tde_list_all_global_key_providers();
id | name
----+---------------
-4 | file-keyring
-5 | file-keyring2
Expand All @@ -118,8 +118,8 @@ SELECT pg_tde_set_key_using_global_key_provider('test-db-key', 'file-keyring', f
-- fails
SELECT pg_tde_delete_global_key_provider('file-keyring');
ERROR: Can't delete a provider which is currently in use
SELECT id, provider_name FROM pg_tde_list_all_global_key_providers();
id | provider_name
SELECT id, name FROM pg_tde_list_all_global_key_providers();
id | name
----+---------------
-4 | file-keyring
-5 | file-keyring2
Expand All @@ -132,9 +132,9 @@ SELECT pg_tde_delete_global_key_provider('file-keyring2');

(1 row)

SELECT id, provider_name FROM pg_tde_list_all_global_key_providers();
id | provider_name
----+---------------
SELECT id, name FROM pg_tde_list_all_global_key_providers();
id | name
----+--------------
-4 | file-keyring
(1 row)

Expand Down
8 changes: 4 additions & 4 deletions contrib/pg_tde/expected/pg_tde_is_encrypted.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@ SELECT pg_tde_is_encrypted(NULL);

(1 row)

SELECT key_provider_id, key_provider_name, key_name
SELECT provider_id, provider_name, key_name
FROM pg_tde_key_info();
key_provider_id | key_provider_name | key_name
-----------------+-------------------+-------------
1 | file-vault | test-db-key
provider_id | provider_name | key_name
-------------+---------------+-------------
1 | file-vault | test-db-key
(1 row)

DROP TABLE test_temp_norm;
Expand Down
28 changes: 14 additions & 14 deletions contrib/pg_tde/pg_tde--1.0-rc.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
\echo Use "CREATE EXTENSION pg_tde" to load this file. \quit

-- Key Provider Management
CREATE FUNCTION pg_tde_add_database_key_provider(provider_type TEXT, provider_name TEXT, options JSON)
CREATE FUNCTION pg_tde_add_database_key_provider(type TEXT, name TEXT, options JSON)
RETURNS VOID
LANGUAGE C
AS 'MODULE_PATHNAME';
Expand Down Expand Up @@ -50,8 +50,8 @@ END;

CREATE FUNCTION pg_tde_list_all_database_key_providers
(OUT id INT,
OUT provider_name TEXT,
OUT provider_type TEXT,
OUT name TEXT,
OUT type TEXT,
OUT options JSON)
RETURNS SETOF RECORD
LANGUAGE C
Expand All @@ -60,16 +60,16 @@ REVOKE ALL ON FUNCTION pg_tde_list_all_database_key_providers() FROM PUBLIC;

CREATE FUNCTION pg_tde_list_all_global_key_providers
(OUT id INT,
OUT provider_name TEXT,
OUT provider_type TEXT,
OUT name TEXT,
OUT type TEXT,
OUT options JSON)
RETURNS SETOF RECORD
LANGUAGE C
AS 'MODULE_PATHNAME';
REVOKE ALL ON FUNCTION pg_tde_list_all_global_key_providers() FROM PUBLIC;

-- Global Tablespace Key Provider Management
CREATE FUNCTION pg_tde_add_global_key_provider(provider_type TEXT, provider_name TEXT, options JSON)
CREATE FUNCTION pg_tde_add_global_key_provider(type TEXT, name TEXT, options JSON)
RETURNS VOID
LANGUAGE C
AS 'MODULE_PATHNAME';
Expand Down Expand Up @@ -116,7 +116,7 @@ BEGIN ATOMIC
END;

-- Key Provider Management
CREATE FUNCTION pg_tde_change_database_key_provider(provider_type TEXT, provider_name TEXT, options JSON)
CREATE FUNCTION pg_tde_change_database_key_provider(type TEXT, name TEXT, options JSON)
RETURNS VOID
LANGUAGE C
AS 'MODULE_PATHNAME';
Expand Down Expand Up @@ -163,7 +163,7 @@ BEGIN ATOMIC
END;

-- Global Tablespace Key Provider Management
CREATE FUNCTION pg_tde_change_global_key_provider(provider_type TEXT, provider_name TEXT, options JSON)
CREATE FUNCTION pg_tde_change_global_key_provider(type TEXT, name TEXT, options JSON)
RETURNS VOID
LANGUAGE C
AS 'MODULE_PATHNAME';
Expand Down Expand Up @@ -271,26 +271,26 @@ REVOKE ALL ON FUNCTION pg_tde_delete_default_key() FROM PUBLIC;

CREATE FUNCTION pg_tde_key_info()
RETURNS TABLE ( key_name TEXT,
key_provider_name TEXT,
key_provider_id INT,
provider_name TEXT,
provider_id INT,
key_creation_time TIMESTAMP WITH TIME ZONE)
LANGUAGE C
AS 'MODULE_PATHNAME';
REVOKE ALL ON FUNCTION pg_tde_key_info() FROM PUBLIC;

CREATE FUNCTION pg_tde_server_key_info()
RETURNS TABLE ( key_name TEXT,
key_provider_name TEXT,
key_provider_id INT,
provider_name TEXT,
provider_id INT,
key_creation_time TIMESTAMP WITH TIME ZONE)
LANGUAGE C
AS 'MODULE_PATHNAME';
REVOKE ALL ON FUNCTION pg_tde_server_key_info() FROM PUBLIC;

CREATE FUNCTION pg_tde_default_key_info()
RETURNS TABLE ( key_name TEXT,
key_provider_name TEXT,
key_provider_id INT,
provider_name TEXT,
provider_id INT,
key_creation_time TIMESTAMP WITH TIME ZONE)
LANGUAGE C
AS 'MODULE_PATHNAME';
Expand Down
Loading