Skip to content

Commit ce58502

Browse files
committed
Ensure a few policies remain for pg_upgrade
To make sure that pg_dump/pg_restore function properly with RLS policies, arrange to have a few of them left around at the end of the regression tests. Back-patch to 9.5 where RLS was added.
1 parent 90586ef commit ce58502

File tree

3 files changed

+21
-1
lines changed

3 files changed

+21
-1
lines changed

src/test/regress/expected/rowsecurity.out

+9
Original file line numberDiff line numberDiff line change
@@ -3026,3 +3026,12 @@ DROP USER rls_regress_user2;
30263026
DROP USER rls_regress_exempt_user;
30273027
DROP ROLE rls_regress_group1;
30283028
DROP ROLE rls_regress_group2;
3029+
-- Arrange to have a few policies left over, for testing
3030+
-- pg_dump/pg_restore
3031+
CREATE SCHEMA rls_regress_schema;
3032+
CREATE TABLE rls_tbl (c1 int);
3033+
ALTER TABLE rls_tbl ENABLE ROW LEVEL SECURITY;
3034+
CREATE POLICY p1 ON rls_tbl USING (c1 > 5);
3035+
CREATE POLICY p2 ON rls_tbl FOR SELECT USING (c1 <= 3);
3036+
CREATE POLICY p3 ON rls_tbl FOR UPDATE USING (c1 <= 3) WITH CHECK (c1 > 5);
3037+
CREATE POLICY p4 ON rls_tbl FOR DELETE USING (c1 <= 3);

src/test/regress/output/misc.source

+2-1
Original file line numberDiff line numberDiff line change
@@ -671,6 +671,7 @@ SELECT user_relns() AS user_relns
671671
random_tbl
672672
real_city
673673
reltime_tbl
674+
rls_tbl
674675
road
675676
shighway
676677
slow_emp4000
@@ -708,7 +709,7 @@ SELECT user_relns() AS user_relns
708709
tvvmv
709710
varchar_tbl
710711
xacttest
711-
(130 rows)
712+
(131 rows)
712713

713714
SELECT name(equipment(hobby_construct(text 'skywalking', text 'mer')));
714715
name

src/test/regress/sql/rowsecurity.sql

+10
Original file line numberDiff line numberDiff line change
@@ -1307,3 +1307,13 @@ DROP USER rls_regress_user2;
13071307
DROP USER rls_regress_exempt_user;
13081308
DROP ROLE rls_regress_group1;
13091309
DROP ROLE rls_regress_group2;
1310+
1311+
-- Arrange to have a few policies left over, for testing
1312+
-- pg_dump/pg_restore
1313+
CREATE SCHEMA rls_regress_schema;
1314+
CREATE TABLE rls_tbl (c1 int);
1315+
ALTER TABLE rls_tbl ENABLE ROW LEVEL SECURITY;
1316+
CREATE POLICY p1 ON rls_tbl USING (c1 > 5);
1317+
CREATE POLICY p2 ON rls_tbl FOR SELECT USING (c1 <= 3);
1318+
CREATE POLICY p3 ON rls_tbl FOR UPDATE USING (c1 <= 3) WITH CHECK (c1 > 5);
1319+
CREATE POLICY p4 ON rls_tbl FOR DELETE USING (c1 <= 3);

0 commit comments

Comments
 (0)