sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-03 00:02:26 -04:00
Code Issues Projects Releases Wiki Activity

Fix flag tests in src/test/modules/test_oat_hooks

Browse Source 
In what must have been a copy'n paste mistake, all the flag tests use
the same flag rather than a different flag each.  The bug is not
suprising, considering that it's dead code; add a minimal, testimonial
line to cover it.

This is all pretty inconsequential, because this is just example code,
but it had better be correct.

Discussion: https://postgr.es/m/20220712152059.fwli2majwgzdmh4r@alvherre.pgsql
This commit is contained in:
Alvaro Herrera 2022-07-13 11:57:25 +02:00
parent 784cedda06
commit f16180216d
No known key found for this signature in database
GPG Key ID: 1C20ACB9D5C564AE
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/test/modules/test_oat_hooks/expected/test_oat_hooks.out
View File

@ -83,6 +83,11 @@ NOTICE: in object access: superuser finished create (subId=0x0) [internal]
NOTICE: in object access: superuser attempting create (subId=0x0) [internal] NOTICE: in object access: superuser attempting create (subId=0x0) [internal]
NOTICE: in object access: superuser finished create (subId=0x0) [internal] NOTICE: in object access: superuser finished create (subId=0x0) [internal]
NOTICE: in process utility: superuser finished CreateStmt NOTICE: in process utility: superuser finished CreateStmt
CREATE INDEX regress_test_table_t_idx ON regress_test_table (t);
NOTICE: in process utility: superuser attempting IndexStmt
NOTICE: in object access: superuser attempting create (subId=0x0) [explicit]
NOTICE: in object access: superuser finished create (subId=0x0) [explicit]
NOTICE: in process utility: superuser finished IndexStmt
GRANT SELECT ON Table regress_test_table TO public; GRANT SELECT ON Table regress_test_table TO public;
NOTICE: in process utility: superuser attempting GrantStmt NOTICE: in process utility: superuser attempting GrantStmt
NOTICE: in process utility: superuser finished GrantStmt NOTICE: in process utility: superuser finished GrantStmt
@ -280,12 +285,18 @@ NOTICE: in process utility: superuser attempting alter system
NOTICE: in object_access_hook_str: superuser attempting alter (subId=0x2000, alter system) [work_mem] NOTICE: in object_access_hook_str: superuser attempting alter (subId=0x2000, alter system) [work_mem]
NOTICE: in object_access_hook_str: superuser finished alter (subId=0x2000, alter system) [work_mem] NOTICE: in object_access_hook_str: superuser finished alter (subId=0x2000, alter system) [work_mem]
NOTICE: in process utility: superuser finished alter system NOTICE: in process utility: superuser finished alter system
-- Clean up -- try labelled drops
RESET SESSION AUTHORIZATION; RESET SESSION AUTHORIZATION;
NOTICE: in process utility: superuser attempting set NOTICE: in process utility: superuser attempting set
NOTICE: in object_access_hook_str: superuser attempting alter (subId=0x1000, set) [session_authorization] NOTICE: in object_access_hook_str: superuser attempting alter (subId=0x1000, set) [session_authorization]
NOTICE: in object_access_hook_str: superuser finished alter (subId=0x1000, set) [session_authorization] NOTICE: in object_access_hook_str: superuser finished alter (subId=0x1000, set) [session_authorization]
NOTICE: in process utility: superuser finished set NOTICE: in process utility: superuser finished set
DROP INDEX CONCURRENTLY regress_test_table_t_idx;
NOTICE: in process utility: superuser attempting DropStmt
NOTICE: in object access: superuser attempting drop (subId=0x0) [concurrent drop,]
NOTICE: in object access: superuser finished drop (subId=0x0) [concurrent drop,]
NOTICE: in process utility: superuser finished DropStmt
-- Clean up
SET test_oat_hooks.audit = false; SET test_oat_hooks.audit = false;
NOTICE: in process utility: superuser attempting set NOTICE: in process utility: superuser attempting set
DROP ROLE regress_role_joe; -- fails DROP ROLE regress_role_joe; -- fails

5
src/test/modules/test_oat_hooks/sql/test_oat_hooks.sql
View File

@ -38,6 +38,7 @@ REVOKE ALL ON PARAMETER "none.such" FROM PUBLIC;
-- Create objects for use in the test -- Create objects for use in the test
CREATE USER regress_test_user; CREATE USER regress_test_user;
CREATE TABLE regress_test_table (t text); CREATE TABLE regress_test_table (t text);
CREATE INDEX regress_test_table_t_idx ON regress_test_table (t);
GRANT SELECT ON Table regress_test_table TO public; GRANT SELECT ON Table regress_test_table TO public;
CREATE FUNCTION regress_test_func (t text) RETURNS text AS $$ CREATE FUNCTION regress_test_func (t text) RETURNS text AS $$
SELECT $1; SELECT $1;
@ -88,9 +89,11 @@ RESET work_mem;
ALTER SYSTEM SET work_mem = 8192; ALTER SYSTEM SET work_mem = 8192;
ALTER SYSTEM RESET work_mem; ALTER SYSTEM RESET work_mem;
-- Clean up -- try labelled drops
RESET SESSION AUTHORIZATION; RESET SESSION AUTHORIZATION;
DROP INDEX CONCURRENTLY regress_test_table_t_idx;
-- Clean up
SET test_oat_hooks.audit = false; SET test_oat_hooks.audit = false;
DROP ROLE regress_role_joe; -- fails DROP ROLE regress_role_joe; -- fails
REVOKE ALL PRIVILEGES ON PARAMETER REVOKE ALL PRIVILEGES ON PARAMETER

10
src/test/modules/test_oat_hooks/test_oat_hooks.c
View File

@ -1795,15 +1795,15 @@ accesstype_arg_to_string(ObjectAccessType access, void *arg)
return psprintf("%s%s%s%s%s%s", return psprintf("%s%s%s%s%s%s",
((drop_arg->dropflags & PERFORM_DELETION_INTERNAL) ((drop_arg->dropflags & PERFORM_DELETION_INTERNAL)
? "internal action," : ""), ? "internal action," : ""),
((drop_arg->dropflags & PERFORM_DELETION_INTERNAL) ((drop_arg->dropflags & PERFORM_DELETION_CONCURRENTLY)
? "concurrent drop," : ""), ? "concurrent drop," : ""),
((drop_arg->dropflags & PERFORM_DELETION_INTERNAL) ((drop_arg->dropflags & PERFORM_DELETION_QUIETLY)
? "suppress notices," : ""), ? "suppress notices," : ""),
((drop_arg->dropflags & PERFORM_DELETION_INTERNAL) ((drop_arg->dropflags & PERFORM_DELETION_SKIP_ORIGINAL)
? "keep original object," : ""), ? "keep original object," : ""),
((drop_arg->dropflags & PERFORM_DELETION_INTERNAL) ((drop_arg->dropflags & PERFORM_DELETION_SKIP_EXTENSIONS)
? "keep extensions," : ""), ? "keep extensions," : ""),
((drop_arg->dropflags & PERFORM_DELETION_INTERNAL) ((drop_arg->dropflags & PERFORM_DELETION_CONCURRENT_LOCK)
? "normal concurrent drop," : "")); ? "normal concurrent drop," : ""));
} }
break; break;