Feedback-ID: i0fe9450f:Fastmail
Date: Tue, 20 Jan 2026 08:33:49 +0900
From: Michael Paquier <michael@paquier.xyz>
To: Postgres hackers <pgsql-hackers@lists.postgresql.org>
Subject: Some cleanup of pg_stat_statements tests
Message-ID: <aW6_Xc8auuu5iAPi@paquier.xyz>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="8YirBtY0D/wqTLyG"
Content-Disposition: inline
Archived-At: <https://www.postgresql.org/message-id/aW6_Xc8auuu5iAPi%40paquier.xyz>
Precedence: bulk


--8YirBtY0D/wqTLyG
Content-Type: multipart/mixed; boundary="XNwl/DRJSEx1WAQK"
Content-Disposition: inline


--XNwl/DRJSEx1WAQK
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi all,

While looking at this area of the code, I have noticed that the new
"squashing" test is not consistent with the rest of the test suite,
re-creating the extension for nothing.

The structure of the test is to have the "cleanup" phase second to
last, so as there is no need to create multiple times the extensions.

In passing, I'd like to suggest that REGRESS in the Makefile uses one
item per line, to minimize diffs when we add new stuff.

Any thoughts or objections about the attached?
Thanks,
--
Michael

--XNwl/DRJSEx1WAQK
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
	filename="0001-pg_stat_statements-Clean-up-test-logic.patch"
Content-Transfer-Encoding: quoted-printable

=46rom 53420990da3744105b17b75586107e33041cba27 Mon Sep 17 00:00:00 2001
=46rom: Michael Paquier <michael@paquier.xyz>
Date: Tue, 20 Jan 2026 08:31:56 +0900
Subject: [PATCH] pg_stat_statements: Clean up test logic

The test "squashing" has been added as the last item of the REGRESS
list, but "cleanup" should be the last one, dropping the extension.

In passing, the REGRESS list is cleaned up to include one item per line,
so as diffs are minimized when adding new test files.
---
 contrib/pg_stat_statements/Makefile           | 21 ++++++++++++++++---
 .../pg_stat_statements/expected/squashing.out |  1 -
 contrib/pg_stat_statements/meson.build        |  3 ++-
 contrib/pg_stat_statements/sql/squashing.sql  |  1 -
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/contrib/pg_stat_statements/Makefile b/contrib/pg_stat_statemen=
ts/Makefile
index fe0478ac5526..5bf99ed50d8c 100644
--- a/contrib/pg_stat_statements/Makefile
+++ b/contrib/pg_stat_statements/Makefile
@@ -19,9 +19,24 @@ PGFILEDESC =3D "pg_stat_statements - execution statistic=
s of SQL statements"
 LDFLAGS_SL +=3D $(filter -lm, $(LIBS))
=20
 REGRESS_OPTS =3D --temp-config $(top_srcdir)/contrib/pg_stat_statements/pg=
_stat_statements.conf
-REGRESS =3D select dml cursors utility level_tracking planning \
-	user_activity wal entry_timestamp privileges extended \
-	parallel plancache cleanup oldextversions squashing
+
+# Note: Test "cleanup" is kept second to last, removing the extension.
+REGRESS =3D select \
+	dml \
+	cursors \
+	utility \
+	level_tracking \
+	planning \
+	user_activity \
+	wal entry_timestamp \
+	privileges \
+	extended \
+	parallel \
+	plancache \
+	squashing \
+	cleanup \
+	oldextversions
+
 # Disabled because these tests require "shared_preload_libraries=3Dpg_stat=
_statements",
 # which typical installcheck users do not have (e.g. buildfarm clients).
 NO_INSTALLCHECK =3D 1
diff --git a/contrib/pg_stat_statements/expected/squashing.out b/contrib/pg=
_stat_statements/expected/squashing.out
index 6963a434db97..8438235a2ce0 100644
--- a/contrib/pg_stat_statements/expected/squashing.out
+++ b/contrib/pg_stat_statements/expected/squashing.out
@@ -1,7 +1,6 @@
 --
 -- Const squashing functionality
 --
-CREATE EXTENSION pg_stat_statements;
 --
 -- Simple Lists
 --
diff --git a/contrib/pg_stat_statements/meson.build b/contrib/pg_stat_state=
ments/meson.build
index 079a8eb5afcf..9d78cb88b7d7 100644
--- a/contrib/pg_stat_statements/meson.build
+++ b/contrib/pg_stat_statements/meson.build
@@ -37,6 +37,7 @@ install_data(
   kwargs: contrib_data_args,
 )
=20
+# Note: Test "cleanup" is kept second to last, removing the extension.
 tests +=3D {
   'name': 'pg_stat_statements',
   'sd': meson.current_source_dir(),
@@ -56,9 +57,9 @@ tests +=3D {
       'extended',
       'parallel',
       'plancache',
+      'squashing',
       'cleanup',
       'oldextversions',
-      'squashing',
     ],
     'regress_args': ['--temp-config', files('pg_stat_statements.conf')],
     # Disabled because these tests require
diff --git a/contrib/pg_stat_statements/sql/squashing.sql b/contrib/pg_stat=
_statements/sql/squashing.sql
index 2100f2d83fd0..fc9e65738738 100644
--- a/contrib/pg_stat_statements/sql/squashing.sql
+++ b/contrib/pg_stat_statements/sql/squashing.sql
@@ -1,7 +1,6 @@
 --
 -- Const squashing functionality
 --
-CREATE EXTENSION pg_stat_statements;
=20
 --
 -- Simple Lists
--=20
2.51.0


--XNwl/DRJSEx1WAQK--

--8YirBtY0D/wqTLyG
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEG72nH6vTowiyblFKnvQgOdbyQH0FAmluv10ACgkQnvQgOdby
QH0niA/8C3342TKWuD1G4zMCgD2L5emomyt08CFxqZCg8PGm8rVQmnW0GC6onqQV
r8kl0oINfriLUhFAv8XjEP7aWgAjyS6hazvC23+o3O84weXtITYKlE8zeaEnFKJ/
OJdqhpHbvhWqino1Zs7AEsGyZfy+y4BOZPrEZNoIREffgAliYfdW04dsbLoh9ts5
Rdi1zPsNV1HJiDNWcrdGgqh6BSAN5hPob1IVHYJhFB9mojon+Ud1vyeZRayRGHss
C5mH70lGIFqtFfjcpKvocYHy+yzC7j/DC1SjEU2GHPE9YGVlqJxukLrumsqiqU/d
CWEBloLKm8de33QYz6OkFBeG3HPTRssnR1Fszqko5PML+cMRTcBysEpcZnh7j0RM
Ps89iZRnjonG+vE6hCDO/K9sQtIYopVRvM29CPh2QUP9oEeEL70EmDF+zPHxjidE
fx9ToLHfrJ7QGKZsftnoVUTr48PBVBo7iDxME5t6FNEi6Z49EvmSgadCAYbOsjsl
ipf683So0To9qQirRg3+wrsUqx/eB8d2sLd0mg1IgbbynPgqDmJcpm7/5Hm0O9Zw
uQyAMt+QRZ+mhuEz5NJimOSqyO6meyY9/lT3Z0uJkFfjSssO1lf9g5kCWDQ7F1rc
DL3S1R+Y2HFdfV2/F3FHW9cG0EXX+CUhVcyo6QWNY2eQ5rGFZYU=
=m4VT
-----END PGP SIGNATURE-----

--8YirBtY0D/wqTLyG--