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

Commit d3c25ca

Browse files
committed
sepgsql: Adjust regression expected output
Oversight in 352ea3a, where support for these subcommands has been added. Per buildfarm member rhinoceros.
1 parent 352ea3a commit d3c25ca

File tree

2 files changed

+18
-12
lines changed

2 files changed

+18
-12
lines changed

contrib/sepgsql/expected/alter.out

+12-6
Original file line numberDiff line numberDiff line change
@@ -207,11 +207,15 @@ LOG: SELinux: allowed { execute } scontext=unconfined_u:unconfined_r:sepgsql_re
207207
ALTER TABLE regtest_table DROP CONSTRAINT test_ck; -- not supported
208208
CREATE TRIGGER regtest_test_trig BEFORE UPDATE ON regtest_table
209209
FOR EACH ROW EXECUTE PROCEDURE suppress_redundant_updates_trigger();
210-
ALTER TABLE regtest_table DISABLE TRIGGER regtest_test_trig; -- not supported
211-
ALTER TABLE regtest_table ENABLE TRIGGER regtest_test_trig; -- not supported
210+
ALTER TABLE regtest_table DISABLE TRIGGER regtest_test_trig;
211+
LOG: SELinux: allowed { setattr } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_table_t:s0 tclass=db_table name="regtest_schema_2.regtest_table" permissive=0
212+
ALTER TABLE regtest_table ENABLE TRIGGER regtest_test_trig;
213+
LOG: SELinux: allowed { setattr } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_table_t:s0 tclass=db_table name="regtest_schema_2.regtest_table" permissive=0
212214
CREATE RULE regtest_test_rule AS ON INSERT TO regtest_table_3 DO ALSO NOTHING;
213-
ALTER TABLE regtest_table_3 DISABLE RULE regtest_test_rule; -- not supported
214-
ALTER TABLE regtest_table_3 ENABLE RULE regtest_test_rule; -- not supported
215+
ALTER TABLE regtest_table_3 DISABLE RULE regtest_test_rule;
216+
LOG: SELinux: allowed { setattr } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_table_t:s0 tclass=db_table name="regtest_schema.regtest_table_3" permissive=0
217+
ALTER TABLE regtest_table_3 ENABLE RULE regtest_test_rule;
218+
LOG: SELinux: allowed { setattr } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_table_t:s0 tclass=db_table name="regtest_schema.regtest_table_3" permissive=0
215219
ALTER TABLE regtest_table SET (fillfactor = 75);
216220
LOG: SELinux: allowed { setattr } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_table_t:s0 tclass=db_table name="regtest_schema_2.regtest_table" permissive=0
217221
ALTER TABLE regtest_table RESET (fillfactor);
@@ -281,8 +285,10 @@ LOG: SELinux: allowed { execute } scontext=unconfined_u:unconfined_r:sepgsql_re
281285
ALTER TABLE regtest_table_part DROP CONSTRAINT test_ck; -- not supported by sepgsql
282286
CREATE TRIGGER regtest_part_test_trig BEFORE UPDATE ON regtest_table_part
283287
FOR EACH ROW EXECUTE PROCEDURE suppress_redundant_updates_trigger();
284-
ALTER TABLE regtest_table_part DISABLE TRIGGER regtest_part_test_trig; -- not supported by sepgsql
285-
ALTER TABLE regtest_table_part ENABLE TRIGGER regtest_part_test_trig; -- not supported by sepgsql
288+
ALTER TABLE regtest_table_part DISABLE TRIGGER regtest_part_test_trig;
289+
LOG: SELinux: allowed { setattr } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_table_t:s0 tclass=db_table name="regtest_schema_2.regtest_table_part" permissive=0
290+
ALTER TABLE regtest_table_part ENABLE TRIGGER regtest_part_test_trig;
291+
LOG: SELinux: allowed { setattr } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_table_t:s0 tclass=db_table name="regtest_schema_2.regtest_table_part" permissive=0
286292
ALTER TABLE regtest_table_part SET (fillfactor = 75);
287293
LOG: SELinux: allowed { setattr } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_table_t:s0 tclass=db_table name="regtest_schema_2.regtest_table_part" permissive=0
288294
ALTER TABLE regtest_table_part RESET (fillfactor);

contrib/sepgsql/sql/alter.sql

+6-6
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,12 @@ ALTER TABLE regtest_table DROP CONSTRAINT test_ck; -- not supported
127127
CREATE TRIGGER regtest_test_trig BEFORE UPDATE ON regtest_table
128128
FOR EACH ROW EXECUTE PROCEDURE suppress_redundant_updates_trigger();
129129

130-
ALTER TABLE regtest_table DISABLE TRIGGER regtest_test_trig; -- not supported
131-
ALTER TABLE regtest_table ENABLE TRIGGER regtest_test_trig; -- not supported
130+
ALTER TABLE regtest_table DISABLE TRIGGER regtest_test_trig;
131+
ALTER TABLE regtest_table ENABLE TRIGGER regtest_test_trig;
132132

133133
CREATE RULE regtest_test_rule AS ON INSERT TO regtest_table_3 DO ALSO NOTHING;
134-
ALTER TABLE regtest_table_3 DISABLE RULE regtest_test_rule; -- not supported
135-
ALTER TABLE regtest_table_3 ENABLE RULE regtest_test_rule; -- not supported
134+
ALTER TABLE regtest_table_3 DISABLE RULE regtest_test_rule;
135+
ALTER TABLE regtest_table_3 ENABLE RULE regtest_test_rule;
136136

137137
ALTER TABLE regtest_table SET (fillfactor = 75);
138138
ALTER TABLE regtest_table RESET (fillfactor);
@@ -173,8 +173,8 @@ ALTER TABLE regtest_table_part DROP CONSTRAINT test_ck; -- not supported by
173173
CREATE TRIGGER regtest_part_test_trig BEFORE UPDATE ON regtest_table_part
174174
FOR EACH ROW EXECUTE PROCEDURE suppress_redundant_updates_trigger();
175175

176-
ALTER TABLE regtest_table_part DISABLE TRIGGER regtest_part_test_trig; -- not supported by sepgsql
177-
ALTER TABLE regtest_table_part ENABLE TRIGGER regtest_part_test_trig; -- not supported by sepgsql
176+
ALTER TABLE regtest_table_part DISABLE TRIGGER regtest_part_test_trig;
177+
ALTER TABLE regtest_table_part ENABLE TRIGGER regtest_part_test_trig;
178178

179179
ALTER TABLE regtest_table_part SET (fillfactor = 75);
180180
ALTER TABLE regtest_table_part RESET (fillfactor);

0 commit comments

Comments
 (0)