diff options
| author | Bruce Momjian <bruce@momjian.us> | 2011-05-24 15:59:00 -0400 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2011-05-24 15:59:34 -0400 |
| commit | 11c08c3fd79f1fd5a83f9156fc1c43c7be3453ce (patch) | |
| tree | ee9bf8a3b6b697383224a284de51b4ec5b669750 | |
| parent | 8ff1f6a78c4fb48337f671f1586839cef5d4b940 (diff) | |
| download | postgresql-11c08c3fd79f1fd5a83f9156fc1c43c7be3453ce.tar.gz postgresql-11c08c3fd79f1fd5a83f9156fc1c43c7be3453ce.zip | |
In pg_upgrade, do case-insensitive checks of locale, encoding, and ctype
because these are often inconsistently capitalized.
| -rw-r--r-- | contrib/pg_upgrade/check.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c index 2117b7f80d4..60c1fbbf976 100644 --- a/contrib/pg_upgrade/check.c +++ b/contrib/pg_upgrade/check.c @@ -333,13 +333,14 @@ static void check_locale_and_encoding(ControlData *oldctrl, ControlData *newctrl) { - if (strcmp(oldctrl->lc_collate, newctrl->lc_collate) != 0) + /* These are often defined with inconsistent case, so use pg_strcasecmp(). */ + if (pg_strcasecmp(oldctrl->lc_collate, newctrl->lc_collate) != 0) pg_log(PG_FATAL, "old and new cluster lc_collate values do not match\n"); - if (strcmp(oldctrl->lc_ctype, newctrl->lc_ctype) != 0) + if (pg_strcasecmp(oldctrl->lc_ctype, newctrl->lc_ctype) != 0) pg_log(PG_FATAL, "old and new cluster lc_ctype values do not match\n"); - if (strcmp(oldctrl->encoding, newctrl->encoding) != 0) + if (pg_strcasecmp(oldctrl->encoding, newctrl->encoding) != 0) pg_log(PG_FATAL, "old and new cluster encoding values do not match\n"); } |