From 52891896d06c9ffba01dde369d47cf02f441185f Mon Sep 17 00:00:00 2001 From: "Chao Li (Evan)" Date: Mon, 16 Mar 2026 10:01:11 +0800 Subject: [PATCH v1] regress: remove unnecessary subquery around current_database() Replace uses of (SELECT current_database()) with current_database() in stats.sql and the corresponding expected output. Author: Chao Li --- src/test/regress/expected/stats.out | 12 ++++++------ src/test/regress/sql/stats.sql | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/test/regress/expected/stats.out b/src/test/regress/expected/stats.out index 981d7c90822..0917d2c1266 100644 --- a/src/test/regress/expected/stats.out +++ b/src/test/regress/expected/stats.out @@ -931,7 +931,7 @@ SELECT (n_tup_ins + n_tup_upd) > 0 AS has_data FROM pg_stat_all_tables -- Test that various stats views are being properly populated ----- -- Test that sessions is incremented when a new session is started in pg_stat_database -SELECT sessions AS db_stat_sessions FROM pg_stat_database WHERE datname = (SELECT current_database()) \gset +SELECT sessions AS db_stat_sessions FROM pg_stat_database WHERE datname = current_database() \gset \c SELECT pg_stat_force_next_flush(); pg_stat_force_next_flush @@ -939,7 +939,7 @@ SELECT pg_stat_force_next_flush(); (1 row) -SELECT sessions > :db_stat_sessions FROM pg_stat_database WHERE datname = (SELECT current_database()); +SELECT sessions > :db_stat_sessions FROM pg_stat_database WHERE datname = current_database(); ?column? ---------- t @@ -1141,8 +1141,8 @@ SELECT pg_stat_reset(); (1 row) -SELECT stats_reset AS db_reset_ts FROM pg_stat_database WHERE datname = (SELECT current_database()) \gset -SELECT stats_reset AS dbc_reset_ts FROM pg_stat_database_conflicts WHERE datname = (SELECT current_database()) \gset +SELECT stats_reset AS db_reset_ts FROM pg_stat_database WHERE datname = current_database() \gset +SELECT stats_reset AS dbc_reset_ts FROM pg_stat_database_conflicts WHERE datname = current_database() \gset SELECT :'db_reset_ts'::timestamptz = :'dbc_reset_ts'::timestamptz; ?column? ---------- @@ -1155,13 +1155,13 @@ SELECT pg_stat_reset(); (1 row) -SELECT stats_reset > :'db_reset_ts'::timestamptz FROM pg_stat_database WHERE datname = (SELECT current_database()); +SELECT stats_reset > :'db_reset_ts'::timestamptz FROM pg_stat_database WHERE datname = current_database(); ?column? ---------- t (1 row) -SELECT stats_reset > :'dbc_reset_ts'::timestamptz FROM pg_stat_database_conflicts WHERE datname = (SELECT current_database()); +SELECT stats_reset > :'dbc_reset_ts'::timestamptz FROM pg_stat_database_conflicts WHERE datname = current_database(); ?column? ---------- t diff --git a/src/test/regress/sql/stats.sql b/src/test/regress/sql/stats.sql index 70af96f739f..f782f5f80b5 100644 --- a/src/test/regress/sql/stats.sql +++ b/src/test/regress/sql/stats.sql @@ -432,10 +432,10 @@ SELECT (n_tup_ins + n_tup_upd) > 0 AS has_data FROM pg_stat_all_tables ----- -- Test that sessions is incremented when a new session is started in pg_stat_database -SELECT sessions AS db_stat_sessions FROM pg_stat_database WHERE datname = (SELECT current_database()) \gset +SELECT sessions AS db_stat_sessions FROM pg_stat_database WHERE datname = current_database() \gset \c SELECT pg_stat_force_next_flush(); -SELECT sessions > :db_stat_sessions FROM pg_stat_database WHERE datname = (SELECT current_database()); +SELECT sessions > :db_stat_sessions FROM pg_stat_database WHERE datname = current_database(); -- Test pg_stat_checkpointer checkpointer-related stats, together with pg_stat_wal SELECT num_requested AS rqst_ckpts_before FROM pg_stat_checkpointer \gset @@ -529,12 +529,12 @@ SELECT pg_stat_reset_shared('unknown'); -- have a baseline for comparison. The same for pg_stat_database_conflicts as it shares -- the same stats_reset as pg_stat_database. SELECT pg_stat_reset(); -SELECT stats_reset AS db_reset_ts FROM pg_stat_database WHERE datname = (SELECT current_database()) \gset -SELECT stats_reset AS dbc_reset_ts FROM pg_stat_database_conflicts WHERE datname = (SELECT current_database()) \gset +SELECT stats_reset AS db_reset_ts FROM pg_stat_database WHERE datname = current_database() \gset +SELECT stats_reset AS dbc_reset_ts FROM pg_stat_database_conflicts WHERE datname = current_database() \gset SELECT :'db_reset_ts'::timestamptz = :'dbc_reset_ts'::timestamptz; SELECT pg_stat_reset(); -SELECT stats_reset > :'db_reset_ts'::timestamptz FROM pg_stat_database WHERE datname = (SELECT current_database()); -SELECT stats_reset > :'dbc_reset_ts'::timestamptz FROM pg_stat_database_conflicts WHERE datname = (SELECT current_database()); +SELECT stats_reset > :'db_reset_ts'::timestamptz FROM pg_stat_database WHERE datname = current_database(); +SELECT stats_reset > :'dbc_reset_ts'::timestamptz FROM pg_stat_database_conflicts WHERE datname = current_database(); ---- -- 2.50.1 (Apple Git-155)