aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Paquier <michael@paquier.xyz>2023-02-08 16:56:21 +0900
committerMichael Paquier <michael@paquier.xyz>2023-02-08 16:56:21 +0900
commitb7e84c65d5b2d694a669ae1db8ab1d6c51ef8596 (patch)
treea2f5935619501f64fcee71e78c1e1ab1f14754cb
parent9ed50ab3496f5fdc46d1051a005d5236495c92d7 (diff)
downloadpostgresql-b7e84c65d5b2d694a669ae1db8ab1d6c51ef8596.tar.gz
postgresql-b7e84c65d5b2d694a669ae1db8ab1d6c51ef8596.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 2914b950b48..127c9532976 100644
--- a/src/test/regress/expected/guc.out
+++ b/src/test/regress/expected/guc.out
@@ -841,7 +841,6 @@ CREATE TABLE tab_settings_flags AS SELECT name, category,
'EXPLAIN' = ANY(flags) AS explain,
'NO_RESET' = ANY(flags) AS no_reset,
'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,
@@ -880,33 +879,6 @@ 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)
-
-- NO_RESET implies NO_RESET_ALL.
SELECT name FROM tab_settings_flags
WHERE no_reset AND NOT no_reset_all
diff --git a/src/test/regress/sql/guc.sql b/src/test/regress/sql/guc.sql
index d40d0c178ff..dc79761955d 100644
--- a/src/test/regress/sql/guc.sql
+++ b/src/test/regress/sql/guc.sql
@@ -326,7 +326,6 @@ CREATE TABLE tab_settings_flags AS SELECT name, category,
'EXPLAIN' = ANY(flags) AS explain,
'NO_RESET' = ANY(flags) AS no_reset,
'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,
@@ -349,18 +348,6 @@ 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;
-- NO_RESET implies NO_RESET_ALL.
SELECT name FROM tab_settings_flags
WHERE no_reset AND NOT no_reset_all