Commit11c08c3

committed

In pg_upgrade, do case-insensitive checks of locale, encoding, and ctype

because these are often inconsistently capitalized.

1 parent8ff1f6a commit11c08c3Copy full SHA for 11c08c3

File tree

-3

lines changed

-3

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -333,13 +333,14 @@ static void`
`333`	`333`	`check_locale_and_encoding(ControlData*oldctrl,`
`334`	`334`	`ControlData*newctrl)`
`335`	`335`	`{`
`336`		`-if (strcmp(oldctrl->lc_collate,newctrl->lc_collate)!=0)`
	`336`	`+/* These are often defined with inconsistent case, so use pg_strcasecmp(). */`
	`337`	`+if (pg_strcasecmp(oldctrl->lc_collate,newctrl->lc_collate)!=0)`
`337`	`338`	`pg_log(PG_FATAL,`
`338`	`339`	`"old and new cluster lc_collate values do not match\n");`
`339`		`-if (strcmp(oldctrl->lc_ctype,newctrl->lc_ctype)!=0)`
	`340`	`+if (pg_strcasecmp(oldctrl->lc_ctype,newctrl->lc_ctype)!=0)`
`340`	`341`	`pg_log(PG_FATAL,`
`341`	`342`	`"old and new cluster lc_ctype values do not match\n");`
`342`		`-if (strcmp(oldctrl->encoding,newctrl->encoding)!=0)`
	`343`	`+if (pg_strcasecmp(oldctrl->encoding,newctrl->encoding)!=0)`
`343`	`344`	`pg_log(PG_FATAL,`
`344`	`345`	`"old and new cluster encoding values do not match\n");`
`345`	`346`	`}`

Comments

(0)