aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Paquier <michael@paquier.xyz>2023-02-08 16:56:50 +0900
committerMichael Paquier <michael@paquier.xyz>2023-02-08 16:56:50 +0900
commitdbe8a1726cfd5a09cf1ef99e76f5f89e2efada71 (patch)
treea3211738372b3f290d8ff28f1b0aee8483f88107
parent78ec02d612a9b69039ec2610740f738968fe144d (diff)
downloadpostgresql-dbe8a1726cfd5a09cf1ef99e76f5f89e2efada71.tar.gz
postgresql-dbe8a1726cfd5a09cf1ef99e76f5f89e2efada71.zip
Remove SQL regression tests for GUCs related to NO_SHOW_ALL
No GUCs that use NO_SHOW_ALL are reported in pg_show_all_settings(), hence trying to check combinations of flags related to it is pointless. These queries have been introduced by d10e41d, so backpatch down to 15 to keep all the branches consistent. Equivalent checks based on NO_SHOW_ALL could be added in check_GUC_init() when a GUC is initially loaded, but this can be done only on HEAD. Author: Nitin Jadhav Discussion: https://postgr.es/m/CAMm1aWaYe0muu3ABo7iSAgK+OWDS9yNe8GGRYnCyeEpScYKa+g@mail.gmail.com Backpatch-through: 15
-rw-r--r--src/test/regress/expected/guc.out28
-rw-r--r--src/test/regress/sql/guc.sql13
2 files changed, 0 insertions, 41 deletions
diff --git a/src/test/regress/expected/guc.out b/src/test/regress/expected/guc.out
index 3de6404ba5b..b1ea04181c6 100644
--- a/src/test/regress/expected/guc.out
+++ b/src/test/regress/expected/guc.out
@@ -840,7 +840,6 @@ SELECT pg_settings_get_flags('does_not_exist');
CREATE TABLE tab_settings_flags AS SELECT name, category,
'EXPLAIN' = ANY(flags) AS explain,
'NO_RESET_ALL' = ANY(flags) AS no_reset_all,
- 'NO_SHOW_ALL' = ANY(flags) AS no_show_all,
'NOT_IN_SAMPLE' = ANY(flags) AS not_in_sample,
'RUNTIME_COMPUTED' = ANY(flags) AS runtime_computed
FROM pg_show_all_settings() AS psas,
@@ -879,31 +878,4 @@ SELECT name FROM tab_settings_flags
------
(0 rows)
--- NO_SHOW_ALL implies NO_RESET_ALL, and vice-versa.
-SELECT name FROM tab_settings_flags
- WHERE no_show_all AND NOT no_reset_all
- ORDER BY 1;
- name
-------
-(0 rows)
-
--- Exceptions are transaction_*.
-SELECT name FROM tab_settings_flags
- WHERE NOT no_show_all AND no_reset_all
- ORDER BY 1;
- name
-------------------------
- transaction_deferrable
- transaction_isolation
- transaction_read_only
-(3 rows)
-
--- NO_SHOW_ALL implies NOT_IN_SAMPLE.
-SELECT name FROM tab_settings_flags
- WHERE no_show_all AND NOT not_in_sample
- ORDER BY 1;
- name
-------
-(0 rows)
-
DROP TABLE tab_settings_flags;
diff --git a/src/test/regress/sql/guc.sql b/src/test/regress/sql/guc.sql
index d5db101e486..23cd8a1c92c 100644
--- a/src/test/regress/sql/guc.sql
+++ b/src/test/regress/sql/guc.sql
@@ -325,7 +325,6 @@ SELECT pg_settings_get_flags('does_not_exist');
CREATE TABLE tab_settings_flags AS SELECT name, category,
'EXPLAIN' = ANY(flags) AS explain,
'NO_RESET_ALL' = ANY(flags) AS no_reset_all,
- 'NO_SHOW_ALL' = ANY(flags) AS no_show_all,
'NOT_IN_SAMPLE' = ANY(flags) AS not_in_sample,
'RUNTIME_COMPUTED' = ANY(flags) AS runtime_computed
FROM pg_show_all_settings() AS psas,
@@ -348,16 +347,4 @@ SELECT name FROM tab_settings_flags
SELECT name FROM tab_settings_flags
WHERE category = 'Preset Options' AND NOT not_in_sample
ORDER BY 1;
--- NO_SHOW_ALL implies NO_RESET_ALL, and vice-versa.
-SELECT name FROM tab_settings_flags
- WHERE no_show_all AND NOT no_reset_all
- ORDER BY 1;
--- Exceptions are transaction_*.
-SELECT name FROM tab_settings_flags
- WHERE NOT no_show_all AND no_reset_all
- ORDER BY 1;
--- NO_SHOW_ALL implies NOT_IN_SAMPLE.
-SELECT name FROM tab_settings_flags
- WHERE no_show_all AND NOT not_in_sample
- ORDER BY 1;
DROP TABLE tab_settings_flags;