From c73a0dec1856476ec670e1f1c5d7aac34f8a4da4 Mon Sep 17 00:00:00 2001 From: Fantix King Date: Tue, 24 Dec 2024 09:49:21 -0500 Subject: [PATCH] Fix previous static backend config issue Static config is obviously not `config_sess`, and it's not always `is_backend`. It was okay because the backend value is just the same, but still good to make it right. --- edb/pgsql/metaschema.py | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/edb/pgsql/metaschema.py b/edb/pgsql/metaschema.py index a99962702ea..035b13e71ee 100644 --- a/edb/pgsql/metaschema.py +++ b/edb/pgsql/metaschema.py @@ -3581,6 +3581,23 @@ class SysConfigFullFunction(trampoline.VersionedFunction): SELECT * FROM config_defaults WHERE name like '%::%' ), + config_static AS ( + SELECT + s.name AS name, + s.value AS value, + (CASE + WHEN s.type = 'A' THEN 'command line' + WHEN s.type = 'E' THEN 'environment variable' + ELSE 'configuration file' -- 'F', matches WHERE below + END) AS source, + config_spec.backend_setting IS NOT NULL AS is_backend + FROM + _edgecon_state s + INNER JOIN config_spec ON (config_spec.name = s.name) + WHERE + s.type = 'A' OR s.type = 'E' OR s.type = 'F' + ), + config_sys AS ( SELECT s.key AS name, @@ -3611,17 +3628,12 @@ class SysConfigFullFunction(trampoline.VersionedFunction): SELECT s.name AS name, s.value AS value, - (CASE - WHEN s.type = 'A' THEN 'command line' - WHEN s.type = 'E' THEN 'environment variable' - WHEN s.type = 'F' THEN 'configuration file' - ELSE 'session' - END) AS source, - FALSE AS from_backend -- only 'B' is for backend settings + 'session' AS source, + FALSE AS is_backend -- only 'B' is for backend settings FROM _edgecon_state s WHERE - s.type != 'B' + s.type = 'C' ), pg_db_setting AS ( @@ -3791,6 +3803,7 @@ class SysConfigFullFunction(trampoline.VersionedFunction): FROM ( SELECT * FROM config_defaults UNION ALL + SELECT * FROM config_static UNION ALL SELECT * FROM config_sys UNION ALL SELECT * FROM config_db UNION ALL SELECT * FROM config_sess