NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit3d185cf

committed

Restore initdb's old behavior of always setting the lc_xxx GUCs.

In commit3e51b27 I (tgl) caused initdb to leave lc_messages andother lc_xxx GUCs commented-out in the installed postgresql.conf fileif they were going to be set to 'C'. This was a hack for cosmeticpurposes, and it was buggy because lc_messages' wired-in default isnot 'C' but '' (empty string). That led to --no-locale not havingthe expected effect, since the postmaster would then obtainlc_messages from its startup environment.Let's just revert to the prior behavior of always de-commenting thelc_xxx entries; the argument for changing that longstanding behaviorwas weak in the first place.Also, fix postgresql.conf.sample's erroneous claim that the defaultvalue of lc_messages is 'C'. I suspect that was what misled me intomaking this mistake in the first place.Report and patch by Kyotaro Horiguchi. Back-patch to v16 wherethe problem was introduced.Discussion:https://postgr.es/m/20231122.162700.1995154567625541112.horikyota.ntt@gmail.com

1 parent390298f commit3d185cfCopy full SHA for 3d185cf

File tree

2 files changed

-17

lines changed

src
- backend/utils/misc
  - postgresql.conf.sample
- bin/initdb
  - initdb.c

2 files changed

-17

lines changed

`‎src/backend/utils/misc/postgresql.conf.sample`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -734,7 +734,7 @@`
`734`	`734`	`# encoding`
`735`	`735`
`736`	`736`	`# These settings are initialized by initdb, but they can be changed.`
`737`		`-#lc_messages = 'C'# locale for system error message`
	`737`	`+#lc_messages = ''# locale for system error message`
`738`	`738`	`# strings`
`739`	`739`	`#lc_monetary = 'C'# locale for monetary formatting`
`740`	`740`	`#lc_numeric = 'C'# locale for number formatting`

`‎src/bin/initdb/initdb.c`

Lines changed: 8 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -1227,25 +1227,17 @@ setup_config(void)`
`1227`	`1227`	`conflines=replace_guc_value(conflines,"shared_buffers",`
`1228`	`1228`	`repltok, false);`
`1229`	`1229`
`1230`		`-/*`
`1231`		`- * Hack: don't replace the LC_XXX GUCs when their value is 'C', because`
`1232`		`- * replace_guc_value will decide not to quote that, which looks strange.`
`1233`		`- */`
`1234`		`-if (strcmp(lc_messages,"C")!=0)`
`1235`		`-conflines=replace_guc_value(conflines,"lc_messages",`
`1236`		`-lc_messages, false);`
	`1230`	`+conflines=replace_guc_value(conflines,"lc_messages",`
	`1231`	`+lc_messages, false);`
`1237`	`1232`
`1238`		`-if (strcmp(lc_monetary,"C")!=0)`
`1239`		`-conflines=replace_guc_value(conflines,"lc_monetary",`
`1240`		`-lc_monetary, false);`
	`1233`	`+conflines=replace_guc_value(conflines,"lc_monetary",`
	`1234`	`+lc_monetary, false);`
`1241`	`1235`
`1242`		`-if (strcmp(lc_numeric,"C")!=0)`
`1243`		`-conflines=replace_guc_value(conflines,"lc_numeric",`
`1244`		`-lc_numeric, false);`
	`1236`	`+conflines=replace_guc_value(conflines,"lc_numeric",`
	`1237`	`+lc_numeric, false);`
`1245`	`1238`
`1246`		`-if (strcmp(lc_time,"C")!=0)`
`1247`		`-conflines=replace_guc_value(conflines,"lc_time",`
`1248`		`-lc_time, false);`
	`1239`	`+conflines=replace_guc_value(conflines,"lc_time",`
	`1240`	`+lc_time, false);`
`1249`	`1241`
`1250`	`1242`	`switch (locale_date_order(lc_time))`
`1251`	`1243`	`{`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit3d185cf

File tree

2 files changed

2 files changed

`‎src/backend/utils/misc/postgresql.conf.sample`

`‎src/bin/initdb/initdb.c`

0 commit comments