From 4c32a8226a39b221ffe07ec17b5f67bc7fc6e9b4 Mon Sep 17 00:00:00 2001
From: Shaun Struwig <41984034+Blargian@users.noreply.github.com>
Date: Thu, 27 Mar 2025 00:00:16 +0100
Subject: [PATCH 1/2] show type and default
---
scripts/settings/autogenerate-settings.sh | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/scripts/settings/autogenerate-settings.sh b/scripts/settings/autogenerate-settings.sh
index f568cda7942..5ea6eb04011 100755
--- a/scripts/settings/autogenerate-settings.sh
+++ b/scripts/settings/autogenerate-settings.sh
@@ -134,25 +134,38 @@ WITH
(
SELECT
name,
- replaceRegexpAll(description, '(?m)^[ \t]+', '') AS description
+ replaceRegexpAll(description, '(?m)^[ \t]+', '') AS description,
+ type,
+ default
FROM system.server_settings
),
combined_server_settings AS
(
SELECT
name,
- description
+ description,
+ type,
+ default
FROM server_settings_in_source
UNION ALL
SELECT
name,
- doc AS description
+ doc AS description,
+ '' AS type,
+ '' AS default
FROM server_settings_outside_source
),
formatted_settings AS
(
SELECT
- format('## {} {}\n\n{}\n\n', name, lcase('{#'||name||'}'), description) AS formatted_text
+ format(
+ '## {} {}\n\n{}{}{}\n\n',
+ name,
+ lcase('{#'||name||'}'),
+ if(type != '', concat('Type: ', type, '\n\n'), ''),
+ if(default != '', concat('Default: ', default, '\n\n'), ''),
+ description
+ ) AS formatted_text
FROM combined_server_settings
ORDER BY name ASC
),
From de9a4e6ced011d91e7dae00ba1a4e6f3ac1c641f Mon Sep 17 00:00:00 2001
From: Shaun Struwig <41984034+Blargian@users.noreply.github.com>
Date: Thu, 27 Mar 2025 00:19:13 +0100
Subject: [PATCH 2/2] backtick default and type
---
scripts/settings/autogenerate-settings.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/settings/autogenerate-settings.sh b/scripts/settings/autogenerate-settings.sh
index 5ea6eb04011..997c5d7d78f 100755
--- a/scripts/settings/autogenerate-settings.sh
+++ b/scripts/settings/autogenerate-settings.sh
@@ -58,7 +58,7 @@ settings_from_cpp AS
),
main_content AS
(
- SELECT format('## {} {}\\n{}\\n\\nType: {}\\n\\nDefault value: {}\\n\\n{}\\n\\n',
+ SELECT format('## {} {}\\n{}\\n\\nType: \`{}\`\\n\\nDefault: \`{}\`\\n\\n{}\\n\\n',
name, '{#'||name||'}', multiIf(tier == 'Experimental', '', tier == 'Beta', '', ''), type, default, trim(BOTH '\\n' FROM description))
FROM system.settings WHERE name IN settings_from_cpp
ORDER BY name
@@ -162,8 +162,8 @@ WITH
'## {} {}\n\n{}{}{}\n\n',
name,
lcase('{#'||name||'}'),
- if(type != '', concat('Type: ', type, '\n\n'), ''),
- if(default != '', concat('Default: ', default, '\n\n'), ''),
+ if(type != '', concat('Type: \`', type, '\`\n\n'), ''),
+ if(default != '', concat('Default: \`', default, '\`\n\n'), ''),
description
) AS formatted_text
FROM combined_server_settings