Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Fixes related to new changes in PostgreSQL 16: December 6, 2022 - December 27, 2022 #261

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 3 commits into from
Jan 11, 2023
Merged

Fixes related to new changes in PostgreSQL 16: December 6, 2022 - December 27, 2022 #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47806e7
[PGPRO-7585] Fixes for v16 due to vanilla changes
kovdb75 Dec 22, 2022
bb9f6e4
Convert the reg* input functions to report (most) errors softly.
Jan 10, 2023
2d49e88
Add grantable MAINTAIN privilege and pg_maintain role.
Jan 10, 2023
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
263 changes: 263 additions & 0 deletions expected/pathman_permissions_1.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,263 @@
\set VERBOSITY terse
SET search_path = 'public';
CREATE EXTENSION pg_pathman;
CREATE SCHEMA permissions;
CREATE ROLE user1 LOGIN;
CREATE ROLE user2 LOGIN;
GRANT USAGE, CREATE ON SCHEMA permissions TO user1;
GRANT USAGE, CREATE ON SCHEMA permissions TO user2;
/* Switch to #1 */
SET ROLE user1;
CREATE TABLE permissions.user1_table(id serial, a int);
INSERT INTO permissions.user1_table SELECT g, g FROM generate_series(1, 20) as g;
/* Should fail (can't SELECT) */
SET ROLE user2;
DO $$
BEGIN
SELECT create_range_partitions('permissions.user1_table', 'id', 1, 10, 2);
EXCEPTION
WHEN insufficient_privilege THEN
RAISE NOTICE 'Insufficient priviliges';
END$$;
NOTICE: Insufficient priviliges
/* Grant SELECT to user2 */
SET ROLE user1;
GRANT SELECT ON permissions.user1_table TO user2;
/* Should fail (don't own parent) */
SET ROLE user2;
DO $$
BEGIN
SELECT create_range_partitions('permissions.user1_table', 'id', 1, 10, 2);
EXCEPTION
WHEN insufficient_privilege THEN
RAISE NOTICE 'Insufficient priviliges';
END$$;
NOTICE: Insufficient priviliges
/* Should be ok */
SET ROLE user1;
SELECT create_range_partitions('permissions.user1_table', 'id', 1, 10, 2);
create_range_partitions
-------------------------
2
(1 row)

/* Should be able to see */
SET ROLE user2;
SELECT * FROM pathman_config;
partrel | expr | parttype | range_interval
-------------------------+------+----------+----------------
permissions.user1_table | id | 2 | 10
(1 row)

SELECT * FROM pathman_config_params;
partrel | enable_parent | auto | init_callback | spawn_using_bgw
-------------------------+---------------+------+---------------+-----------------
permissions.user1_table | f | t | | f
(1 row)

/* Should fail */
SET ROLE user2;
SELECT set_enable_parent('permissions.user1_table', true);
WARNING: only the owner or superuser can change partitioning configuration of table "user1_table"
ERROR: new row violates row-level security policy for table "pathman_config_params"
SELECT set_auto('permissions.user1_table', false);
WARNING: only the owner or superuser can change partitioning configuration of table "user1_table"
ERROR: new row violates row-level security policy for table "pathman_config_params"
/* Should fail */
SET ROLE user2;
DELETE FROM pathman_config
WHERE partrel = 'permissions.user1_table'::regclass;
WARNING: only the owner or superuser can change partitioning configuration of table "user1_table"
/* No rights to insert, should fail */
SET ROLE user2;
DO $$
BEGIN
INSERT INTO permissions.user1_table (id, a) VALUES (35, 0);
EXCEPTION
WHEN insufficient_privilege THEN
RAISE NOTICE 'Insufficient priviliges';
END$$;
NOTICE: Insufficient priviliges
/* No rights to create partitions (need INSERT privilege) */
SET ROLE user2;
SELECT prepend_range_partition('permissions.user1_table');
ERROR: permission denied for parent relation "user1_table"
/* Allow user2 to create partitions */
SET ROLE user1;
GRANT INSERT ON permissions.user1_table TO user2;
GRANT UPDATE(a) ON permissions.user1_table TO user2; /* per-column ACL */
/* Should be able to prepend a partition */
SET ROLE user2;
SELECT prepend_range_partition('permissions.user1_table');
prepend_range_partition
---------------------------
permissions.user1_table_4
(1 row)

SELECT attname, attacl FROM pg_attribute
WHERE attrelid = (SELECT "partition" FROM pathman_partition_list
WHERE parent = 'permissions.user1_table'::REGCLASS
ORDER BY range_min::int ASC /* prepend */
LIMIT 1)
ORDER BY attname; /* check ACL for each column */
attname | attacl
----------+-----------------
a | {user2=w/user1}
cmax |
cmin |
ctid |
id |
tableoid |
xmax |
xmin |
(8 rows)

/* Have rights, should be ok (parent's ACL is shared by new children) */
SET ROLE user2;
INSERT INTO permissions.user1_table (id, a) VALUES (35, 0) RETURNING *;
id | a
----+---
35 | 0
(1 row)

SELECT relname, relacl FROM pg_class
WHERE oid = ANY (SELECT "partition" FROM pathman_partition_list
WHERE parent = 'permissions.user1_table'::REGCLASS
ORDER BY range_max::int DESC /* append */
LIMIT 3)
ORDER BY relname; /* we also check ACL for "user1_table_2" */
relname | relacl
---------------+---------------------------------------
user1_table_2 | {user1=arwdDxtm/user1,user2=r/user1}
user1_table_5 | {user1=arwdDxtm/user1,user2=ar/user1}
user1_table_6 | {user1=arwdDxtm/user1,user2=ar/user1}
(3 rows)

/* Try to drop partition, should fail */
DO $$
BEGIN
SELECT drop_range_partition('permissions.user1_table_4');
EXCEPTION
WHEN insufficient_privilege THEN
RAISE NOTICE 'Insufficient priviliges';
END$$;
NOTICE: Insufficient priviliges
/* Disable automatic partition creation */
SET ROLE user1;
SELECT set_auto('permissions.user1_table', false);
set_auto
----------

(1 row)

/* Partition creation, should fail */
SET ROLE user2;
INSERT INTO permissions.user1_table (id, a) VALUES (55, 0) RETURNING *;
ERROR: no suitable partition for key '55'
/* Finally drop partitions */
SET ROLE user1;
SELECT drop_partitions('permissions.user1_table');
NOTICE: 10 rows copied from permissions.user1_table_1
NOTICE: 10 rows copied from permissions.user1_table_2
NOTICE: 0 rows copied from permissions.user1_table_4
NOTICE: 0 rows copied from permissions.user1_table_5
NOTICE: 1 rows copied from permissions.user1_table_6
drop_partitions
-----------------
5
(1 row)

/* Switch to #2 */
SET ROLE user2;
/* Test ddl event trigger */
CREATE TABLE permissions.user2_table(id serial);
SELECT create_hash_partitions('permissions.user2_table', 'id', 3);
create_hash_partitions
------------------------
3
(1 row)

INSERT INTO permissions.user2_table SELECT generate_series(1, 30);
SELECT drop_partitions('permissions.user2_table');
NOTICE: 9 rows copied from permissions.user2_table_0
NOTICE: 11 rows copied from permissions.user2_table_1
NOTICE: 10 rows copied from permissions.user2_table_2
drop_partitions
-----------------
3
(1 row)

/* Switch to #1 */
SET ROLE user1;
CREATE TABLE permissions.dropped_column(a int, val int not null, b int, c int);
INSERT INTO permissions.dropped_column SELECT i,i,i,i FROM generate_series(1, 30) i;
GRANT SELECT(val), INSERT(val) ON permissions.dropped_column TO user2;
SELECT create_range_partitions('permissions.dropped_column', 'val', 1, 10);
create_range_partitions
-------------------------
3
(1 row)

SELECT attrelid::regclass, attname, attacl FROM pg_attribute
WHERE attrelid = ANY (SELECT "partition" FROM pathman_partition_list
WHERE parent = 'permissions.dropped_column'::REGCLASS)
AND attacl IS NOT NULL
ORDER BY attrelid::regclass::text; /* check ACL for each column */
attrelid | attname | attacl
------------------------------+---------+------------------
permissions.dropped_column_1 | val | {user2=ar/user1}
permissions.dropped_column_2 | val | {user2=ar/user1}
permissions.dropped_column_3 | val | {user2=ar/user1}
(3 rows)

ALTER TABLE permissions.dropped_column DROP COLUMN a; /* DROP "a" */
SELECT append_range_partition('permissions.dropped_column');
append_range_partition
------------------------------
permissions.dropped_column_4
(1 row)

SELECT attrelid::regclass, attname, attacl FROM pg_attribute
WHERE attrelid = ANY (SELECT "partition" FROM pathman_partition_list
WHERE parent = 'permissions.dropped_column'::REGCLASS)
AND attacl IS NOT NULL
ORDER BY attrelid::regclass::text; /* check ACL for each column (+1 partition) */
attrelid | attname | attacl
------------------------------+---------+------------------
permissions.dropped_column_1 | val | {user2=ar/user1}
permissions.dropped_column_2 | val | {user2=ar/user1}
permissions.dropped_column_3 | val | {user2=ar/user1}
permissions.dropped_column_4 | val | {user2=ar/user1}
(4 rows)

ALTER TABLE permissions.dropped_column DROP COLUMN b; /* DROP "b" */
SELECT append_range_partition('permissions.dropped_column');
append_range_partition
------------------------------
permissions.dropped_column_5
(1 row)

SELECT attrelid::regclass, attname, attacl FROM pg_attribute
WHERE attrelid = ANY (SELECT "partition" FROM pathman_partition_list
WHERE parent = 'permissions.dropped_column'::REGCLASS)
AND attacl IS NOT NULL
ORDER BY attrelid::regclass::text; /* check ACL for each column (+1 partition) */
attrelid | attname | attacl
------------------------------+---------+------------------
permissions.dropped_column_1 | val | {user2=ar/user1}
permissions.dropped_column_2 | val | {user2=ar/user1}
permissions.dropped_column_3 | val | {user2=ar/user1}
permissions.dropped_column_4 | val | {user2=ar/user1}
permissions.dropped_column_5 | val | {user2=ar/user1}
(5 rows)

DROP TABLE permissions.dropped_column CASCADE;
NOTICE: drop cascades to 6 other objects
/* Finally reset user */
RESET ROLE;
DROP OWNED BY user1;
DROP OWNED BY user2;
DROP USER user1;
DROP USER user2;
DROP SCHEMA permissions;
DROP EXTENSION pg_pathman;
11 changes: 11 additions & 0 deletions src/include/compat/pg_compat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1084,6 +1084,17 @@ extern AttrNumber *convert_tuples_by_name_map(TupleDesc indesc,
expression_tree_mutator((node), (mutator), (context))
#endif

/*
* stringToQualifiedNameList
*/
#if PG_VERSION_NUM >= 160000
#define stringToQualifiedNameListCompat(string) \
stringToQualifiedNameList((string), NULL)
#else
#define stringToQualifiedNameListCompat(string) \
stringToQualifiedNameList((string))
#endif

/*
* -------------
* Common code
Expand Down
8 changes: 6 additions & 2 deletions src/include/partition_filter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@ struct ResultPartsStorage
PartRelationInfo *prel;
ExprState *prel_expr_state;
ExprContext *prel_econtext;
#if PG_VERSION_NUM >= 160000 /* for commit a61b1f74823c */
ResultRelInfo *init_rri; /* first initialized ResultRelInfo */
#endif
};

typedef struct
Expand Down Expand Up @@ -167,7 +170,7 @@ void init_result_parts_storage(ResultPartsStorage *parts_storage,
void fini_result_parts_storage(ResultPartsStorage *parts_storage);

/* Find ResultRelInfo holder in storage */
ResultRelInfoHolder * scan_result_parts_storage(ResultPartsStorage *storage, Oid partid);
ResultRelInfoHolder * scan_result_parts_storage(EState *estate, ResultPartsStorage *storage, Oid partid);

/* Refresh PartRelationInfo in storage */
PartRelationInfo * refresh_result_parts_storage(ResultPartsStorage *parts_storage, Oid partid);
Expand All @@ -186,7 +189,8 @@ Oid * find_partitions_for_value(Datum value, Oid value_type,
const PartRelationInfo *prel,
int *nparts);

ResultRelInfoHolder *select_partition_for_insert(ResultPartsStorage *parts_storage,
ResultRelInfoHolder *select_partition_for_insert(EState *estate,
ResultPartsStorage *parts_storage,
TupleTableSlot *slot);

Plan * make_partition_filter(Plan *subplan,
Expand Down
Loading