From b702145ac34c1f3f0f26496efd573211603f78c9 Mon Sep 17 00:00:00 2001 From: Diego Fronza Date: Mon, 6 Dec 2021 10:13:31 -0300 Subject: [PATCH] PG-286: Update regression tests. As the query normalization and query cleaning is always done in the right place (pgss_store), no more parsed queries have a trailling comma ';' at the end. Also, on error regression test, after fixing some problems with utility related queries, we now have two entries for the RAISE WARNING case, the first entry is the utility query itself, the second entry is the error message logged by emit_log_hook. Some queries have the order adjusted due to the fix introduced by the previous commits. --- regression/expected/application_name.out | 10 ++-- regression/expected/basic.out | 8 ++-- regression/expected/cmd_type.out | 26 +++++----- regression/expected/counters.out | 16 +++---- regression/expected/database.out | 12 ++--- regression/expected/error.out | 28 ++++++----- regression/expected/error_1.out | 28 ++++++----- regression/expected/relations.out | 60 ++++++++++++------------ regression/expected/rows.out | 16 +++---- regression/expected/rows_1.out | 16 +++---- regression/expected/state.out | 12 ++--- regression/expected/tags.out | 4 +- regression/expected/top_query.out | 34 +++++++------- regression/expected/top_query_1.out | 34 +++++++------- 14 files changed, 156 insertions(+), 148 deletions(-) diff --git a/regression/expected/application_name.out b/regression/expected/application_name.out index 9d40e02..e200c18 100644 --- a/regression/expected/application_name.out +++ b/regression/expected/application_name.out @@ -12,11 +12,11 @@ SELECT 1 AS num; (1 row) SELECT query,application_name FROM pg_stat_monitor ORDER BY query COLLATE "C"; - query | application_name ---------------------------------------------------------------------------------+----------------------------- - SELECT $1 AS num | pg_regress/application_name - SELECT pg_stat_monitor_reset(); | pg_regress/application_name - SELECT query,application_name FROM pg_stat_monitor ORDER BY query COLLATE "C"; | pg_regress/application_name + query | application_name +-------------------------------------------------------------------------------+----------------------------- + SELECT $1 AS num | pg_regress/application_name + SELECT pg_stat_monitor_reset() | pg_regress/application_name + SELECT query,application_name FROM pg_stat_monitor ORDER BY query COLLATE "C" | pg_regress/application_name (3 rows) SELECT pg_stat_monitor_reset(); diff --git a/regression/expected/basic.out b/regression/expected/basic.out index 04b5eb8..adea370 100644 --- a/regression/expected/basic.out +++ b/regression/expected/basic.out @@ -12,11 +12,11 @@ SELECT 1 AS num; (1 row) SELECT query FROM pg_stat_monitor ORDER BY query COLLATE "C"; - query ---------------------------------------------------------------- + query +-------------------------------------------------------------- SELECT $1 AS num - SELECT pg_stat_monitor_reset(); - SELECT query FROM pg_stat_monitor ORDER BY query COLLATE "C"; + SELECT pg_stat_monitor_reset() + SELECT query FROM pg_stat_monitor ORDER BY query COLLATE "C" (3 rows) SELECT pg_stat_monitor_reset(); diff --git a/regression/expected/cmd_type.out b/regression/expected/cmd_type.out index aba4be0..086d230 100644 --- a/regression/expected/cmd_type.out +++ b/regression/expected/cmd_type.out @@ -24,19 +24,19 @@ SELECT b FROM t2 FOR UPDATE; TRUNCATE t1; DROP TABLE t1; SELECT query, cmd_type, cmd_type_text FROM pg_stat_monitor ORDER BY query COLLATE "C"; - query | cmd_type | cmd_type_text ------------------------------------------------------------------------------------------+----------+--------------- - CREATE TABLE t1 (a INTEGER); | 0 | - CREATE TABLE t2 (b INTEGER); | 0 | - DELETE FROM t1; | 4 | DELETE - DROP TABLE t1; | 0 | - INSERT INTO t1 VALUES($1) | 3 | INSERT - SELECT a FROM t1; | 1 | SELECT - SELECT b FROM t2 FOR UPDATE; | 1 | SELECT - SELECT pg_stat_monitor_reset(); | 1 | SELECT - SELECT query, cmd_type, cmd_type_text FROM pg_stat_monitor ORDER BY query COLLATE "C"; | 1 | SELECT - TRUNCATE t1; | 0 | - UPDATE t1 SET a = $1 | 2 | UPDATE + query | cmd_type | cmd_type_text +----------------------------------------------------------------------------------------+----------+--------------- + CREATE TABLE t1 (a INTEGER) | 0 | + CREATE TABLE t2 (b INTEGER) | 0 | + DELETE FROM t1 | 4 | DELETE + DROP TABLE t1 | 0 | + INSERT INTO t1 VALUES($1) | 3 | INSERT + SELECT a FROM t1 | 1 | SELECT + SELECT b FROM t2 FOR UPDATE | 1 | SELECT + SELECT pg_stat_monitor_reset() | 1 | SELECT + SELECT query, cmd_type, cmd_type_text FROM pg_stat_monitor ORDER BY query COLLATE "C" | 1 | SELECT + TRUNCATE t1 | 0 | + UPDATE t1 SET a = $1 | 2 | UPDATE (11 rows) SELECT pg_stat_monitor_reset(); diff --git a/regression/expected/counters.out b/regression/expected/counters.out index ebf26f7..40fed48 100644 --- a/regression/expected/counters.out +++ b/regression/expected/counters.out @@ -36,11 +36,11 @@ SELECT a,b,c,d FROM t1, t2, t3, t4 WHERE t1.a = t2.b AND t3.c = t4.d ORDER BY a; (0 rows) SELECT query,calls FROM pg_stat_monitor ORDER BY query COLLATE "C"; - query | calls -----------------------------------------------------------------------------------+------- - SELECT a,b,c,d FROM t1, t2, t3, t4 WHERE t1.a = t2.b AND t3.c = t4.d ORDER BY a; | 4 - SELECT pg_stat_monitor_reset(); | 1 - SELECT query,calls FROM pg_stat_monitor ORDER BY query COLLATE "C"; | 1 + query | calls +---------------------------------------------------------------------------------+------- + SELECT a,b,c,d FROM t1, t2, t3, t4 WHERE t1.a = t2.b AND t3.c = t4.d ORDER BY a | 4 + SELECT pg_stat_monitor_reset() | 1 + SELECT query,calls FROM pg_stat_monitor ORDER BY query COLLATE "C" | 1 (3 rows) SELECT pg_stat_monitor_reset(); @@ -69,8 +69,8 @@ SELECT query,calls FROM pg_stat_monitor ORDER BY query COLLATE "C"; query | calls ---------------------------------------------------------------------------------------------------+------- SELECT a,b,c,d FROM t1, t2, t3, t4 WHERE t1.a = t2.b AND t3.c = t4.d ORDER BY a | 1000 - SELECT pg_stat_monitor_reset(); | 1 - SELECT query,calls FROM pg_stat_monitor ORDER BY query COLLATE "C"; | 1 + SELECT pg_stat_monitor_reset() | 1 + SELECT query,calls FROM pg_stat_monitor ORDER BY query COLLATE "C" | 1 do $$ +| 1 declare +| n integer:= 1; +| @@ -80,7 +80,7 @@ SELECT query,calls FROM pg_stat_monitor ORDER BY query COLLATE "C"; exit when n = 1000; +| n := n + 1; +| end loop; +| - end $$; | + end $$ | (4 rows) SELECT pg_stat_monitor_reset(); diff --git a/regression/expected/database.out b/regression/expected/database.out index 378cbea..12c5055 100644 --- a/regression/expected/database.out +++ b/regression/expected/database.out @@ -28,12 +28,12 @@ SELECT * FROM t3,t4 WHERE t3.c = t4.d; \c contrib_regression SELECT datname, query FROM pg_stat_monitor ORDER BY query COLLATE "C"; - datname | query ---------------------+------------------------------------------------------------------------ - db1 | SELECT * FROM t1,t2 WHERE t1.a = t2.b; - db2 | SELECT * FROM t3,t4 WHERE t3.c = t4.d; - contrib_regression | SELECT datname, query FROM pg_stat_monitor ORDER BY query COLLATE "C"; - contrib_regression | SELECT pg_stat_monitor_reset(); + datname | query +--------------------+----------------------------------------------------------------------- + db1 | SELECT * FROM t1,t2 WHERE t1.a = t2.b + db2 | SELECT * FROM t3,t4 WHERE t3.c = t4.d + contrib_regression | SELECT datname, query FROM pg_stat_monitor ORDER BY query COLLATE "C" + contrib_regression | SELECT pg_stat_monitor_reset() (4 rows) SELECT pg_stat_monitor_reset(); diff --git a/regression/expected/error.out b/regression/expected/error.out index ccf7968..2e3d8fa 100644 --- a/regression/expected/error.out +++ b/regression/expected/error.out @@ -21,18 +21,22 @@ RAISE WARNING 'warning message'; END $$; WARNING: warning message SELECT query, elevel, sqlcode, message FROM pg_stat_monitor ORDER BY query COLLATE "C",elevel; - query | elevel | sqlcode | message -------------------------------------------------------------------------------------------------+--------+---------+----------------------------------- - ELECET * FROM unknown; | 20 | 42601 | syntax error at or near "ELECET" - SELECT * FROM unknown; | 20 | 42P01 | relation "unknown" does not exist - SELECT 1/0; | 20 | 22012 | division by zero - SELECT pg_stat_monitor_reset(); | 0 | | - SELECT query, elevel, sqlcode, message FROM pg_stat_monitor ORDER BY query COLLATE "C",elevel; | 0 | | - do $$ +| 19 | 01000 | warning message - BEGIN +| | | - RAISE WARNING 'warning message'; +| | | - END $$; | | | -(6 rows) + query | elevel | sqlcode | message +-----------------------------------------------------------------------------------------------+--------+---------+----------------------------------- + ELECET * FROM unknown; | 20 | 42601 | syntax error at or near "ELECET" + SELECT * FROM unknown; | 20 | 42P01 | relation "unknown" does not exist + SELECT 1/0; | 20 | 22012 | division by zero + SELECT pg_stat_monitor_reset() | 0 | | + SELECT query, elevel, sqlcode, message FROM pg_stat_monitor ORDER BY query COLLATE "C",elevel | 0 | | + do $$ +| 0 | | + BEGIN +| | | + RAISE WARNING 'warning message'; +| | | + END $$ | | | + do $$ +| 19 | 01000 | warning message + BEGIN +| | | + RAISE WARNING 'warning message'; +| | | + END $$; | | | +(7 rows) SELECT pg_stat_monitor_reset(); pg_stat_monitor_reset diff --git a/regression/expected/error_1.out b/regression/expected/error_1.out index 102a92a..7a61786 100644 --- a/regression/expected/error_1.out +++ b/regression/expected/error_1.out @@ -21,18 +21,22 @@ RAISE WARNING 'warning message'; END $$; WARNING: warning message SELECT query, elevel, sqlcode, message FROM pg_stat_monitor ORDER BY query COLLATE "C",elevel; - query | elevel | sqlcode | message -------------------------------------------------------------------------------------------------+--------+---------+----------------------------------- - ELECET * FROM unknown; | 21 | 42601 | syntax error at or near "ELECET" - SELECT * FROM unknown; | 21 | 42P01 | relation "unknown" does not exist - SELECT 1/0; | 21 | 22012 | division by zero - SELECT pg_stat_monitor_reset(); | 0 | | - SELECT query, elevel, sqlcode, message FROM pg_stat_monitor ORDER BY query COLLATE "C",elevel; | 0 | | - do $$ +| 19 | 01000 | warning message - BEGIN +| | | - RAISE WARNING 'warning message'; +| | | - END $$; | | | -(6 rows) + query | elevel | sqlcode | message +-----------------------------------------------------------------------------------------------+--------+---------+----------------------------------- + ELECET * FROM unknown; | 21 | 42601 | syntax error at or near "ELECET" + SELECT * FROM unknown; | 21 | 42P01 | relation "unknown" does not exist + SELECT 1/0; | 21 | 22012 | division by zero + SELECT pg_stat_monitor_reset() | 0 | | + SELECT query, elevel, sqlcode, message FROM pg_stat_monitor ORDER BY query COLLATE "C",elevel | 0 | | + do $$ +| 0 | | + BEGIN +| | | + RAISE WARNING 'warning message'; +| | | + END $$ | | | + do $$ +| 19 | 01000 | warning message + BEGIN +| | | + RAISE WARNING 'warning message'; +| | | + END $$; | | | +(7 rows) SELECT pg_stat_monitor_reset(); pg_stat_monitor_reset diff --git a/regression/expected/relations.out b/regression/expected/relations.out index 9ff9288..6c17a47 100644 --- a/regression/expected/relations.out +++ b/regression/expected/relations.out @@ -37,14 +37,14 @@ SELECT * FROM foo1, foo2, foo3, foo4; (0 rows) SELECT query, relations from pg_stat_monitor ORDER BY query collate "C"; - query | relations ---------------------------------------------------------------------------+--------------------------------------------------- - SELECT * FROM foo1, foo2, foo3, foo4; | {public.foo1,public.foo2,public.foo3,public.foo4} - SELECT * FROM foo1, foo2, foo3; | {public.foo1,public.foo2,public.foo3} - SELECT * FROM foo1, foo2; | {public.foo1,public.foo2} - SELECT * FROM foo1; | {public.foo1} - SELECT pg_stat_monitor_reset(); | - SELECT query, relations from pg_stat_monitor ORDER BY query collate "C"; | {public.pg_stat_monitor*,pg_catalog.pg_database} + query | relations +-------------------------------------------------------------------------+--------------------------------------------------- + SELECT * FROM foo1 | {public.foo1} + SELECT * FROM foo1, foo2 | {public.foo1,public.foo2} + SELECT * FROM foo1, foo2, foo3 | {public.foo1,public.foo2,public.foo3} + SELECT * FROM foo1, foo2, foo3, foo4 | {public.foo1,public.foo2,public.foo3,public.foo4} + SELECT pg_stat_monitor_reset() | + SELECT query, relations from pg_stat_monitor ORDER BY query collate "C" | {public.pg_stat_monitor*,pg_catalog.pg_database} (6 rows) SELECT pg_stat_monitor_reset(); @@ -89,14 +89,14 @@ SELECT * FROM sch1.foo1, sch2.foo2, sch3.foo3, sch4.foo4; (0 rows) SELECT query, relations from pg_stat_monitor ORDER BY query collate "C"; - query | relations ---------------------------------------------------------------------------+-------------------------------------------------- - SELECT * FROM sch1.foo1, sch2.foo2, sch3.foo3, sch4.foo4; | {sch1.foo1,sch2.foo2,sch3.foo3,sch4.foo4} - SELECT * FROM sch1.foo1, sch2.foo2, sch3.foo3; | {sch1.foo1,sch2.foo2,sch3.foo3} - SELECT * FROM sch1.foo1, sch2.foo2; | {sch1.foo1,sch2.foo2} - SELECT * FROM sch1.foo1; | {sch1.foo1} - SELECT pg_stat_monitor_reset(); | - SELECT query, relations from pg_stat_monitor ORDER BY query collate "C"; | {public.pg_stat_monitor*,pg_catalog.pg_database} + query | relations +-------------------------------------------------------------------------+-------------------------------------------------- + SELECT * FROM sch1.foo1 | {sch1.foo1} + SELECT * FROM sch1.foo1, sch2.foo2 | {sch1.foo1,sch2.foo2} + SELECT * FROM sch1.foo1, sch2.foo2, sch3.foo3 | {sch1.foo1,sch2.foo2,sch3.foo3} + SELECT * FROM sch1.foo1, sch2.foo2, sch3.foo3, sch4.foo4 | {sch1.foo1,sch2.foo2,sch3.foo3,sch4.foo4} + SELECT pg_stat_monitor_reset() | + SELECT query, relations from pg_stat_monitor ORDER BY query collate "C" | {public.pg_stat_monitor*,pg_catalog.pg_database} (6 rows) SELECT pg_stat_monitor_reset(); @@ -122,12 +122,12 @@ SELECT * FROM sch1.foo1, sch2.foo2, foo1, foo2; (0 rows) SELECT query, relations from pg_stat_monitor ORDER BY query; - query | relations ---------------------------------------------------------------+-------------------------------------------------- - SELECT * FROM sch1.foo1, foo1; | {sch1.foo1,public.foo1} - SELECT * FROM sch1.foo1, sch2.foo2, foo1, foo2; | {sch1.foo1,sch2.foo2,public.foo1,public.foo2} - SELECT pg_stat_monitor_reset(); | - SELECT query, relations from pg_stat_monitor ORDER BY query; | {public.pg_stat_monitor*,pg_catalog.pg_database} + query | relations +-------------------------------------------------------------+-------------------------------------------------- + SELECT * FROM sch1.foo1, foo1 | {sch1.foo1,public.foo1} + SELECT * FROM sch1.foo1, sch2.foo2, foo1, foo2 | {sch1.foo1,sch2.foo2,public.foo1,public.foo2} + SELECT pg_stat_monitor_reset() | + SELECT query, relations from pg_stat_monitor ORDER BY query | {public.pg_stat_monitor*,pg_catalog.pg_database} (4 rows) SELECT pg_stat_monitor_reset(); @@ -168,14 +168,14 @@ SELECT * FROM v1,v2,v3,v4; (0 rows) SELECT query, relations from pg_stat_monitor ORDER BY query collate "C"; - query | relations ---------------------------------------------------------------------------+----------------------------------------------------------------------------------------------- - SELECT * FROM v1,v2,v3,v4; | {public.v1*,public.foo1,public.v2*,public.foo2,public.v3*,public.foo3,public.v4*,public.foo4} - SELECT * FROM v1,v2,v3; | {public.v1*,public.foo1,public.v2*,public.foo2,public.v3*,public.foo3} - SELECT * FROM v1,v2; | {public.v1*,public.foo1,public.v2*,public.foo2} - SELECT * FROM v1; | {public.v1*,public.foo1} - SELECT pg_stat_monitor_reset(); | - SELECT query, relations from pg_stat_monitor ORDER BY query collate "C"; | {public.pg_stat_monitor*,pg_catalog.pg_database} + query | relations +-------------------------------------------------------------------------+----------------------------------------------------------------------------------------------- + SELECT * FROM v1 | {public.v1*,public.foo1} + SELECT * FROM v1,v2 | {public.v1*,public.foo1,public.v2*,public.foo2} + SELECT * FROM v1,v2,v3 | {public.v1*,public.foo1,public.v2*,public.foo2,public.v3*,public.foo3} + SELECT * FROM v1,v2,v3,v4 | {public.v1*,public.foo1,public.v2*,public.foo2,public.v3*,public.foo3,public.v4*,public.foo4} + SELECT pg_stat_monitor_reset() | + SELECT query, relations from pg_stat_monitor ORDER BY query collate "C" | {public.pg_stat_monitor*,pg_catalog.pg_database} (6 rows) SELECT pg_stat_monitor_reset(); diff --git a/regression/expected/rows.out b/regression/expected/rows.out index 5a0a0df..c68a9d8 100644 --- a/regression/expected/rows.out +++ b/regression/expected/rows.out @@ -8541,14 +8541,14 @@ SELECt * FROM t2 WHERE b % 2 = 0; (2500 rows) SELECT query, rows_retrieved FROM pg_stat_monitor ORDER BY query COLLATE "C"; - query | rows_retrieved --------------------------------------------------------------------------------+---------------- - SELECT * FROM t1 LIMIT $1 | 10 - SELECT * FROM t1; | 1000 - SELECT * FROM t2; | 5000 - SELECT pg_stat_monitor_reset(); | 1 - SELECT query, rows_retrieved FROM pg_stat_monitor ORDER BY query COLLATE "C"; | 0 - SELECt * FROM t2 WHERE b % $1 = $2 | 2500 + query | rows_retrieved +------------------------------------------------------------------------------+---------------- + SELECT * FROM t1 | 1000 + SELECT * FROM t1 LIMIT $1 | 10 + SELECT * FROM t2 | 5000 + SELECT pg_stat_monitor_reset() | 1 + SELECT query, rows_retrieved FROM pg_stat_monitor ORDER BY query COLLATE "C" | 0 + SELECt * FROM t2 WHERE b % $1 = $2 | 2500 (6 rows) SELECT pg_stat_monitor_reset(); diff --git a/regression/expected/rows_1.out b/regression/expected/rows_1.out index d6b3c09..c43d41a 100644 --- a/regression/expected/rows_1.out +++ b/regression/expected/rows_1.out @@ -8541,14 +8541,14 @@ SELECt * FROM t2 WHERE b % 2 = 0; (2500 rows) SELECT query, rows_retrieved FROM pg_stat_monitor ORDER BY query COLLATE "C"; - query | rows_retrieved --------------------------------------------------------------------------------+---------------- - SELECT * FROM t1 LIMIT $1 | 10 - SELECT * FROM t1; | 1000 - SELECT b FROM t2 FOR UPDATE; | 5000 - SELECT pg_stat_monitor_reset(); | 1 - SELECT query, rows_retrieved FROM pg_stat_monitor ORDER BY query COLLATE "C"; | 0 - SELECt * FROM t2 WHERE b % $1 = $2 | 2500 + query | rows_retrieved +------------------------------------------------------------------------------+---------------- + SELECT * FROM t1 | 1000 + SELECT * FROM t1 LIMIT $1 | 10 + SELECT b FROM t2 FOR UPDATE | 5000 + SELECT pg_stat_monitor_reset() | 1 + SELECT query, rows_retrieved FROM pg_stat_monitor ORDER BY query COLLATE "C" | 0 + SELECt * FROM t2 WHERE b % $1 = $2 | 2500 (6 rows) SELECT pg_stat_monitor_reset(); diff --git a/regression/expected/state.out b/regression/expected/state.out index b051091..bac22d1 100644 --- a/regression/expected/state.out +++ b/regression/expected/state.out @@ -14,12 +14,12 @@ SELECT 1; SELECT 1/0; -- divide by zero ERROR: division by zero SELECT query, state_code, state FROM pg_stat_monitor ORDER BY query COLLATE "C"; - query | state_code | state -----------------------------------------------------------------------------------+------------+--------------------- - SELECT $1 | 3 | FINISHED - SELECT 1/0; | 4 | FINISHED WITH ERROR - SELECT pg_stat_monitor_reset(); | 3 | FINISHED - SELECT query, state_code, state FROM pg_stat_monitor ORDER BY query COLLATE "C"; | 2 | ACTIVE + query | state_code | state +---------------------------------------------------------------------------------+------------+--------------------- + SELECT $1 | 3 | FINISHED + SELECT 1/0; | 4 | FINISHED WITH ERROR + SELECT pg_stat_monitor_reset() | 3 | FINISHED + SELECT query, state_code, state FROM pg_stat_monitor ORDER BY query COLLATE "C" | 2 | ACTIVE (4 rows) SELECT pg_stat_monitor_reset(); diff --git a/regression/expected/tags.out b/regression/expected/tags.out index b2cda90..27d37d3 100644 --- a/regression/expected/tags.out +++ b/regression/expected/tags.out @@ -15,8 +15,8 @@ SELECT query, comments FROM pg_stat_monitor ORDER BY query COLLATE "C"; query | comments ---------------------------------------------------------------------------+---------------------------------------------------------- SELECT $1 AS num /* { "application", psql_app, "real_ip", 192.168.1.3) */ | /* { "application", psql_app, "real_ip", 192.168.1.3) */ - SELECT pg_stat_monitor_reset(); | - SELECT query, comments FROM pg_stat_monitor ORDER BY query COLLATE "C"; | + SELECT pg_stat_monitor_reset() | + SELECT query, comments FROM pg_stat_monitor ORDER BY query COLLATE "C" | (3 rows) SELECT pg_stat_monitor_reset(); diff --git a/regression/expected/top_query.out b/regression/expected/top_query.out index 5d810f8..42d4f3b 100644 --- a/regression/expected/top_query.out +++ b/regression/expected/top_query.out @@ -23,23 +23,23 @@ SELECT add2(1,2); (1 row) SELECT query, top_query FROM pg_stat_monitor ORDER BY query COLLATE "C"; - query | top_query ---------------------------------------------------------------------------+-------------------- - CREATE OR REPLACE FUNCTION add(int, int) RETURNS INTEGER AS +| - $$ +| - BEGIN +| - return (select $1 + $2); +| - END; $$ language plpgsql; | - CREATE OR REPLACE function add2(int, int) RETURNS int as +| - $$ +| - BEGIN +| - return add($1,$2); +| - END; +| - $$ language plpgsql; | - SELECT (select $1 + $2) | SELECT add2($1,$2) - SELECT add2($1,$2) | - SELECT pg_stat_monitor_reset(); | - SELECT query, top_query FROM pg_stat_monitor ORDER BY query COLLATE "C"; | + query | top_query +-------------------------------------------------------------------------+-------------------- + CREATE OR REPLACE FUNCTION add(int, int) RETURNS INTEGER AS +| + $$ +| + BEGIN +| + return (select $1 + $2); +| + END; $$ language plpgsql | + CREATE OR REPLACE function add2(int, int) RETURNS int as +| + $$ +| + BEGIN +| + return add($1,$2); +| + END; +| + $$ language plpgsql | + SELECT (select $1 + $2) | SELECT add2($1,$2) + SELECT add2($1,$2) | + SELECT pg_stat_monitor_reset() | + SELECT query, top_query FROM pg_stat_monitor ORDER BY query COLLATE "C" | (6 rows) SELECT pg_stat_monitor_reset(); diff --git a/regression/expected/top_query_1.out b/regression/expected/top_query_1.out index ca738e5..b8e71a8 100644 --- a/regression/expected/top_query_1.out +++ b/regression/expected/top_query_1.out @@ -23,23 +23,23 @@ SELECT add2(1,2); (1 row) SELECT query, top_query FROM pg_stat_monitor ORDER BY query COLLATE "C"; - query | top_query ---------------------------------------------------------------------------+-------------------- - (select $1 + $2) | SELECT add2($1,$2) - CREATE OR REPLACE FUNCTION add(int, int) RETURNS INTEGER AS +| - $$ +| - BEGIN +| - return (select $1 + $2); +| - END; $$ language plpgsql; | - CREATE OR REPLACE function add2(int, int) RETURNS int as +| - $$ +| - BEGIN +| - return add($1,$2); +| - END; +| - $$ language plpgsql; | - SELECT add2($1,$2) | - SELECT pg_stat_monitor_reset(); | - SELECT query, top_query FROM pg_stat_monitor ORDER BY query COLLATE "C"; | + query | top_query +-------------------------------------------------------------------------+-------------------- + (select $1 + $2) | SELECT add2($1,$2) + CREATE OR REPLACE FUNCTION add(int, int) RETURNS INTEGER AS +| + $$ +| + BEGIN +| + return (select $1 + $2); +| + END; $$ language plpgsql | + CREATE OR REPLACE function add2(int, int) RETURNS int as +| + $$ +| + BEGIN +| + return add($1,$2); +| + END; +| + $$ language plpgsql | + SELECT add2($1,$2) | + SELECT pg_stat_monitor_reset() | + SELECT query, top_query FROM pg_stat_monitor ORDER BY query COLLATE "C" | (6 rows) SELECT pg_stat_monitor_reset();