Sigh ... I should know better than to assume meson code will work
without testing it. One-line fix in v5-0002.
regards, tom lane
From 672e889c76194985c9c325b3500c26e0aaaa583f Mon Sep 17 00:00:00 2001
From: Tom Lane <[email protected]>
Date: Mon, 8 Dec 2025 17:40:00 -0500
Subject: [PATCH v5 1/2] Add a regression test to verify that NLS translation
works.
We've never actually had a formal test for this facility.
It seems worth adding one now, mainly because we are starting
to depend on gettext() being able to handle the PRI* macros
from <inttypes.h>, and it's not all that certain that that
works everywhere. So the test goes to a bit of effort to
check all the PRI* macros we are likely to use.
---
src/test/regress/expected/nls.out | 37 +++++++
src/test/regress/expected/nls_1.out | 22 ++++
src/test/regress/meson.build | 2 +
src/test/regress/nls.mk | 5 +
src/test/regress/parallel_schedule | 2 +-
src/test/regress/po/LINGUAS | 1 +
src/test/regress/po/es.po | 159 ++++++++++++++++++++++++++++
src/test/regress/po/meson.build | 3 +
src/test/regress/regress.c | 63 +++++++++++
src/test/regress/sql/nls.sql | 21 ++++
10 files changed, 314 insertions(+), 1 deletion(-)
create mode 100644 src/test/regress/expected/nls.out
create mode 100644 src/test/regress/expected/nls_1.out
create mode 100644 src/test/regress/nls.mk
create mode 100644 src/test/regress/po/LINGUAS
create mode 100644 src/test/regress/po/es.po
create mode 100644 src/test/regress/po/meson.build
create mode 100644 src/test/regress/sql/nls.sql
diff --git a/src/test/regress/expected/nls.out b/src/test/regress/expected/nls.out
new file mode 100644
index 00000000000..32ef23aa057
--- /dev/null
+++ b/src/test/regress/expected/nls.out
@@ -0,0 +1,37 @@
+-- directory paths and dlsuffix are passed to us in environment variables
+\getenv libdir PG_LIBDIR
+\getenv dlsuffix PG_DLSUFFIX
+\set regresslib :libdir '/regress' :dlsuffix
+CREATE FUNCTION test_translation()
+ RETURNS void
+ AS :'regresslib'
+ LANGUAGE C;
+-- Some BSDen are sticky about wanting a codeset in lc_messages.
+-- Try to extract it from pg_database.datctype.
+SELECT 'es_ES' || coalesce(regexp_substr(datctype, '\..*'), '') AS es_locale
+ FROM pg_database WHERE datname = current_database()
+\gset
+SET lc_messages = :'es_locale';
+SELECT test_translation();
+NOTICE: traducido PRId64 = 424242424242
+NOTICE: traducido PRId32 = -1234
+NOTICE: traducido PRIdMAX = -5678
+NOTICE: traducido PRIdPTR = 9999
+NOTICE: traducido PRIu64 = 424242424242
+NOTICE: traducido PRIu32 = 1234
+NOTICE: traducido PRIuMAX = 5678
+NOTICE: traducido PRIuPTR = 9999
+NOTICE: traducido PRIx64 = 62c6d1a9b2
+NOTICE: traducido PRIx32 = 4d2
+NOTICE: traducido PRIxMAX = 162e
+NOTICE: traducido PRIxPTR = 270f
+NOTICE: traducido PRIX64 = 62C6D1A9B2
+NOTICE: traducido PRIX32 = 4D2
+NOTICE: traducido PRIXMAX = 162E
+NOTICE: traducido PRIXPTR = 270F
+ test_translation
+------------------
+
+(1 row)
+
+RESET lc_messages;
diff --git a/src/test/regress/expected/nls_1.out b/src/test/regress/expected/nls_1.out
new file mode 100644
index 00000000000..6bebf9bb2ef
--- /dev/null
+++ b/src/test/regress/expected/nls_1.out
@@ -0,0 +1,22 @@
+-- directory paths and dlsuffix are passed to us in environment variables
+\getenv libdir PG_LIBDIR
+\getenv dlsuffix PG_DLSUFFIX
+\set regresslib :libdir '/regress' :dlsuffix
+CREATE FUNCTION test_translation()
+ RETURNS void
+ AS :'regresslib'
+ LANGUAGE C;
+-- Some BSDen are sticky about wanting a codeset in lc_messages.
+-- Try to extract it from pg_database.datctype.
+SELECT 'es_ES' || coalesce(regexp_substr(datctype, '\..*'), '') AS es_locale
+ FROM pg_database WHERE datname = current_database()
+\gset
+SET lc_messages = :'es_locale';
+SELECT test_translation();
+NOTICE: NLS is not enabled
+ test_translation
+------------------
+
+(1 row)
+
+RESET lc_messages;
diff --git a/src/test/regress/meson.build b/src/test/regress/meson.build
index 1da9e9462a9..4001a81ffe5 100644
--- a/src/test/regress/meson.build
+++ b/src/test/regress/meson.build
@@ -57,3 +57,5 @@ tests += {
'dbname': 'regression',
},
}
+
+subdir('po', if_found: libintl)
diff --git a/src/test/regress/nls.mk b/src/test/regress/nls.mk
new file mode 100644
index 00000000000..43227c64f09
--- /dev/null
+++ b/src/test/regress/nls.mk
@@ -0,0 +1,5 @@
+# src/test/regress/nls.mk
+CATALOG_NAME = regress
+GETTEXT_FILES = regress.c
+GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS)
+GETTEXT_FLAGS = $(BACKEND_COMMON_GETTEXT_FLAGS)
diff --git a/src/test/regress/parallel_schedule b/src/test/regress/parallel_schedule
index cc6d799bcea..0931f1dcccf 100644
--- a/src/test/regress/parallel_schedule
+++ b/src/test/regress/parallel_schedule
@@ -76,7 +76,7 @@ test: brin_bloom brin_multi
# ----------
# Another group of parallel tests
# ----------
-test: create_table_like alter_generic alter_operator misc async dbsize merge misc_functions sysviews tsrf tid tidscan tidrangescan collate.utf8 collate.icu.utf8 incremental_sort create_role without_overlaps generated_virtual
+test: create_table_like alter_generic alter_operator misc async dbsize merge misc_functions nls sysviews tsrf tid tidscan tidrangescan collate.utf8 collate.icu.utf8 incremental_sort create_role without_overlaps generated_virtual
# collate.linux.utf8 and collate.icu.utf8 tests cannot be run in parallel with each other
# psql depends on create_am
diff --git a/src/test/regress/po/LINGUAS b/src/test/regress/po/LINGUAS
new file mode 100644
index 00000000000..8357fcaaed4
--- /dev/null
+++ b/src/test/regress/po/LINGUAS
@@ -0,0 +1 @@
+es
diff --git a/src/test/regress/po/es.po b/src/test/regress/po/es.po
new file mode 100644
index 00000000000..b3021d57e22
--- /dev/null
+++ b/src/test/regress/po/es.po
@@ -0,0 +1,159 @@
+# Spanish message translation file for regress test library
+#
+# Copyright (C) 2025 PostgreSQL Global Development Group
+# This file is distributed under the same license as the regress (PostgreSQL) package.
+#
+# Tom Lane <[email protected]>, 2025.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: regress (PostgreSQL) 19\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2025-12-08 13:57-0500\n"
+"PO-Revision-Date: 2025-11-19 19:01-0500\n"
+"Last-Translator: Tom Lane <[email protected]>\n"
+"Language-Team: PgSQL-es-Ayuda <[email protected]>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: regress.c:202
+#, c-format
+msgid "invalid input syntax for type %s: \"%s\""
+msgstr "la sintaxis de entrada no es válida para tipo %s: «%s»"
+
+#: regress.c:839
+#, c-format
+msgid "test_inline_in_from_support_func called with %d args but expected 3"
+msgstr ""
+
+#: regress.c:847 regress.c:863
+#, c-format
+msgid "test_inline_in_from_support_func called with non-Const parameters"
+msgstr ""
+
+#: regress.c:854 regress.c:870
+#, c-format
+msgid "test_inline_in_from_support_func called with non-TEXT parameters"
+msgstr ""
+
+#: regress.c:903
+#, c-format
+msgid "test_inline_in_from_support_func parsed to more than one node"
+msgstr ""
+
+#: regress.c:914
+#, c-format
+msgid "test_inline_in_from_support_func rewrote to more than one node"
+msgstr ""
+
+#: regress.c:921
+#, c-format
+msgid "test_inline_in_from_support_func didn't parse to a Query"
+msgstr ""
+
+#: regress.c:1028
+#, c-format
+msgid "invalid source encoding name \"%s\""
+msgstr "la codificación de origen «%s» no es válida"
+
+#: regress.c:1033
+#, c-format
+msgid "invalid destination encoding name \"%s\""
+msgstr "la codificación de destino «%s» no es válida"
+
+#: regress.c:1078
+#, c-format
+msgid "default conversion function for encoding \"%s\" to \"%s\" does not exist"
+msgstr "no existe el procedimiento por omisión de conversión desde la codificación «%s» a «%s»"
+
+#: regress.c:1085
+#, c-format
+msgid "out of memory"
+msgstr "memoria agotada"
+
+#: regress.c:1086
+#, c-format
+msgid "String of %d bytes is too long for encoding conversion."
+msgstr "La cadena de %d bytes es demasiado larga para la recodificación."
+
+#: regress.c:1175
+#, c-format
+msgid "translated PRId64 = %<PRId64>"
+msgstr "traducido PRId64 = %<PRId64>"
+
+#: regress.c:1177
+#, c-format
+msgid "translated PRId32 = %<PRId32>"
+msgstr "traducido PRId32 = %<PRId32>"
+
+#: regress.c:1179
+#, c-format
+msgid "translated PRIdMAX = %<PRIdMAX>"
+msgstr "traducido PRIdMAX = %<PRIdMAX>"
+
+#: regress.c:1181
+#, c-format
+msgid "translated PRIdPTR = %<PRIdPTR>"
+msgstr "traducido PRIdPTR = %<PRIdPTR>"
+
+#: regress.c:1184
+#, c-format
+msgid "translated PRIu64 = %<PRIu64>"
+msgstr "traducido PRIu64 = %<PRIu64>"
+
+#: regress.c:1186
+#, c-format
+msgid "translated PRIu32 = %<PRIu32>"
+msgstr "traducido PRIu32 = %<PRIu32>"
+
+#: regress.c:1188
+#, c-format
+msgid "translated PRIuMAX = %<PRIuMAX>"
+msgstr "traducido PRIuMAX = %<PRIuMAX>"
+
+#: regress.c:1190
+#, c-format
+msgid "translated PRIuPTR = %<PRIuPTR>"
+msgstr "traducido PRIuPTR = %<PRIuPTR>"
+
+#: regress.c:1193
+#, c-format
+msgid "translated PRIx64 = %<PRIx64>"
+msgstr "traducido PRIx64 = %<PRIx64>"
+
+#: regress.c:1195
+#, c-format
+msgid "translated PRIx32 = %<PRIx32>"
+msgstr "traducido PRIx32 = %<PRIx32>"
+
+#: regress.c:1197
+#, c-format
+msgid "translated PRIxMAX = %<PRIxMAX>"
+msgstr "traducido PRIxMAX = %<PRIxMAX>"
+
+#: regress.c:1199
+#, c-format
+msgid "translated PRIxPTR = %<PRIxPTR>"
+msgstr "traducido PRIxPTR = %<PRIxPTR>"
+
+#: regress.c:1202
+#, c-format
+msgid "translated PRIX64 = %<PRIX64>"
+msgstr "traducido PRIX64 = %<PRIX64>"
+
+#: regress.c:1204
+#, c-format
+msgid "translated PRIX32 = %<PRIX32>"
+msgstr "traducido PRIX32 = %<PRIX32>"
+
+#: regress.c:1206
+#, c-format
+msgid "translated PRIXMAX = %<PRIXMAX>"
+msgstr "traducido PRIXMAX = %<PRIXMAX>"
+
+#: regress.c:1208
+#, c-format
+msgid "translated PRIXPTR = %<PRIXPTR>"
+msgstr "traducido PRIXPTR = %<PRIXPTR>"
diff --git a/src/test/regress/po/meson.build b/src/test/regress/po/meson.build
new file mode 100644
index 00000000000..e9bd964aa7f
--- /dev/null
+++ b/src/test/regress/po/meson.build
@@ -0,0 +1,3 @@
+# Copyright (c) 2022-2025, PostgreSQL Global Development Group
+
+nls_targets += [i18n.gettext('regress-' + pg_version_major.to_string())]
diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c
index 56cc0567b1c..2d5d799f6e4 100644
--- a/src/test/regress/regress.c
+++ b/src/test/regress/regress.c
@@ -48,6 +48,10 @@
#include "utils/rel.h"
#include "utils/typcache.h"
+/* define our text domain for translations */
+#undef TEXTDOMAIN
+#define TEXTDOMAIN PG_TEXTDOMAIN("regress")
+
#define EXPECT_TRUE(expr) \
do { \
if (!(expr)) \
@@ -1149,3 +1153,62 @@ test_relpath(PG_FUNCTION_ARGS)
PG_RETURN_VOID();
}
+
+/*
+ * Simple test to verify NLS support, particularly that the PRI* macros work.
+ */
+PG_FUNCTION_INFO_V1(test_translation);
+Datum
+test_translation(PG_FUNCTION_ARGS)
+{
+#ifdef ENABLE_NLS
+ /* This would be better done in _PG_init(), if this module had one */
+ static bool inited = false;
+
+ if (!inited)
+ {
+ pg_bindtextdomain(TEXTDOMAIN);
+ inited = true;
+ }
+
+ ereport(NOTICE,
+ errmsg("translated PRId64 = %" PRId64, (int64) 424242424242));
+ ereport(NOTICE,
+ errmsg("translated PRId32 = %" PRId32, (int32) -1234));
+ ereport(NOTICE,
+ errmsg("translated PRIdMAX = %" PRIdMAX, (intmax_t) -5678));
+ ereport(NOTICE,
+ errmsg("translated PRIdPTR = %" PRIdPTR, (intptr_t) 9999));
+
+ ereport(NOTICE,
+ errmsg("translated PRIu64 = %" PRIu64, (uint64) 424242424242));
+ ereport(NOTICE,
+ errmsg("translated PRIu32 = %" PRIu32, (uint32) 1234));
+ ereport(NOTICE,
+ errmsg("translated PRIuMAX = %" PRIuMAX, (uintmax_t) 5678));
+ ereport(NOTICE,
+ errmsg("translated PRIuPTR = %" PRIuPTR, (uintptr_t) 9999));
+
+ ereport(NOTICE,
+ errmsg("translated PRIx64 = %" PRIx64, (uint64) 424242424242));
+ ereport(NOTICE,
+ errmsg("translated PRIx32 = %" PRIx32, (uint32) 1234));
+ ereport(NOTICE,
+ errmsg("translated PRIxMAX = %" PRIxMAX, (uintmax_t) 5678));
+ ereport(NOTICE,
+ errmsg("translated PRIxPTR = %" PRIxPTR, (uintptr_t) 9999));
+
+ ereport(NOTICE,
+ errmsg("translated PRIX64 = %" PRIX64, (uint64) 424242424242));
+ ereport(NOTICE,
+ errmsg("translated PRIX32 = %" PRIX32, (uint32) 1234));
+ ereport(NOTICE,
+ errmsg("translated PRIXMAX = %" PRIXMAX, (uintmax_t) 5678));
+ ereport(NOTICE,
+ errmsg("translated PRIXPTR = %" PRIXPTR, (uintptr_t) 9999));
+#else
+ elog(NOTICE, "NLS is not enabled");
+#endif
+
+ PG_RETURN_VOID();
+}
diff --git a/src/test/regress/sql/nls.sql b/src/test/regress/sql/nls.sql
new file mode 100644
index 00000000000..d6f7954d61e
--- /dev/null
+++ b/src/test/regress/sql/nls.sql
@@ -0,0 +1,21 @@
+-- directory paths and dlsuffix are passed to us in environment variables
+\getenv libdir PG_LIBDIR
+\getenv dlsuffix PG_DLSUFFIX
+
+\set regresslib :libdir '/regress' :dlsuffix
+
+CREATE FUNCTION test_translation()
+ RETURNS void
+ AS :'regresslib'
+ LANGUAGE C;
+
+-- Some BSDen are sticky about wanting a codeset in lc_messages.
+-- Try to extract it from pg_database.datctype.
+SELECT 'es_ES' || coalesce(regexp_substr(datctype, '\..*'), '') AS es_locale
+ FROM pg_database WHERE datname = current_database()
+\gset
+SET lc_messages = :'es_locale';
+
+SELECT test_translation();
+
+RESET lc_messages;
--
2.43.7
From 70d6af4a15c09560888311d07de323c86dcb6625 Mon Sep 17 00:00:00 2001
From: Tom Lane <[email protected]>
Date: Mon, 8 Dec 2025 18:19:59 -0500
Subject: [PATCH v5 2/2] Support "j" length modifier in snprintf.c.
POSIX has for a long time defined the "j" length modifier for
printf conversions as meaning the size of intmax_t or uintmax_t.
We got away without supporting that so far, but there are good
reasons to start doing so now:
* On some platforms, <inttypes.h> defines PRIdMAX as "jd",
so that snprintf.c falls over if that is used.
* Commit e6be84356 re-introduced upstream's use of PRIdMAX
into zic.c. (We hadn't noticed yet because it would only
become apparent if bad data was fed to zic, resulting in
an error report.)
We could revert that decision from our copy of zic.c, but
on the whole it seems better to update snprintf.c to support
this standard modifier. There might well be extensions,
now or in future, that expect it to work.
I did this in the lazy man's way of translating "j" to either
"l" or "ll" depending on a compile-time sizeof() check, just
as was done long ago to support "z" for size_t. One could
imagine promoting intmax_t to have full support in snprintf.c,
for example converting fmtint()'s value argument and internal
arithmetic to use [u]intmax_t not [unsigned] long long. But
that'd be more work and I'm hesitant to do it anyway: if there
are any platforms out there where intmax_t is actually wider
than "long long", this would doubtless result in a noticeable
speed penalty to snprintf(). Let's not go there until we have
positive evidence that there's a reason to, and some way to
measure what size of penalty we're taking.
---
configure | 33 +++++++++++++++++++++++++++++++++
configure.ac | 1 +
meson.build | 2 ++
src/include/pg_config.h.in | 3 +++
src/port/snprintf.c | 18 ++++++++++++++++++
5 files changed, 57 insertions(+)
diff --git a/configure b/configure
index 3a0ed11fa8e..aaabe2aff70 100755
--- a/configure
+++ b/configure
@@ -16811,6 +16811,39 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of intmax_t" >&5
+$as_echo_n "checking size of intmax_t... " >&6; }
+if ${ac_cv_sizeof_intmax_t+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (intmax_t))" "ac_cv_sizeof_intmax_t" "$ac_includes_default"; then :
+
+else
+ if test "$ac_cv_type_intmax_t" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (intmax_t)
+See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof_intmax_t=0
+ fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_intmax_t" >&5
+$as_echo "$ac_cv_sizeof_intmax_t" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_INTMAX_T $ac_cv_sizeof_intmax_t
+_ACEOF
+
+
# Determine memory alignment requirements for the basic C data types.
diff --git a/configure.ac b/configure.ac
index c2413720a18..c3c072e9ec7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1981,6 +1981,7 @@ AC_CHECK_SIZEOF([void *])
AC_CHECK_SIZEOF([size_t])
AC_CHECK_SIZEOF([long])
AC_CHECK_SIZEOF([long long])
+AC_CHECK_SIZEOF([intmax_t])
# Determine memory alignment requirements for the basic C data types.
diff --git a/meson.build b/meson.build
index 6e7ddd74683..e01a77b6f2a 100644
--- a/meson.build
+++ b/meson.build
@@ -1775,6 +1775,8 @@ cdata.set('SIZEOF_LONG', cc.sizeof('long', args: test_c_args))
cdata.set('SIZEOF_LONG_LONG', cc.sizeof('long long', args: test_c_args))
cdata.set('SIZEOF_VOID_P', cc.sizeof('void *', args: test_c_args))
cdata.set('SIZEOF_SIZE_T', cc.sizeof('size_t', args: test_c_args))
+cdata.set('SIZEOF_INTMAX_T', cc.sizeof('intmax_t', args: test_c_args,
+ prefix: '#include <stdint.h>'))
# Check if __int128 is a working 128 bit integer type, and if so
diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in
index b0b0cfdaf79..72434ce957e 100644
--- a/src/include/pg_config.h.in
+++ b/src/include/pg_config.h.in
@@ -645,6 +645,9 @@
RELSEG_SIZE requires an initdb. */
#undef RELSEG_SIZE
+/* The size of `intmax_t', as computed by sizeof. */
+#undef SIZEOF_INTMAX_T
+
/* The size of `long', as computed by sizeof. */
#undef SIZEOF_LONG
diff --git a/src/port/snprintf.c b/src/port/snprintf.c
index 6541182df6d..d914547fae2 100644
--- a/src/port/snprintf.c
+++ b/src/port/snprintf.c
@@ -563,6 +563,15 @@ nextch2:
else
longflag = 1;
goto nextch2;
+ case 'j':
+#if SIZEOF_INTMAX_T == SIZEOF_LONG
+ longflag = 1;
+#elif SIZEOF_INTMAX_T == SIZEOF_LONG_LONG
+ longlongflag = 1;
+#else
+#error "cannot find integer type of the same size as intmax_t"
+#endif
+ goto nextch2;
case 'z':
#if SIZEOF_SIZE_T == SIZEOF_LONG
longflag = 1;
@@ -826,6 +835,15 @@ nextch1:
else
longflag = 1;
goto nextch1;
+ case 'j':
+#if SIZEOF_INTMAX_T == SIZEOF_LONG
+ longflag = 1;
+#elif SIZEOF_INTMAX_T == SIZEOF_LONG_LONG
+ longlongflag = 1;
+#else
+#error "cannot find integer type of the same size as intmax_t"
+#endif
+ goto nextch1;
case 'z':
#if SIZEOF_SIZE_T == SIZEOF_LONG
longflag = 1;
--
2.43.7
