chore: sort config dump alphabetically

netqo · netqo · commit 5645b2ed06c2 · 2026-06-01T23:45:41.000-03:00
The config dump in Config.hs listed db-config, db-pre-config and the
db-pool-* settings out of alphabetical order, while the rest of the dump
was sorted. Now the whole dump is consistently alphabetical and update
the expected IO test configs to match.
diff --git a/src/PostgREST/Config.hs b/src/PostgREST/Config.hs
@@ -170,21 +170,21 @@ toText conf =
       ,("db-anon-role",              q . T.decodeUtf8 . fromMaybe "" . configDbAnonRole)
       ,("db-channel",                q . configDbChannel)
       ,("db-channel-enabled",            T.toLower . show . configDbChannelEnabled)
+      ,("db-config",                     T.toLower . show . configDbConfig)
       ,("db-extra-search-path",      q . T.intercalate "," . configDbExtraSearchPath)
       ,("db-hoisted-tx-settings",    q . T.intercalate "," . configDbHoistedTxSettings)
       ,("db-max-rows",                   maybe "\"\"" show . configDbMaxRows)
       ,("db-plan-enabled",               T.toLower . show . configDbPlanEnabled)
       ,("db-pool",                       show . configDbPoolSize)
       ,("db-pool-acquisition-timeout",   show . configDbPoolAcquisitionTimeout)
-      ,("db-pool-max-lifetime",          show . configDbPoolMaxLifetime)
-      ,("db-pool-max-idletime",          show . configDbPoolMaxIdletime)
       ,("db-pool-automatic-recovery",    T.toLower . show . configDbPoolAutomaticRecovery)
+      ,("db-pool-max-idletime",          show . configDbPoolMaxIdletime)
+      ,("db-pool-max-lifetime",          show . configDbPoolMaxLifetime)
+      ,("db-pre-config",             q . maybe mempty dumpQi . configDbPreConfig)
       ,("db-pre-request",            q . maybe mempty dumpQi . configDbPreRequest)
       ,("db-prepared-statements",        T.toLower . show . configDbPreparedStatements)
       ,("db-root-spec",              q . maybe mempty dumpQi . configDbRootSpec)
       ,("db-schemas",                q . T.intercalate "," . toList . configDbSchemas)
-      ,("db-config",                     T.toLower . show . configDbConfig)
-      ,("db-pre-config",             q . maybe mempty dumpQi . configDbPreConfig)
       ,("db-timezone-enabled",           T.toLower . show . configDbTimezoneEnabled)
       ,("db-tx-end",                 q . showTxEnd)
       ,("db-uri",                    q . configDbUri)
diff --git a/test/io/configs/expected/aliases.config b/test/io/configs/expected/aliases.config
@@ -3,21 +3,21 @@ db-aggregates-enabled = false
 db-anon-role = ""
 db-channel = "pgrst"
 db-channel-enabled = true
+db-config = true
 db-extra-search-path = "public"
 db-hoisted-tx-settings = "statement_timeout,plan_filter.statement_cost_limit,default_transaction_isolation"
 db-max-rows = 1000
 db-plan-enabled = false
 db-pool = 10
 db-pool-acquisition-timeout = 10
-db-pool-max-lifetime = 1800
-db-pool-max-idletime = 5
 db-pool-automatic-recovery = true
+db-pool-max-idletime = 5
+db-pool-max-lifetime = 1800
+db-pre-config = ""
 db-pre-request = "check_alias"
 db-prepared-statements = true
 db-root-spec = "open_alias"
 db-schemas = "provided_through_alias"
-db-config = true
-db-pre-config = ""
 db-timezone-enabled = true
 db-tx-end = "commit"
 db-uri = "postgresql://"
diff --git a/test/io/configs/expected/boolean-numeric.config b/test/io/configs/expected/boolean-numeric.config
@@ -3,21 +3,21 @@ db-aggregates-enabled = false
 db-anon-role = ""
 db-channel = "pgrst"
 db-channel-enabled = true
+db-config = true
 db-extra-search-path = "public"
 db-hoisted-tx-settings = "statement_timeout,plan_filter.statement_cost_limit,default_transaction_isolation"
 db-max-rows = ""
 db-plan-enabled = false
 db-pool = 10
 db-pool-acquisition-timeout = 10
-db-pool-max-lifetime = 1800
-db-pool-max-idletime = 30
 db-pool-automatic-recovery = true
+db-pool-max-idletime = 30
+db-pool-max-lifetime = 1800
+db-pre-config = ""
 db-pre-request = ""
 db-prepared-statements = false
 db-root-spec = ""
 db-schemas = "public"
-db-config = true
-db-pre-config = ""
 db-timezone-enabled = true
 db-tx-end = "commit"
 db-uri = "postgresql://"
diff --git a/test/io/configs/expected/boolean-string.config b/test/io/configs/expected/boolean-string.config
@@ -3,21 +3,21 @@ db-aggregates-enabled = false
 db-anon-role = ""
 db-channel = "pgrst"
 db-channel-enabled = true
+db-config = true
 db-extra-search-path = "public"
 db-hoisted-tx-settings = "statement_timeout,plan_filter.statement_cost_limit,default_transaction_isolation"
 db-max-rows = ""
 db-plan-enabled = false
 db-pool = 10
 db-pool-acquisition-timeout = 10
-db-pool-max-lifetime = 1800
-db-pool-max-idletime = 30
 db-pool-automatic-recovery = true
+db-pool-max-idletime = 30
+db-pool-max-lifetime = 1800
+db-pre-config = ""
 db-pre-request = ""
 db-prepared-statements = false
 db-root-spec = ""
 db-schemas = "public"
-db-config = true
-db-pre-config = ""
 db-timezone-enabled = true
 db-tx-end = "commit"
 db-uri = "postgresql://"
diff --git a/test/io/configs/expected/defaults.config b/test/io/configs/expected/defaults.config
@@ -3,21 +3,21 @@ db-aggregates-enabled = false
 db-anon-role = ""
 db-channel = "pgrst"
 db-channel-enabled = true
+db-config = false
 db-extra-search-path = "public"
 db-hoisted-tx-settings = "statement_timeout,plan_filter.statement_cost_limit,default_transaction_isolation"
 db-max-rows = ""
 db-plan-enabled = false
 db-pool = 10
 db-pool-acquisition-timeout = 10
-db-pool-max-lifetime = 1800
-db-pool-max-idletime = 30
 db-pool-automatic-recovery = true
+db-pool-max-idletime = 30
+db-pool-max-lifetime = 1800
+db-pre-config = ""
 db-pre-request = ""
 db-prepared-statements = true
 db-root-spec = ""
 db-schemas = "public"
-db-config = false
-db-pre-config = ""
 db-timezone-enabled = true
 db-tx-end = "commit"
 db-uri = "postgresql://"
diff --git a/test/io/configs/expected/jspath-str-op-dump1.config b/test/io/configs/expected/jspath-str-op-dump1.config
@@ -3,21 +3,21 @@ db-aggregates-enabled = false
 db-anon-role = ""
 db-channel = "pgrst"
 db-channel-enabled = true
+db-config = true
 db-extra-search-path = "public"
 db-hoisted-tx-settings = "statement_timeout,plan_filter.statement_cost_limit,default_transaction_isolation"
 db-max-rows = ""
 db-plan-enabled = false
 db-pool = 10
 db-pool-acquisition-timeout = 10
-db-pool-max-lifetime = 1800
-db-pool-max-idletime = 30
 db-pool-automatic-recovery = true
+db-pool-max-idletime = 30
+db-pool-max-lifetime = 1800
+db-pre-config = ""
 db-pre-request = ""
 db-prepared-statements = true
 db-root-spec = ""
 db-schemas = "public"
-db-config = true
-db-pre-config = ""
 db-timezone-enabled = true
 db-tx-end = "commit"
 db-uri = "postgresql://"
diff --git a/test/io/configs/expected/jspath-str-op-dump2.config b/test/io/configs/expected/jspath-str-op-dump2.config
@@ -3,21 +3,21 @@ db-aggregates-enabled = false
 db-anon-role = ""
 db-channel = "pgrst"
 db-channel-enabled = true
+db-config = true
 db-extra-search-path = "public"
 db-hoisted-tx-settings = "statement_timeout,plan_filter.statement_cost_limit,default_transaction_isolation"
 db-max-rows = ""
 db-plan-enabled = false
 db-pool = 10
 db-pool-acquisition-timeout = 10
-db-pool-max-lifetime = 1800
-db-pool-max-idletime = 30
 db-pool-automatic-recovery = true
+db-pool-max-idletime = 30
+db-pool-max-lifetime = 1800
+db-pre-config = ""
 db-pre-request = ""
 db-prepared-statements = true
 db-root-spec = ""
 db-schemas = "public"
-db-config = true
-db-pre-config = ""
 db-timezone-enabled = true
 db-tx-end = "commit"
 db-uri = "postgresql://"
diff --git a/test/io/configs/expected/jspath-str-op-dump3.config b/test/io/configs/expected/jspath-str-op-dump3.config
@@ -3,21 +3,21 @@ db-aggregates-enabled = false
 db-anon-role = ""
 db-channel = "pgrst"
 db-channel-enabled = true
+db-config = true
 db-extra-search-path = "public"
 db-hoisted-tx-settings = "statement_timeout,plan_filter.statement_cost_limit,default_transaction_isolation"
 db-max-rows = ""
 db-plan-enabled = false
 db-pool = 10
 db-pool-acquisition-timeout = 10
-db-pool-max-lifetime = 1800
-db-pool-max-idletime = 30
 db-pool-automatic-recovery = true
+db-pool-max-idletime = 30
+db-pool-max-lifetime = 1800
+db-pre-config = ""
 db-pre-request = ""
 db-prepared-statements = true
 db-root-spec = ""
 db-schemas = "public"
-db-config = true
-db-pre-config = ""
 db-timezone-enabled = true
 db-tx-end = "commit"
 db-uri = "postgresql://"
diff --git a/test/io/configs/expected/jspath-str-op-dump4.config b/test/io/configs/expected/jspath-str-op-dump4.config
@@ -3,21 +3,21 @@ db-aggregates-enabled = false
 db-anon-role = ""
 db-channel = "pgrst"
 db-channel-enabled = true
+db-config = true
 db-extra-search-path = "public"
 db-hoisted-tx-settings = "statement_timeout,plan_filter.statement_cost_limit,default_transaction_isolation"
 db-max-rows = ""
 db-plan-enabled = false
 db-pool = 10
 db-pool-acquisition-timeout = 10
-db-pool-max-lifetime = 1800
-db-pool-max-idletime = 30
 db-pool-automatic-recovery = true
+db-pool-max-idletime = 30
+db-pool-max-lifetime = 1800
+db-pre-config = ""
 db-pre-request = ""
 db-prepared-statements = true
 db-root-spec = ""
 db-schemas = "public"
-db-config = true
-db-pre-config = ""
 db-timezone-enabled = true
 db-tx-end = "commit"
 db-uri = "postgresql://"
diff --git a/test/io/configs/expected/jspath-str-op-dump5.config b/test/io/configs/expected/jspath-str-op-dump5.config
@@ -3,21 +3,21 @@ db-aggregates-enabled = false
 db-anon-role = ""
 db-channel = "pgrst"
 db-channel-enabled = true
+db-config = true
 db-extra-search-path = "public"
 db-hoisted-tx-settings = "statement_timeout,plan_filter.statement_cost_limit,default_transaction_isolation"
 db-max-rows = ""
 db-plan-enabled = false
 db-pool = 10
 db-pool-acquisition-timeout = 10
-db-pool-max-lifetime = 1800
-db-pool-max-idletime = 30
 db-pool-automatic-recovery = true
+db-pool-max-idletime = 30
+db-pool-max-lifetime = 1800
+db-pre-config = ""
 db-pre-request = ""
 db-prepared-statements = true
 db-root-spec = ""
 db-schemas = "public"
-db-config = true
-db-pre-config = ""
 db-timezone-enabled = true
 db-tx-end = "commit"
 db-uri = "postgresql://"
diff --git a/test/io/configs/expected/no-defaults-with-db-other-authenticator.config b/test/io/configs/expected/no-defaults-with-db-other-authenticator.config
@@ -3,21 +3,21 @@ db-aggregates-enabled = false
 db-anon-role = "pre_config_role"
 db-channel = "postgrest"
 db-channel-enabled = false
+db-config = true
 db-extra-search-path = "public,extensions,other"
 db-hoisted-tx-settings = "maintenance_work_mem"
 db-max-rows = 100
 db-plan-enabled = true
 db-pool = 1
 db-pool-acquisition-timeout = 30
-db-pool-max-lifetime = 3600
-db-pool-max-idletime = 60
 db-pool-automatic-recovery = false
+db-pool-max-idletime = 60
+db-pool-max-lifetime = 3600
+db-pre-config = "postgrest.other_preconf"
 db-pre-request = "test.other_custom_headers"
 db-prepared-statements = false
 db-root-spec = "other_root"
 db-schemas = "test,other_tenant1,other_tenant2"
-db-config = true
-db-pre-config = "postgrest.other_preconf"
 db-timezone-enabled = false
 db-tx-end = "rollback-allow-override"
 db-uri = "postgresql://"
diff --git a/test/io/configs/expected/no-defaults-with-db.config b/test/io/configs/expected/no-defaults-with-db.config
@@ -3,21 +3,21 @@ db-aggregates-enabled = false
 db-anon-role = "anonymous"
 db-channel = "postgrest"
 db-channel-enabled = false
+db-config = true
 db-extra-search-path = "public,extensions,private"
 db-hoisted-tx-settings = "autovacuum_work_mem"
 db-max-rows = 500
 db-plan-enabled = false
 db-pool = 1
 db-pool-acquisition-timeout = 30
-db-pool-max-lifetime = 3600
-db-pool-max-idletime = 60
 db-pool-automatic-recovery = false
+db-pool-max-idletime = 60
+db-pool-max-lifetime = 3600
+db-pre-config = "postgrest.preconf"
 db-pre-request = "test.custom_headers"
 db-prepared-statements = false
 db-root-spec = "root"
 db-schemas = "test,tenant1,tenant2"
-db-config = true
-db-pre-config = "postgrest.preconf"
 db-timezone-enabled = false
 db-tx-end = "commit-allow-override"
 db-uri = "postgresql://"
diff --git a/test/io/configs/expected/no-defaults.config b/test/io/configs/expected/no-defaults.config
@@ -3,21 +3,21 @@ db-aggregates-enabled = true
 db-anon-role = "root"
 db-channel = "postgrest"
 db-channel-enabled = false
+db-config = false
 db-extra-search-path = "public,test"
 db-hoisted-tx-settings = "work_mem"
 db-max-rows = 1000
 db-plan-enabled = true
 db-pool = 1
 db-pool-acquisition-timeout = 30
-db-pool-max-lifetime = 3600
-db-pool-max-idletime = 60
 db-pool-automatic-recovery = false
+db-pool-max-idletime = 60
+db-pool-max-lifetime = 3600
+db-pre-config = "postgrest.pre_config"
 db-pre-request = "please_run_fast"
 db-prepared-statements = false
 db-root-spec = "openapi_v3"
 db-schemas = "multi,tenant,setup"
-db-config = false
-db-pre-config = "postgrest.pre_config"
 db-timezone-enabled = false
 db-tx-end = "rollback-allow-override"
 db-uri = "tmp_db"
diff --git a/test/io/configs/expected/types.config b/test/io/configs/expected/types.config
@@ -3,21 +3,21 @@ db-aggregates-enabled = false
 db-anon-role = ""
 db-channel = "pgrst"
 db-channel-enabled = true
+db-config = true
 db-extra-search-path = "public"
 db-hoisted-tx-settings = "statement_timeout,plan_filter.statement_cost_limit,default_transaction_isolation"
 db-max-rows = ""
 db-plan-enabled = false
 db-pool = 10
 db-pool-acquisition-timeout = 10
-db-pool-max-lifetime = 1800
-db-pool-max-idletime = 30
 db-pool-automatic-recovery = true
+db-pool-max-idletime = 30
+db-pool-max-lifetime = 1800
+db-pre-config = ""
 db-pre-request = ""
 db-prepared-statements = true
 db-root-spec = ""
 db-schemas = "public"
-db-config = true
-db-pre-config = ""
 db-timezone-enabled = true
 db-tx-end = "commit"
 db-uri = "postgresql://"
diff --git a/test/io/configs/expected/utf-8.config b/test/io/configs/expected/utf-8.config
@@ -3,21 +3,21 @@ db-aggregates-enabled = false
 db-anon-role = ""
 db-channel = "pgrst"
 db-channel-enabled = true
+db-config = true
 db-extra-search-path = "public"
 db-hoisted-tx-settings = "statement_timeout,plan_filter.statement_cost_limit,default_transaction_isolation"
 db-max-rows = ""
 db-plan-enabled = false
 db-pool = 10
 db-pool-acquisition-timeout = 10
-db-pool-max-lifetime = 1800
-db-pool-max-idletime = 30
 db-pool-automatic-recovery = true
+db-pool-max-idletime = 30
+db-pool-max-lifetime = 1800
+db-pre-config = ""
 db-pre-request = ""
 db-prepared-statements = true
 db-root-spec = ""
 db-schemas = "public"
-db-config = true
-db-pre-config = ""
 db-timezone-enabled = true
 db-tx-end = "commit"
 db-uri = "postgresql://"
