From 522786c581395ba686cd2a6eb854377f2d47060d Mon Sep 17 00:00:00 2001 From: Diego Fronza Date: Thu, 8 Aug 2024 17:01:58 -0300 Subject: [PATCH] Fix regression tests When query normalization is disabled utility queries like SELECT 10+20 are now stored as is, instead of SELECT $1+$2. Also when functions or sub queries are created the arguments used internally by the function or subqueries will be replaced by NULL instead of $1..$N. The actual arguments will be displayed when the function or subquery is actually invoked. --- regression/expected/pgsm_query_id.out | 4 ++-- regression/expected/top_query.out | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/regression/expected/pgsm_query_id.out b/regression/expected/pgsm_query_id.out index 9dc2938..c57e91c 100644 --- a/regression/expected/pgsm_query_id.out +++ b/regression/expected/pgsm_query_id.out @@ -87,8 +87,8 @@ SELECT datname, pgsm_query_id, query, calls FROM pg_stat_monitor ORDER BY pgsm_q db1 | 1897482803466821995 | SELECT * FROM t2 | 3 db1 | 1988437669671417938 | SELECT * FROM t1 | 1 db2 | 1988437669671417938 | SELECT * FROM t1 | 1 - db1 | 2864453209316739369 | select $1 + $2 | 1 - db2 | 2864453209316739369 | select $1 + $2 | 1 + db1 | 2864453209316739369 | select 1 + 2 | 1 + db2 | 2864453209316739369 | select 1 + 2 | 1 db2 | 6220142855706866455 | set pg_stat_monitor.pgsm_enable_pgsm_query_id = on | 1 db2 | 6633979598391393345 | SELECT * FROM t3 where c = 20 | 1 db1 | 8140395000078788481 | SELECT *, ADD(1, 2) FROM t1 | 1 diff --git a/regression/expected/top_query.out b/regression/expected/top_query.out index 38f0b37..2f3c3ca 100644 --- a/regression/expected/top_query.out +++ b/regression/expected/top_query.out @@ -26,7 +26,7 @@ SELECT add2(1,2); SELECT query, top_query FROM pg_stat_monitor ORDER BY query COLLATE "C"; query | top_query --------------------------------------------------------------+------------------- - (select $1 + $2) | SELECT add2(1,2); + (select NULL + NULL) | SELECT add2(1,2); CREATE OR REPLACE FUNCTION add(int, int) RETURNS INTEGER AS +| $$ +| BEGIN +|