Merge branch 'PGPRO10_DEV' into PGPRO10

Author: vbwagner

src/backend/commands/dbcommands.c

@@ -149,8 +149,13 @@ createdb(ParseState *pstate, const CreatedbStmt *stmt)
 	char	   *dbcanonname = NULL;
 	char		dbcollprovider;
 	char	   *dbcollate_full_name;
+	char	   *icu_wincollate = NULL;
 	char	   *langtag = NULL;
 	const char *collate;
+#ifdef WIN32
+	char	   *dbcollate_original;
+	char	   *dbctype_original;
+#endif
 
 	/* Extract options from the statement node tree */
 	foreach(option, stmt->options)
@@ -393,6 +398,11 @@ createdb(ParseState *pstate, const CreatedbStmt *stmt)
 
 	/* Check that the chosen locales are valid, and get canonical spellings */
 
+#ifdef WIN32
+	dbcollate_original = dbcollate;
+	dbctype_original = dbctype;
+#endif
+
 	if (!check_locale(LC_CTYPE, dbctype, &canonname, '\0'))
 		ereport(ERROR,
 				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
@@ -429,6 +439,15 @@ createdb(ParseState *pstate, const CreatedbStmt *stmt)
 	/* check lc_collate and lc_ctype for icu if we need it */
 	if (dbcollprovider == COLLPROVIDER_ICU)
 	{
+#ifdef WIN32
+		/* set the libc canonnames for dbcollate and dbctype */
+
+		check_winlocale(dbcollate_original, &canonname, NULL);
+		dbcollate = canonname;
+
+		check_winlocale(dbctype_original, &canonname, NULL);
+		dbctype = canonname;
+#endif
 		if (!check_locale(LC_COLLATE, dbcollate, NULL, dbcollprovider))
 			ereport(ERROR,
 					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
@@ -448,8 +467,17 @@ createdb(ParseState *pstate, const CreatedbStmt *stmt)
 #ifdef USE_ICU
 	if (dbcollprovider == COLLPROVIDER_ICU)
 	{
-		langtag = get_icu_language_tag(dbcollate);
-		collate = get_icu_collate(dbcollate, langtag);
+#ifdef WIN32
+		if (!locale_is_c(dbcollate))
+		{
+			check_winlocale(dbcollate, NULL, &icu_wincollate);
+			collate = (const char *) icu_wincollate;
+		}
+#else							/* not WIN32 */
+		collate = (const char *) dbcollate;
+#endif							/* not WIN32 */
+		langtag = get_icu_language_tag(collate);
+		collate = get_icu_collate(collate, langtag);
 	}
 	else
 #endif
@@ -790,6 +818,8 @@ createdb(ParseState *pstate, const CreatedbStmt *stmt)
 		pfree(dbcanonname);
 	if (langtag)
 		pfree(langtag);
+	if (icu_wincollate)
+		pfree(icu_wincollate);
 
 	PG_END_ENSURE_ERROR_CLEANUP(createdb_failure_callback,
 								PointerGetDatum(&fparms));

src/backend/utils/adt/pg_locale.c

@@ -1836,24 +1836,39 @@ char2wchar(wchar_t *to, size_t tolen, const char *from, size_t fromlen,
  * If locale is "" return the environment value from setlocale().
  *
  * Otherwise return a malloc'd copy of locale if it is not NULL.
+ *
+ * In Windows, check that the name is not long (for example,
+ * "English_United States[.encoding]").
  */
 static char *
 check_icu_locale(const char *locale)
 {
-	if (locale)
+	char	   *canonname = NULL;
+	char	   *winlocale = NULL;
+	char	   *result;
+
+#ifdef WIN32
+	if (!locale_is_c(locale))
 	{
-		if (strlen(locale) == 0)
-		{
-			char	   *canonname;
+		check_winlocale(locale, NULL, &winlocale);
+		locale = (const char *) winlocale;
+	}
+#else							/* not WIN32 */
+	if (locale && strlen(locale) == 0)
+	{
+		check_locale(LC_COLLATE, locale, &canonname, COLLPROVIDER_LIBC);
+		locale = (const char *) canonname;
+	}
+#endif							/* not WIN32 */
 
-			check_locale(LC_COLLATE, locale, &canonname, COLLPROVIDER_LIBC);
-			return canonname;
-		}
+	result = locale ? pstrdup(locale) : NULL;
 
-		return pstrdup(locale);
-	}
+	if (canonname)
+		pfree(canonname);
+	if (winlocale)
+		pfree(winlocale);
 
-	return NULL;
+	return result;
 }
 
 /*

src/backend/utils/init/postinit.c

@@ -295,6 +295,7 @@ CheckMyDatabase(const char *name, bool am_superuser)
 	char	   *datcollate;
 	char		collprovider;
 	char	   *collversion;
+	char	   *wincollate = NULL;
 	char	   *langtag = NULL;
 	const char *collcollate;
 	char	   *actual_versionstr;
@@ -437,8 +438,16 @@ CheckMyDatabase(const char *name, bool am_superuser)
 #ifdef USE_ICU
 	if (collprovider == COLLPROVIDER_ICU)
 	{
-		langtag = get_icu_language_tag(collate);
-		collcollate = get_icu_collate(collate, langtag);
+		collcollate = (const char *) collate;
+#ifdef WIN32
+		if (!locale_is_c(collcollate))
+		{
+			check_winlocale(collcollate, NULL, &wincollate);
+			collcollate = (const char *) wincollate;
+		}
+#endif							/* WIN32 */
+		langtag = get_icu_language_tag(collcollate);
+		collcollate = get_icu_collate(collcollate, langtag);
 	}
 	else
 #endif
@@ -486,6 +495,8 @@ CheckMyDatabase(const char *name, bool am_superuser)
 		pfree(langtag);
 	if (actual_versionstr)
 		pfree(actual_versionstr);
+	if (wincollate)
+		pfree(wincollate);
 
 	check_strxfrm_bug();
 

src/bin/initdb/initdb.c

@@ -2357,6 +2357,10 @@ static void
 setlocales(void)
 {
 	char	   *canonname;
+#ifdef WIN32
+	char	   *lc_collate_original;
+	char	   *lc_ctype_original;
+#endif
 
 	/*
 	 * Set up the collation provider if possible and canonicalize the locale
@@ -2405,6 +2409,11 @@ setlocales(void)
 	 * current environment
 	 */
 
+#ifdef WIN32
+	lc_collate_original = pstrdup(lc_collate);
+	lc_ctype_original = pstrdup(lc_ctype);
+#endif
+
 	check_locale_name(LC_CTYPE, lc_ctype, &canonname, '\0');
 	lc_ctype = canonname;
 
@@ -2433,6 +2442,23 @@ setlocales(void)
 	/* check lc_collate and lc_ctype for icu if we need it */
 	if (collprovider == COLLPROVIDER_ICU)
 	{
+#ifdef WIN32
+		/* set the libc canonnames for lc_collate and lc_ctype */
+
+		check_winlocale(lc_collate_original, &canonname, NULL);
+		if (canonname == NULL && lc_collate_original != NULL)
+			exit(1);			/* check_winlocale printed the error */
+
+		pfree(lc_collate);
+		lc_collate = canonname;
+
+		check_winlocale(lc_ctype_original, &canonname, NULL);
+		if (canonname == NULL && lc_ctype_original != NULL)
+			exit(1);			/* check_winlocale printed the error */
+
+		pfree(lc_ctype);
+		lc_ctype = canonname;
+#endif
 		check_locale_name(LC_COLLATE, lc_collate, NULL, collprovider);
 		if (strcmp(lc_collate, lc_ctype) != 0)
 		{
@@ -2459,6 +2485,11 @@ setlocales(void)
 #endif
 
 	set_collation_version();
+
+#ifdef WIN32
+	free(lc_collate_original);
+	free(lc_ctype_original);
+#endif
 }
 
 /*
@@ -3474,26 +3505,44 @@ main(int argc, char *argv[])
  *
  * Otherwise return a malloc'd copy of locale if it is not NULL.
  *
+ * In Windows, check that the name is not long (for example,
+ * "English_United States[.encoding]").
+ *
  * This should match the backend's check_icu_locale() function.
  */
 static char *
 check_icu_locale_name(const char *locale)
 {
-	if (locale)
-	{
-		if (strlen(locale) == 0)
-		{
-			char	   *canonname;
+	char	   *canonname = NULL;
+	char	   *winlocale = NULL;
+	char	   *result;
 
-			check_locale_name(LC_COLLATE, locale, &canonname,
-							  COLLPROVIDER_LIBC);
-			return canonname;
-		}
+#ifdef WIN32
+	if (!locale_is_c(locale))
+	{
+		check_winlocale(locale, NULL, &winlocale);
 
-		return pstrdup(locale);
+		if (winlocale == NULL && locale != NULL)
+			exit(1);			/* check_winlocale printed the error */
+		else
+			locale = winlocale;
+	}
+#else							/* not WIN32 */
+	if (locale && strlen(locale) == 0)
+	{
+		check_locale_name(LC_COLLATE, locale, &canonname, COLLPROVIDER_LIBC);
+		locale = (const char *) canonname;
 	}
+#endif							/* not WIN32 */
 
-	return NULL;
+	result = locale ? pstrdup(locale) : NULL;
+
+	if (canonname)
+		pfree(canonname);
+	if (winlocale)
+		pfree(winlocale);
+
+	return result;
 }
 #endif							/* USE_ICU */
 
@@ -3503,6 +3552,7 @@ check_icu_locale_name(const char *locale)
 static void
 set_collation_version(void)
 {
+	char	   *wincollate = NULL;
 	char	   *langtag = NULL;
 	const char *collate;
 	bool		failure;
@@ -3512,15 +3562,29 @@ set_collation_version(void)
 	if (collprovider == COLLPROVIDER_ICU)
 	{
 #ifdef USE_ICU
-		langtag = get_icu_language_tag(lc_collate);
+#ifdef WIN32
+		if (!locale_is_c(lc_collate))
+		{
+			check_winlocale(lc_collate, NULL, &wincollate);
+
+			if (wincollate == NULL && lc_collate != NULL)
+				exit(1);		/* check_winlocale printed the error */
+			else
+				collate = (const char *) wincollate;
+		}
+#else							/* not WIN32 */
+		collate = (const char *) lc_collate;
+#endif							/* not WIN32 */
+
+		langtag = get_icu_language_tag(collate);
 		if (!langtag)
 		{
 			/* get_icu_language_tag printed the main error message */
 			fprintf(stderr, _("Rerun %s with a different locale selection.\n"),
 					progname);
 			exit(1);
 		}
-		collate = get_icu_collate(lc_collate, langtag);
+		collate = get_icu_collate(collate, langtag);
 #else
 		fprintf(stderr,
 				_("%s: ICU is not supported in this build\n"
@@ -3542,4 +3606,6 @@ set_collation_version(void)
 
 	if (langtag)
 		free(langtag);
+	if (wincollate)
+		free(wincollate);
 }

src/include/port.h

@@ -490,6 +490,10 @@ extern char *get_collation_actual_version(char collprovider,
 extern UCollator *open_collator(const char *collate);
 extern char * get_icu_language_tag(const char *localename);
 extern const char *get_icu_collate(const char *locale, const char *langtag);
+#ifdef WIN32
+extern void check_winlocale(const char *winlocale, char **libc_canononame,
+							char **icu_canonname);
+#endif							/* WIN32 */
 #endif							/* USE_ICU */
 
 #endif							/* not LIBPQ_MAKE */