From 6fb65268fbb88ea42a0f6ceadb687f29abb62e02 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Fri, 15 Sep 2023 21:08:51 +0000 Subject: [PATCH] Fix compare-db-settings to work with Azure For some reason on Azure's Postgres flexible-server PGv15 the SQL SELECT name, setting, unit, pending_restart \ FROM pg_settings \ ORDER BY name; Does not return a consistent ordering when run on different databases on the same PG server. So run the output through `sort`. --- make_files/make_db.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/make_files/make_db.mk b/make_files/make_db.mk index 07d06a4..8826980 100644 --- a/make_files/make_db.mk +++ b/make_files/make_db.mk @@ -704,6 +704,7 @@ drop-public-root: db/pg_settings.new: printf '$(GET_PG_SETTINGS)\n' \ | psql $(PSQL_ARGS_MINIMAL) --tuples-only \ + | sort --stable \ > db/pg_settings.new ## compare-db-settings @@ -715,7 +716,8 @@ db/pg_settings.new: compare-db-settings: printf '$(GET_PG_SETTINGS)\n' \ | psql $(PSQL_ARGS_MINIMAL) --tuples-only \ - | diff -u db/pg_settings /dev/stdin + | sort --stable \ + | diff -U 0 db/pg_settings /dev/stdin ## ## Lesser used targets: -- 2.34.1