Skip to content

Commit 78a2bc7

Browse files
OlegLoginovOlegLoginov
committed
[yugabyte#23114] YSQL: Refactoring the yb_pg_pgaudit.sql/.out test.
Summary: The test file `yb_pg_pgaudit.out` was changed in the previous fix - 34f9741 / D36474. The test change was not good - it incremented the audit numbers. This corrective diff changes `yb_pg_pgaudit.sql` to return back the `audit numbers`. Jira: DB-12047 Test Plan: ./yb_build.sh --java-test org.yb.pgsql.TestPgRegressThirdPartyExtensionsPgaudit#schedule Reviewers: jason, mihnea, myang Reviewed By: jason Subscribers: yql Differential Revision: https://phorge.dev.yugabyte.com/D37150
1 parent 1473a23 commit 78a2bc7

File tree

2 files changed

+43
-83
lines changed

2 files changed

+43
-83
lines changed

‎src/postgres/third-party-extensions/pgaudit/expected/yb_pg_pgaudit.out‎

Lines changed: 43 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -899,52 +899,20 @@ ALTER TABLE public.test2
899899
SET SCHEMA test;
900900
NOTICE: AUDIT: SESSION,39,1,DDL,ALTER TABLE,TABLE,test.test2,"ALTER TABLE public.test2
901901
SET SCHEMA test;",<none>
902-
-- YB note: bump audit number to stay same with upstream.
903-
SELECT 'yb';
904-
NOTICE: AUDIT: SESSION,40,1,READ,SELECT,,,SELECT 'yb';,<none>
905-
?column?
906-
----------
907-
yb
908-
(1 row)
909-
910902
ALTER TABLE test.test2
911903
ADD COLUMN description TEXT;
912-
NOTICE: AUDIT: SESSION,41,1,DDL,ALTER TABLE,TABLE,test.test2,"ALTER TABLE test.test2
904+
NOTICE: AUDIT: SESSION,40,1,DDL,ALTER TABLE,TABLE,test.test2,"ALTER TABLE test.test2
913905
ADD COLUMN description TEXT;",<none>
914-
-- YB note: bump audit number to stay same with upstream.
915-
SELECT 'yb';
916-
NOTICE: AUDIT: SESSION,42,1,READ,SELECT,,,SELECT 'yb';,<none>
917-
?column?
918-
----------
919-
yb
920-
(1 row)
921-
922906
ALTER TABLE test.test2
923907
DROP COLUMN description;
924-
NOTICE: AUDIT: SESSION,43,1,DDL,ALTER TABLE,TABLE COLUMN,test.test2.description,"ALTER TABLE test.test2
908+
NOTICE: AUDIT: SESSION,41,1,DDL,ALTER TABLE,TABLE COLUMN,test.test2.description,"ALTER TABLE test.test2
925909
DROP COLUMN description;",<none>
926-
NOTICE: AUDIT: SESSION,43,1,DDL,ALTER TABLE,TABLE,test.test2,"ALTER TABLE test.test2
910+
NOTICE: AUDIT: SESSION,41,1,DDL,ALTER TABLE,TABLE,test.test2,"ALTER TABLE test.test2
927911
DROP COLUMN description;",<none>
928-
-- YB note: bump audit number to stay same with upstream.
929-
SELECT 'yb';
930-
NOTICE: AUDIT: SESSION,44,1,READ,SELECT,,,SELECT 'yb';,<none>
931-
?column?
932-
----------
933-
yb
934-
(1 row)
935-
936912
DROP TABLE test.test2;
937-
NOTICE: AUDIT: SESSION,45,1,DDL,DROP TABLE,TABLE,test.test2,DROP TABLE test.test2;,<none>
938-
NOTICE: AUDIT: SESSION,45,1,DDL,DROP TABLE,TABLE CONSTRAINT,test_pkey on test.test2,DROP TABLE test.test2;,<none>
939-
NOTICE: AUDIT: SESSION,45,1,DDL,DROP TABLE,INDEX,test.test_pkey,DROP TABLE test.test2;,<none>
940-
-- YB note: bump audit number to stay same with upstream.
941-
SELECT 'yb';
942-
NOTICE: AUDIT: SESSION,46,1,READ,SELECT,,,SELECT 'yb';,<none>
943-
?column?
944-
----------
945-
yb
946-
(1 row)
947-
913+
NOTICE: AUDIT: SESSION,42,1,DDL,DROP TABLE,TABLE,test.test2,DROP TABLE test.test2;,<none>
914+
NOTICE: AUDIT: SESSION,42,1,DDL,DROP TABLE,TABLE CONSTRAINT,test_pkey on test.test2,DROP TABLE test.test2;,<none>
915+
NOTICE: AUDIT: SESSION,42,1,DDL,DROP TABLE,INDEX,test.test_pkey,DROP TABLE test.test2;,<none>
948916
--
949917
-- Test multiple statements with one semi-colon
950918
CREATE SCHEMA foo
@@ -953,7 +921,7 @@ CREATE SCHEMA foo
953921
ERROR: CREATE SCHEMA with elements not supported yet at character 20
954922
-- YB note: bump audit number to stay same with upstream.
955923
SELECT 'yb';
956-
NOTICE: AUDIT: SESSION,47,1,READ,SELECT,,,SELECT 'yb';,<none>
924+
NOTICE: AUDIT: SESSION,43,1,READ,SELECT,,,SELECT 'yb';,<none>
957925
?column?
958926
----------
959927
yb
@@ -970,7 +938,7 @@ CREATE FUNCTION public.int_add
970938
BEGIN
971939
return a + b;
972940
END $$;
973-
NOTICE: AUDIT: SESSION,48,1,DDL,CREATE FUNCTION,FUNCTION,"public.int_add(integer,integer)","CREATE FUNCTION public.int_add
941+
NOTICE: AUDIT: SESSION,44,1,DDL,CREATE FUNCTION,FUNCTION,"public.int_add(integer,integer)","CREATE FUNCTION public.int_add
974942
(
975943
a INT,
976944
b INT
@@ -980,24 +948,24 @@ BEGIN
980948
return a + b;
981949
END $$;",<none>
982950
SELECT int_add(1, 1);
983-
NOTICE: AUDIT: SESSION,49,1,READ,SELECT,,,"SELECT int_add(1, 1);",<none>
984-
NOTICE: AUDIT: SESSION,49,2,FUNCTION,EXECUTE,FUNCTION,public.int_add,"SELECT int_add(1, 1);",<none>
951+
NOTICE: AUDIT: SESSION,45,1,READ,SELECT,,,"SELECT int_add(1, 1);",<none>
952+
NOTICE: AUDIT: SESSION,45,2,FUNCTION,EXECUTE,FUNCTION,public.int_add,"SELECT int_add(1, 1);",<none>
985953
int_add
986954
---------
987955
2
988956
(1 row)
989957

990958
CREATE AGGREGATE public.sum_test(INT) (SFUNC=public.int_add, STYPE=INT, INITCOND='0');
991-
NOTICE: AUDIT: SESSION,50,1,DDL,CREATE AGGREGATE,AGGREGATE,public.sum_test(integer),"CREATE AGGREGATE public.sum_test(INT) (SFUNC=public.int_add, STYPE=INT, INITCOND='0');",<none>
959+
NOTICE: AUDIT: SESSION,46,1,DDL,CREATE AGGREGATE,AGGREGATE,public.sum_test(integer),"CREATE AGGREGATE public.sum_test(INT) (SFUNC=public.int_add, STYPE=INT, INITCOND='0');",<none>
992960
ALTER AGGREGATE public.sum_test(integer) RENAME TO sum_test2;
993-
NOTICE: AUDIT: SESSION,51,1,DDL,ALTER AGGREGATE,AGGREGATE,public.sum_test2(integer),ALTER AGGREGATE public.sum_test(integer) RENAME TO sum_test2;,<none>
961+
NOTICE: AUDIT: SESSION,47,1,DDL,ALTER AGGREGATE,AGGREGATE,public.sum_test2(integer),ALTER AGGREGATE public.sum_test(integer) RENAME TO sum_test2;,<none>
994962
--
995963
-- Test conversion
996964
CREATE CONVERSION public.conversion_test FOR 'latin1' TO 'utf8' FROM pg_catalog.iso8859_1_to_utf8;
997965
ERROR: CREATE CONVERSION not supported yet at character 1
998966
-- YB note: bump audit number to stay same with upstream.
999967
SELECT 'yb';
1000-
NOTICE: AUDIT: SESSION,52,1,READ,SELECT,,,SELECT 'yb';,<none>
968+
NOTICE: AUDIT: SESSION,48,1,READ,SELECT,,,SELECT 'yb';,<none>
1001969
?column?
1002970
----------
1003971
yb
@@ -1007,7 +975,7 @@ ALTER CONVERSION public.conversion_test RENAME TO conversion_test2;
1007975
ERROR: ALTER CONVERSION not supported yet at character 1
1008976
-- YB note: bump audit number to stay same with upstream.
1009977
SELECT 'yb';
1010-
NOTICE: AUDIT: SESSION,53,1,READ,SELECT,,,SELECT 'yb';,<none>
978+
NOTICE: AUDIT: SESSION,49,1,READ,SELECT,,,SELECT 'yb';,<none>
1011979
?column?
1012980
----------
1013981
yb
@@ -1016,27 +984,27 @@ NOTICE: AUDIT: SESSION,53,1,READ,SELECT,,,SELECT 'yb';,<none>
1016984
--
1017985
-- Test create/alter/drop database
1018986
CREATE DATABASE contrib_regression_pgaudit;
1019-
NOTICE: AUDIT: SESSION,54,1,DDL,CREATE DATABASE,,,CREATE DATABASE contrib_regression_pgaudit;,<none>
987+
NOTICE: AUDIT: SESSION,50,1,DDL,CREATE DATABASE,,,CREATE DATABASE contrib_regression_pgaudit;,<none>
1020988
ALTER DATABASE contrib_regression_pgaudit RENAME TO contrib_regression_pgaudit2;
1021-
NOTICE: AUDIT: SESSION,55,1,DDL,ALTER DATABASE,,,ALTER DATABASE contrib_regression_pgaudit RENAME TO contrib_regression_pgaudit2;,<none>
989+
NOTICE: AUDIT: SESSION,51,1,DDL,ALTER DATABASE,,,ALTER DATABASE contrib_regression_pgaudit RENAME TO contrib_regression_pgaudit2;,<none>
1022990
DROP DATABASE contrib_regression_pgaudit2;
1023-
NOTICE: AUDIT: SESSION,56,1,DDL,DROP DATABASE,,,DROP DATABASE contrib_regression_pgaudit2;,<none>
991+
NOTICE: AUDIT: SESSION,52,1,DDL,DROP DATABASE,,,DROP DATABASE contrib_regression_pgaudit2;,<none>
1024992
-- Test role as a substmt
1025993
SET pgaudit.log = 'ROLE';
1026994
CREATE TABLE t ();
1027995
CREATE ROLE alice;
1028-
NOTICE: AUDIT: SESSION,57,1,ROLE,CREATE ROLE,,,CREATE ROLE alice;,<none>
996+
NOTICE: AUDIT: SESSION,53,1,ROLE,CREATE ROLE,,,CREATE ROLE alice;,<none>
1029997
CREATE SCHEMA foo2
1030998
GRANT SELECT
1031999
ON public.t
10321000
TO alice;
10331001
ERROR: CREATE SCHEMA with elements not supported yet at character 21
10341002
-- YB note: bump audit number to stay same with upstream.
10351003
ALTER ROLE alice CONNECTION LIMIT -1;
1036-
NOTICE: AUDIT: SESSION,58,1,ROLE,ALTER ROLE,,,ALTER ROLE alice CONNECTION LIMIT -1;,<none>
1004+
NOTICE: AUDIT: SESSION,54,1,ROLE,ALTER ROLE,,,ALTER ROLE alice CONNECTION LIMIT -1;,<none>
10371005
drop table public.t;
10381006
drop role alice;
1039-
NOTICE: AUDIT: SESSION,59,1,ROLE,DROP ROLE,,,drop role alice;,<none>
1007+
NOTICE: AUDIT: SESSION,55,1,ROLE,DROP ROLE,,,drop role alice;,<none>
10401008
--
10411009
-- Test for non-empty stack error
10421010
CREATE OR REPLACE FUNCTION get_test_id(_ret REFCURSOR) RETURNS REFCURSOR
@@ -1076,12 +1044,12 @@ END;
10761044
--
10771045
-- Test that frees a memory context earlier than expected
10781046
SET pgaudit.log = 'ALL';
1079-
NOTICE: AUDIT: SESSION,60,1,MISC,SET,,,SET pgaudit.log = 'ALL';,<none>
1047+
NOTICE: AUDIT: SESSION,56,1,MISC,SET,,,SET pgaudit.log = 'ALL';,<none>
10801048
CREATE TABLE hoge
10811049
(
10821050
id int
10831051
);
1084-
NOTICE: AUDIT: SESSION,61,1,DDL,CREATE TABLE,TABLE,public.hoge,"CREATE TABLE hoge
1052+
NOTICE: AUDIT: SESSION,57,1,DDL,CREATE TABLE,TABLE,public.hoge,"CREATE TABLE hoge
10851053
(
10861054
id int
10871055
);",<none>
@@ -1096,7 +1064,7 @@ BEGIN
10961064
RETURN tmp;
10971065
END $$
10981066
LANGUAGE plpgsql ;
1099-
NOTICE: AUDIT: SESSION,62,1,DDL,CREATE FUNCTION,FUNCTION,public.test(),"CREATE FUNCTION test()
1067+
NOTICE: AUDIT: SESSION,58,1,DDL,CREATE FUNCTION,FUNCTION,public.test(),"CREATE FUNCTION test()
11001068
RETURNS INT AS $$
11011069
DECLARE
11021070
cur1 cursor for select * from hoge;
@@ -1108,9 +1076,9 @@ BEGIN
11081076
END $$
11091077
LANGUAGE plpgsql ;",<none>
11101078
SELECT test();
1111-
NOTICE: AUDIT: SESSION,63,1,READ,SELECT,,,SELECT test();,<none>
1112-
NOTICE: AUDIT: SESSION,63,2,FUNCTION,EXECUTE,FUNCTION,public.test,SELECT test();,<none>
1113-
NOTICE: AUDIT: SESSION,63,3,READ,SELECT,TABLE,public.hoge,select * from hoge,<none>
1079+
NOTICE: AUDIT: SESSION,59,1,READ,SELECT,,,SELECT test();,<none>
1080+
NOTICE: AUDIT: SESSION,59,2,FUNCTION,EXECUTE,FUNCTION,public.test,SELECT test();,<none>
1081+
NOTICE: AUDIT: SESSION,59,3,READ,SELECT,TABLE,public.hoge,select * from hoge,<none>
11141082
test
11151083
------
11161084

@@ -1129,29 +1097,29 @@ grant delete
11291097
to auditor;
11301098
insert into bar (col)
11311099
values (1);
1132-
NOTICE: AUDIT: SESSION,64,1,WRITE,INSERT,TABLE,public.bar,"insert into bar (col)
1100+
NOTICE: AUDIT: SESSION,60,1,WRITE,INSERT,TABLE,public.bar,"insert into bar (col)
11331101
values (1);",<none>
11341102
delete from bar;
1135-
NOTICE: AUDIT: OBJECT,65,1,WRITE,DELETE,TABLE,public.bar,delete from bar;,<none>
1136-
NOTICE: AUDIT: SESSION,65,1,WRITE,DELETE,TABLE,public.bar,delete from bar;,<none>
1103+
NOTICE: AUDIT: OBJECT,61,1,WRITE,DELETE,TABLE,public.bar,delete from bar;,<none>
1104+
NOTICE: AUDIT: SESSION,61,1,WRITE,DELETE,TABLE,public.bar,delete from bar;,<none>
11371105
insert into bar (col)
11381106
values (1);
1139-
NOTICE: AUDIT: SESSION,66,1,WRITE,INSERT,TABLE,public.bar,"insert into bar (col)
1107+
NOTICE: AUDIT: SESSION,62,1,WRITE,INSERT,TABLE,public.bar,"insert into bar (col)
11401108
values (1);",<none>
11411109
delete from bar
11421110
where col = 1;
1143-
NOTICE: AUDIT: OBJECT,67,1,WRITE,DELETE,TABLE,public.bar,"delete from bar
1111+
NOTICE: AUDIT: OBJECT,63,1,WRITE,DELETE,TABLE,public.bar,"delete from bar
11441112
where col = 1;",<none>
1145-
NOTICE: AUDIT: SESSION,67,1,WRITE,DELETE,TABLE,public.bar,"delete from bar
1113+
NOTICE: AUDIT: SESSION,63,1,WRITE,DELETE,TABLE,public.bar,"delete from bar
11461114
where col = 1;",<none>
11471115
drop table bar;
11481116
--
11491117
-- Grant roles to each other
11501118
SET pgaudit.log = 'role';
11511119
GRANT user1 TO user2;
1152-
NOTICE: AUDIT: SESSION,68,1,ROLE,GRANT ROLE,,,GRANT user1 TO user2;,<none>
1120+
NOTICE: AUDIT: SESSION,64,1,ROLE,GRANT ROLE,,,GRANT user1 TO user2;,<none>
11531121
REVOKE user1 FROM user2;
1154-
NOTICE: AUDIT: SESSION,69,1,ROLE,REVOKE ROLE,,,REVOKE user1 FROM user2;,<none>
1122+
NOTICE: AUDIT: SESSION,65,1,ROLE,REVOKE ROLE,,,REVOKE user1 FROM user2;,<none>
11551123
--
11561124
-- Test that FK references do not log but triggers still do
11571125
SET pgaudit.log = 'READ,WRITE';
@@ -1181,21 +1149,21 @@ GRANT UPDATE
11811149
ON bbb
11821150
TO auditor;
11831151
INSERT INTO aaa VALUES (generate_series(1,100));
1184-
NOTICE: AUDIT: SESSION,70,1,WRITE,INSERT,TABLE,public.aaa,"INSERT INTO aaa VALUES (generate_series(1,100));",<none>
1152+
NOTICE: AUDIT: SESSION,66,1,WRITE,INSERT,TABLE,public.aaa,"INSERT INTO aaa VALUES (generate_series(1,100));",<none>
11851153
SET pgaudit.log_parameter TO OFF;
11861154
INSERT INTO bbb VALUES (1);
1187-
NOTICE: AUDIT: SESSION,71,1,WRITE,INSERT,TABLE,public.bbb,INSERT INTO bbb VALUES (1);,<not logged>
1188-
NOTICE: AUDIT: OBJECT,71,2,WRITE,UPDATE,TABLE,public.bbb,UPDATE bbb set id = new.id + 1,<not logged>
1189-
NOTICE: AUDIT: SESSION,71,2,WRITE,UPDATE,TABLE,public.bbb,UPDATE bbb set id = new.id + 1,<not logged>
1155+
NOTICE: AUDIT: SESSION,67,1,WRITE,INSERT,TABLE,public.bbb,INSERT INTO bbb VALUES (1);,<not logged>
1156+
NOTICE: AUDIT: OBJECT,67,2,WRITE,UPDATE,TABLE,public.bbb,UPDATE bbb set id = new.id + 1,<not logged>
1157+
NOTICE: AUDIT: SESSION,67,2,WRITE,UPDATE,TABLE,public.bbb,UPDATE bbb set id = new.id + 1,<not logged>
11901158
SET pgaudit.log_parameter TO ON;
11911159
DROP TABLE bbb;
11921160
DROP TABLE aaa;
11931161
-- Test create table as after extension as been dropped
11941162
DROP EXTENSION pgaudit;
11951163
CREATE TABLE tmp (id int, data text);
11961164
CREATE TABLE tmp2 AS (SELECT * FROM tmp);
1197-
NOTICE: AUDIT: SESSION,72,1,READ,SELECT,TABLE,public.tmp,CREATE TABLE tmp2 AS (SELECT * FROM tmp);,<none>
1198-
NOTICE: AUDIT: SESSION,72,1,WRITE,INSERT,TABLE,public.tmp2,CREATE TABLE tmp2 AS (SELECT * FROM tmp);,<none>
1165+
NOTICE: AUDIT: SESSION,68,1,READ,SELECT,TABLE,public.tmp,CREATE TABLE tmp2 AS (SELECT * FROM tmp);,<none>
1166+
NOTICE: AUDIT: SESSION,68,1,WRITE,INSERT,TABLE,public.tmp2,CREATE TABLE tmp2 AS (SELECT * FROM tmp);,<none>
11991167
DROP TABLE tmp;
12001168
DROP TABLE tmp2;
12011169
--
@@ -1204,16 +1172,16 @@ CREATE TABLE h(x int ,y int) PARTITION BY HASH(x);
12041172
CREATE TABLE h_0 partition OF h FOR VALUES WITH ( MODULUS 2, REMAINDER 0);
12051173
CREATE TABLE h_1 partition OF h FOR VALUES WITH ( MODULUS 2, REMAINDER 1);
12061174
INSERT INTO h VALUES(1,1);
1207-
NOTICE: AUDIT: SESSION,73,1,WRITE,INSERT,TABLE,public.h,"INSERT INTO h VALUES(1,1);",<none>
1175+
NOTICE: AUDIT: SESSION,69,1,WRITE,INSERT,TABLE,public.h,"INSERT INTO h VALUES(1,1);",<none>
12081176
SELECT * FROM h;
1209-
NOTICE: AUDIT: SESSION,74,1,READ,SELECT,TABLE,public.h,SELECT * FROM h;,<none>
1177+
NOTICE: AUDIT: SESSION,70,1,READ,SELECT,TABLE,public.h,SELECT * FROM h;,<none>
12101178
x | y
12111179
---+---
12121180
1 | 1
12131181
(1 row)
12141182

12151183
SELECT * FROM h_0;
1216-
NOTICE: AUDIT: SESSION,75,1,READ,SELECT,TABLE,public.h_0,SELECT * FROM h_0;,<none>
1184+
NOTICE: AUDIT: SESSION,71,1,READ,SELECT,TABLE,public.h_0,SELECT * FROM h_0;,<none>
12171185
x | y
12181186
---+---
12191187
1 | 1

‎src/postgres/third-party-extensions/pgaudit/sql/yb_pg_pgaudit.sql‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -609,22 +609,14 @@ ALTER TABLE public.test
609609

610610
ALTER TABLE public.test2
611611
SET SCHEMA test;
612-
-- YB note: bump audit number to stay same with upstream.
613-
SELECT 'yb';
614612

615613
ALTER TABLE test.test2
616614
ADD COLUMN description TEXT;
617-
-- YB note: bump audit number to stay same with upstream.
618-
SELECT 'yb';
619615

620616
ALTER TABLE test.test2
621617
DROP COLUMN description;
622-
-- YB note: bump audit number to stay same with upstream.
623-
SELECT 'yb';
624618

625619
DROP TABLE test.test2;
626-
-- YB note: bump audit number to stay same with upstream.
627-
SELECT 'yb';
628620

629621
--
630622
-- Test multiple statements with one semi-colon

0 commit comments

Comments
 (0)