Re: pgsql: ICU support

On 24 March 2017 at 06:33, Peter Eisentraut <peter_e@gmx.net> wrote:
> http://git.postgresql.org/pg/commitdiff/eccfef81e1f73ee41f1d8bfe4fa4e80576945048

[...]

> src/include/utils/pg_locale.h                    |   32 +-

I see this commit changed the definition of pg_locale_t

+struct pg_locale_t
+{
+   char    provider;
+   union
+   {
 #ifdef HAVE_LOCALE_T
-typedef locale_t pg_locale_t;
-#else
-typedef int pg_locale_t;
+       locale_t lt;
+#endif
+#ifdef USE_ICU
+       struct {
+           const char *locale;
+           UCollator *ucol;
+       } icu;
 #endif
+   } info;
+};

but forgot to update varstr_cmp() completely.

result = wcscoll_l((LPWSTR) a1p, (LPWSTR) a2p, mylocale);

should be:

result = wcscoll_l((LPWSTR) a1p, (LPWSTR) a2p, mylocale->info.lt);

Patch attached.


--
 David Rowley                   http://www.2ndQuadrant.com/
 PostgreSQL Development, 24x7 Support, Training & Services