🌐 AI搜索 & 代理 主页
Skip to content

Commit 8c49847

Browse files
tglsfdctglsfdc
committed
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. (This effort has indeed found one problem already, now fixed in commit f8715ec.) Discussion: https://postgr.es/m/3098752.1765221796@sss.pgh.pa.us Discussion: https://postgr.es/m/292844.1765315339@sss.pgh.pa.us
1 parent b27e482 commit 8c49847

File tree

10 files changed

+322
-1
lines changed

10 files changed

+322
-1
lines changed

‎src/test/regress/expected/nls.out‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
-- directory paths and dlsuffix are passed to us in environment variables
2+
\getenv libdir PG_LIBDIR
3+
\getenv dlsuffix PG_DLSUFFIX
4+
\set regresslib :libdir '/regress' :dlsuffix
5+
CREATE FUNCTION test_translation()
6+
RETURNS void
7+
AS :'regresslib'
8+
LANGUAGE C;
9+
-- Some BSDen are sticky about wanting a codeset name in lc_messages,
10+
-- but it seems that at least on common platforms it doesn't have
11+
-- to match the actual database encoding.
12+
SET lc_messages = 'es_ES.UTF-8';
13+
SELECT test_translation();
14+
NOTICE: traducido PRId64 = 424242424242
15+
NOTICE: traducido PRId32 = -1234
16+
NOTICE: traducido PRIdMAX = -5678
17+
NOTICE: traducido PRIdPTR = 9999
18+
NOTICE: traducido PRIu64 = 424242424242
19+
NOTICE: traducido PRIu32 = 1234
20+
NOTICE: traducido PRIuMAX = 5678
21+
NOTICE: traducido PRIuPTR = 9999
22+
NOTICE: traducido PRIx64 = 62c6d1a9b2
23+
NOTICE: traducido PRIx32 = 4d2
24+
NOTICE: traducido PRIxMAX = 162e
25+
NOTICE: traducido PRIxPTR = 270f
26+
NOTICE: traducido PRIX64 = 62C6D1A9B2
27+
NOTICE: traducido PRIX32 = 4D2
28+
NOTICE: traducido PRIXMAX = 162E
29+
NOTICE: traducido PRIXPTR = 270F
30+
test_translation
31+
------------------
32+
33+
(1 row)
34+
35+
RESET lc_messages;

‎src/test/regress/expected/nls_1.out‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
-- directory paths and dlsuffix are passed to us in environment variables
2+
\getenv libdir PG_LIBDIR
3+
\getenv dlsuffix PG_DLSUFFIX
4+
\set regresslib :libdir '/regress' :dlsuffix
5+
CREATE FUNCTION test_translation()
6+
RETURNS void
7+
AS :'regresslib'
8+
LANGUAGE C;
9+
-- Some BSDen are sticky about wanting a codeset name in lc_messages,
10+
-- but it seems that at least on common platforms it doesn't have
11+
-- to match the actual database encoding.
12+
SET lc_messages = 'es_ES.UTF-8';
13+
SELECT test_translation();
14+
NOTICE: NLS is not enabled
15+
test_translation
16+
------------------
17+
18+
(1 row)
19+
20+
RESET lc_messages;

‎src/test/regress/meson.build‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,5 @@ tests += {
5757
'dbname': 'regression',
5858
},
5959
}
60+
61+
subdir('po', if_found: libintl)

‎src/test/regress/nls.mk‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# src/test/regress/nls.mk
2+
CATALOG_NAME = regress
3+
GETTEXT_FILES = regress.c
4+
GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS)
5+
GETTEXT_FLAGS = $(BACKEND_COMMON_GETTEXT_FLAGS)

‎src/test/regress/parallel_schedule‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ test: brin_bloom brin_multi
7676
# ----------
7777
# Another group of parallel tests
7878
# ----------
79-
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
79+
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
8080

8181
# collate.linux.utf8 and collate.icu.utf8 tests cannot be run in parallel with each other
8282
# psql depends on create_am

‎src/test/regress/po/LINGUAS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
es

‎src/test/regress/po/es.po‎

Lines changed: 159 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,159 @@
1+
# Spanish message translation file for regress test library
2+
#
3+
# Copyright (C) 2025 PostgreSQL Global Development Group
4+
# This file is distributed under the same license as the regress (PostgreSQL) package.
5+
#
6+
# Tom Lane <tgl@sss.pgh.pa.us>, 2025.
7+
#
8+
msgid ""
9+
msgstr ""
10+
"Project-Id-Version: regress (PostgreSQL) 19\n"
11+
"Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
12+
"POT-Creation-Date: 2025-12-08 13:57-0500\n"
13+
"PO-Revision-Date: 2025-11-19 19:01-0500\n"
14+
"Last-Translator: Tom Lane <tgl@sss.pgh.pa.us>\n"
15+
"Language-Team: PgSQL-es-Ayuda <pgsql-es-ayuda@lists.postgresql.org>\n"
16+
"Language: es\n"
17+
"MIME-Version: 1.0\n"
18+
"Content-Type: text/plain; charset=UTF-8\n"
19+
"Content-Transfer-Encoding: 8bit\n"
20+
21+
#: regress.c:202
22+
#, c-format
23+
msgid "invalid input syntax for type %s: \"%s\""
24+
msgstr "la sintaxis de entrada no es válida para tipo %s: «%s»"
25+
26+
#: regress.c:839
27+
#, c-format
28+
msgid "test_inline_in_from_support_func called with %d args but expected 3"
29+
msgstr ""
30+
31+
#: regress.c:847 regress.c:863
32+
#, c-format
33+
msgid "test_inline_in_from_support_func called with non-Const parameters"
34+
msgstr ""
35+
36+
#: regress.c:854 regress.c:870
37+
#, c-format
38+
msgid "test_inline_in_from_support_func called with non-TEXT parameters"
39+
msgstr ""
40+
41+
#: regress.c:903
42+
#, c-format
43+
msgid "test_inline_in_from_support_func parsed to more than one node"
44+
msgstr ""
45+
46+
#: regress.c:914
47+
#, c-format
48+
msgid "test_inline_in_from_support_func rewrote to more than one node"
49+
msgstr ""
50+
51+
#: regress.c:921
52+
#, c-format
53+
msgid "test_inline_in_from_support_func didn't parse to a Query"
54+
msgstr ""
55+
56+
#: regress.c:1028
57+
#, c-format
58+
msgid "invalid source encoding name \"%s\""
59+
msgstr "la codificación de origen «%s» no es válida"
60+
61+
#: regress.c:1033
62+
#, c-format
63+
msgid "invalid destination encoding name \"%s\""
64+
msgstr "la codificación de destino «%s» no es válida"
65+
66+
#: regress.c:1078
67+
#, c-format
68+
msgid "default conversion function for encoding \"%s\" to \"%s\" does not exist"
69+
msgstr "no existe el procedimiento por omisión de conversión desde la codificación «%s» a «%s»"
70+
71+
#: regress.c:1085
72+
#, c-format
73+
msgid "out of memory"
74+
msgstr "memoria agotada"
75+
76+
#: regress.c:1086
77+
#, c-format
78+
msgid "String of %d bytes is too long for encoding conversion."
79+
msgstr "La cadena de %d bytes es demasiado larga para la recodificación."
80+
81+
#: regress.c:1175
82+
#, c-format
83+
msgid "translated PRId64 = %<PRId64>"
84+
msgstr "traducido PRId64 = %<PRId64>"
85+
86+
#: regress.c:1177
87+
#, c-format
88+
msgid "translated PRId32 = %<PRId32>"
89+
msgstr "traducido PRId32 = %<PRId32>"
90+
91+
#: regress.c:1179
92+
#, c-format
93+
msgid "translated PRIdMAX = %<PRIdMAX>"
94+
msgstr "traducido PRIdMAX = %<PRIdMAX>"
95+
96+
#: regress.c:1181
97+
#, c-format
98+
msgid "translated PRIdPTR = %<PRIdPTR>"
99+
msgstr "traducido PRIdPTR = %<PRIdPTR>"
100+
101+
#: regress.c:1184
102+
#, c-format
103+
msgid "translated PRIu64 = %<PRIu64>"
104+
msgstr "traducido PRIu64 = %<PRIu64>"
105+
106+
#: regress.c:1186
107+
#, c-format
108+
msgid "translated PRIu32 = %<PRIu32>"
109+
msgstr "traducido PRIu32 = %<PRIu32>"
110+
111+
#: regress.c:1188
112+
#, c-format
113+
msgid "translated PRIuMAX = %<PRIuMAX>"
114+
msgstr "traducido PRIuMAX = %<PRIuMAX>"
115+
116+
#: regress.c:1190
117+
#, c-format
118+
msgid "translated PRIuPTR = %<PRIuPTR>"
119+
msgstr "traducido PRIuPTR = %<PRIuPTR>"
120+
121+
#: regress.c:1193
122+
#, c-format
123+
msgid "translated PRIx64 = %<PRIx64>"
124+
msgstr "traducido PRIx64 = %<PRIx64>"
125+
126+
#: regress.c:1195
127+
#, c-format
128+
msgid "translated PRIx32 = %<PRIx32>"
129+
msgstr "traducido PRIx32 = %<PRIx32>"
130+
131+
#: regress.c:1197
132+
#, c-format
133+
msgid "translated PRIxMAX = %<PRIxMAX>"
134+
msgstr "traducido PRIxMAX = %<PRIxMAX>"
135+
136+
#: regress.c:1199
137+
#, c-format
138+
msgid "translated PRIxPTR = %<PRIxPTR>"
139+
msgstr "traducido PRIxPTR = %<PRIxPTR>"
140+
141+
#: regress.c:1202
142+
#, c-format
143+
msgid "translated PRIX64 = %<PRIX64>"
144+
msgstr "traducido PRIX64 = %<PRIX64>"
145+
146+
#: regress.c:1204
147+
#, c-format
148+
msgid "translated PRIX32 = %<PRIX32>"
149+
msgstr "traducido PRIX32 = %<PRIX32>"
150+
151+
#: regress.c:1206
152+
#, c-format
153+
msgid "translated PRIXMAX = %<PRIXMAX>"
154+
msgstr "traducido PRIXMAX = %<PRIXMAX>"
155+
156+
#: regress.c:1208
157+
#, c-format
158+
msgid "translated PRIXPTR = %<PRIXPTR>"
159+
msgstr "traducido PRIXPTR = %<PRIXPTR>"

‎src/test/regress/po/meson.build‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Copyright (c) 2022-2025, PostgreSQL Global Development Group
2+
3+
nls_targets += [i18n.gettext('regress-' + pg_version_major.to_string())]

‎src/test/regress/regress.c‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@
4848
#include "utils/rel.h"
4949
#include "utils/typcache.h"
5050

51+
/* define our text domain for translations */
52+
#undef TEXTDOMAIN
53+
#define TEXTDOMAIN PG_TEXTDOMAIN("regress")
54+
5155
#define EXPECT_TRUE(expr) \
5256
do { \
5357
if (!(expr)) \
@@ -1149,3 +1153,76 @@ test_relpath(PG_FUNCTION_ARGS)
11491153

11501154
PG_RETURN_VOID();
11511155
}
1156+
1157+
/*
1158+
* Simple test to verify NLS support, particularly that the PRI* macros work.
1159+
*/
1160+
PG_FUNCTION_INFO_V1(test_translation);
1161+
Datum
1162+
test_translation(PG_FUNCTION_ARGS)
1163+
{
1164+
#ifdef ENABLE_NLS
1165+
static bool inited = false;
1166+
1167+
/*
1168+
* Ideally we'd do this bit in a _PG_init() hook. However, it seems best
1169+
* that the Solaris hack only get applied in the nls.sql test, so it
1170+
* doesn't risk affecting other tests that load this module.
1171+
*/
1172+
if (!inited)
1173+
{
1174+
/*
1175+
* Solaris' built-in gettext is not bright about associating locales
1176+
* with message catalogs that are named after just the language.
1177+
* Apparently the customary workaround is for users to set the
1178+
* LANGUAGE environment variable to provide a mapping. Do so here to
1179+
* ensure that the nls.sql regression test will work.
1180+
*/
1181+
#if defined(__sun__)
1182+
setenv("LANGUAGE", "es_ES.UTF-8:es", 1);
1183+
#endif
1184+
pg_bindtextdomain(TEXTDOMAIN);
1185+
inited = true;
1186+
}
1187+
1188+
ereport(NOTICE,
1189+
errmsg("translated PRId64 = %" PRId64, (int64) 424242424242));
1190+
ereport(NOTICE,
1191+
errmsg("translated PRId32 = %" PRId32, (int32) -1234));
1192+
ereport(NOTICE,
1193+
errmsg("translated PRIdMAX = %" PRIdMAX, (intmax_t) -5678));
1194+
ereport(NOTICE,
1195+
errmsg("translated PRIdPTR = %" PRIdPTR, (intptr_t) 9999));
1196+
1197+
ereport(NOTICE,
1198+
errmsg("translated PRIu64 = %" PRIu64, (uint64) 424242424242));
1199+
ereport(NOTICE,
1200+
errmsg("translated PRIu32 = %" PRIu32, (uint32) 1234));
1201+
ereport(NOTICE,
1202+
errmsg("translated PRIuMAX = %" PRIuMAX, (uintmax_t) 5678));
1203+
ereport(NOTICE,
1204+
errmsg("translated PRIuPTR = %" PRIuPTR, (uintptr_t) 9999));
1205+
1206+
ereport(NOTICE,
1207+
errmsg("translated PRIx64 = %" PRIx64, (uint64) 424242424242));
1208+
ereport(NOTICE,
1209+
errmsg("translated PRIx32 = %" PRIx32, (uint32) 1234));
1210+
ereport(NOTICE,
1211+
errmsg("translated PRIxMAX = %" PRIxMAX, (uintmax_t) 5678));
1212+
ereport(NOTICE,
1213+
errmsg("translated PRIxPTR = %" PRIxPTR, (uintptr_t) 9999));
1214+
1215+
ereport(NOTICE,
1216+
errmsg("translated PRIX64 = %" PRIX64, (uint64) 424242424242));
1217+
ereport(NOTICE,
1218+
errmsg("translated PRIX32 = %" PRIX32, (uint32) 1234));
1219+
ereport(NOTICE,
1220+
errmsg("translated PRIXMAX = %" PRIXMAX, (uintmax_t) 5678));
1221+
ereport(NOTICE,
1222+
errmsg("translated PRIXPTR = %" PRIXPTR, (uintptr_t) 9999));
1223+
#else
1224+
elog(NOTICE, "NLS is not enabled");
1225+
#endif
1226+
1227+
PG_RETURN_VOID();
1228+
}

‎src/test/regress/sql/nls.sql‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
-- directory paths and dlsuffix are passed to us in environment variables
2+
\getenv libdir PG_LIBDIR
3+
\getenv dlsuffix PG_DLSUFFIX
4+
5+
\set regresslib :libdir '/regress' :dlsuffix
6+
7+
CREATE FUNCTION test_translation()
8+
RETURNS void
9+
AS :'regresslib'
10+
LANGUAGE C;
11+
12+
-- Some BSDen are sticky about wanting a codeset name in lc_messages,
13+
-- but it seems that at least on common platforms it doesn't have
14+
-- to match the actual database encoding.
15+
SET lc_messages = 'es_ES.UTF-8';
16+
17+
SELECT test_translation();
18+
19+
RESET lc_messages;

0 commit comments

Comments
 (0)