Skip to content

Commit c302a61

Browse files
peterepetere
committed
Error message refactoring
Take some untranslatable things out of the message and replace by format placeholders, to reduce translatable strings and reduce translation mistakes.
1 parent dcffc9b commit c302a61

File tree

3 files changed

+30
-19
lines changed

3 files changed

+30
-19
lines changed

‎src/backend/replication/logical/logical.c‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -865,7 +865,8 @@ begin_prepare_cb_wrapper(ReorderBuffer *cache, ReorderBufferTXN *txn)
865865
if (ctx->callbacks.begin_prepare_cb == NULL)
866866
ereport(ERROR,
867867
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
868-
errmsg("logical replication at prepare time requires begin_prepare_cb callback")));
868+
errmsg("logical replication at prepare time requires a %s callback",
869+
"begin_prepare_cb")));
869870

870871
/* do the actual work: call callback */
871872
ctx->callbacks.begin_prepare_cb(ctx, txn);
@@ -908,7 +909,8 @@ prepare_cb_wrapper(ReorderBuffer *cache, ReorderBufferTXN *txn,
908909
if (ctx->callbacks.prepare_cb == NULL)
909910
ereport(ERROR,
910911
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
911-
errmsg("logical replication at prepare time requires prepare_cb callback")));
912+
errmsg("logical replication at prepare time requires a %s callback",
913+
"prepare_cb")));
912914

913915
/* do the actual work: call callback */
914916
ctx->callbacks.prepare_cb(ctx, txn, prepare_lsn);
@@ -951,7 +953,8 @@ commit_prepared_cb_wrapper(ReorderBuffer *cache, ReorderBufferTXN *txn,
951953
if (ctx->callbacks.commit_prepared_cb == NULL)
952954
ereport(ERROR,
953955
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
954-
errmsg("logical replication at prepare time requires commit_prepared_cb callback")));
956+
errmsg("logical replication at prepare time requires a %s callback",
957+
"commit_prepared_cb")));
955958

956959
/* do the actual work: call callback */
957960
ctx->callbacks.commit_prepared_cb(ctx, txn, commit_lsn);
@@ -995,7 +998,8 @@ rollback_prepared_cb_wrapper(ReorderBuffer *cache, ReorderBufferTXN *txn,
995998
if (ctx->callbacks.rollback_prepared_cb == NULL)
996999
ereport(ERROR,
9971000
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
998-
errmsg("logical replication at prepare time requires rollback_prepared_cb callback")));
1001+
errmsg("logical replication at prepare time requires a %s callback",
1002+
"rollback_prepared_cb")));
9991003

10001004
/* do the actual work: call callback */
10011005
ctx->callbacks.rollback_prepared_cb(ctx, txn, prepare_end_lsn,
@@ -1217,7 +1221,8 @@ stream_start_cb_wrapper(ReorderBuffer *cache, ReorderBufferTXN *txn,
12171221
if (ctx->callbacks.stream_start_cb == NULL)
12181222
ereport(ERROR,
12191223
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
1220-
errmsg("logical streaming requires a stream_start_cb callback")));
1224+
errmsg("logical streaming requires a %s callback",
1225+
"stream_start_cb")));
12211226

12221227
ctx->callbacks.stream_start_cb(ctx, txn);
12231228

@@ -1263,7 +1268,8 @@ stream_stop_cb_wrapper(ReorderBuffer *cache, ReorderBufferTXN *txn,
12631268
if (ctx->callbacks.stream_stop_cb == NULL)
12641269
ereport(ERROR,
12651270
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
1266-
errmsg("logical streaming requires a stream_stop_cb callback")));
1271+
errmsg("logical streaming requires a %s callback",
1272+
"stream_stop_cb")));
12671273

12681274
ctx->callbacks.stream_stop_cb(ctx, txn);
12691275

@@ -1302,7 +1308,8 @@ stream_abort_cb_wrapper(ReorderBuffer *cache, ReorderBufferTXN *txn,
13021308
if (ctx->callbacks.stream_abort_cb == NULL)
13031309
ereport(ERROR,
13041310
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
1305-
errmsg("logical streaming requires a stream_abort_cb callback")));
1311+
errmsg("logical streaming requires a %s callback",
1312+
"stream_abort_cb")));
13061313

13071314
ctx->callbacks.stream_abort_cb(ctx, txn, abort_lsn);
13081315

@@ -1345,7 +1352,8 @@ stream_prepare_cb_wrapper(ReorderBuffer *cache, ReorderBufferTXN *txn,
13451352
if (ctx->callbacks.stream_prepare_cb == NULL)
13461353
ereport(ERROR,
13471354
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
1348-
errmsg("logical streaming at prepare time requires a stream_prepare_cb callback")));
1355+
errmsg("logical streaming at prepare time requires a %s callback",
1356+
"stream_prepare_cb")));
13491357

13501358
ctx->callbacks.stream_prepare_cb(ctx, txn, prepare_lsn);
13511359

@@ -1384,7 +1392,8 @@ stream_commit_cb_wrapper(ReorderBuffer *cache, ReorderBufferTXN *txn,
13841392
if (ctx->callbacks.stream_commit_cb == NULL)
13851393
ereport(ERROR,
13861394
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
1387-
errmsg("logical streaming requires a stream_commit_cb callback")));
1395+
errmsg("logical streaming requires a %s callback",
1396+
"stream_commit_cb")));
13881397

13891398
ctx->callbacks.stream_commit_cb(ctx, txn, commit_lsn);
13901399

@@ -1430,7 +1439,8 @@ stream_change_cb_wrapper(ReorderBuffer *cache, ReorderBufferTXN *txn,
14301439
if (ctx->callbacks.stream_change_cb == NULL)
14311440
ereport(ERROR,
14321441
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
1433-
errmsg("logical streaming requires a stream_change_cb callback")));
1442+
errmsg("logical streaming requires a %s callback",
1443+
"stream_change_cb")));
14341444

14351445
ctx->callbacks.stream_change_cb(ctx, txn, relation, change);
14361446

‎src/backend/statistics/extended_stats.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2274,7 +2274,8 @@ serialize_expr_stats(AnlExprData *exprdata, int nexprs)
22742274
if (!OidIsValid(typOid))
22752275
ereport(ERROR,
22762276
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
2277-
errmsg("relation \"pg_statistic\" does not have a composite type")));
2277+
errmsg("relation \"%s\" does not have a composite type",
2278+
"pg_statistic")));
22782279

22792280
for (exprno = 0; exprno < nexprs; exprno++)
22802281
{

‎src/backend/utils/adt/numeric.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4182,11 +4182,11 @@ numeric_int4_opt_error(Numeric num, bool *have_error)
41824182
if (NUMERIC_IS_NAN(num))
41834183
ereport(ERROR,
41844184
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
4185-
errmsg("cannot convert NaN to integer")));
4185+
errmsg("cannot convert NaN to %s", "integer")));
41864186
else
41874187
ereport(ERROR,
41884188
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
4189-
errmsg("cannot convert infinity to integer")));
4189+
errmsg("cannot convert infinity to %s", "integer")));
41904190
}
41914191
}
41924192

@@ -4260,11 +4260,11 @@ numeric_int8(PG_FUNCTION_ARGS)
42604260
if (NUMERIC_IS_NAN(num))
42614261
ereport(ERROR,
42624262
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
4263-
errmsg("cannot convert NaN to bigint")));
4263+
errmsg("cannot convert NaN to %s", "bigint")));
42644264
else
42654265
ereport(ERROR,
42664266
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
4267-
errmsg("cannot convert infinity to bigint")));
4267+
errmsg("cannot convert infinity to %s", "bigint")));
42684268
}
42694269

42704270
/* Convert to variable format and thence to int8 */
@@ -4301,11 +4301,11 @@ numeric_int2(PG_FUNCTION_ARGS)
43014301
if (NUMERIC_IS_NAN(num))
43024302
ereport(ERROR,
43034303
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
4304-
errmsg("cannot convert NaN to smallint")));
4304+
errmsg("cannot convert NaN to %s", "smallint")));
43054305
else
43064306
ereport(ERROR,
43074307
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
4308-
errmsg("cannot convert infinity to smallint")));
4308+
errmsg("cannot convert infinity to %s", "smallint")));
43094309
}
43104310

43114311
/* Convert to variable format and thence to int8 */
@@ -4496,11 +4496,11 @@ numeric_pg_lsn(PG_FUNCTION_ARGS)
44964496
if (NUMERIC_IS_NAN(num))
44974497
ereport(ERROR,
44984498
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
4499-
errmsg("cannot convert NaN to pg_lsn")));
4499+
errmsg("cannot convert NaN to %s", "pg_lsn")));
45004500
else
45014501
ereport(ERROR,
45024502
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
4503-
errmsg("cannot convert infinity to pg_lsn")));
4503+
errmsg("cannot convert infinity to %s", "pg_lsn")));
45044504
}
45054505

45064506
/* Convert to variable format and thence to pg_lsn */

0 commit comments

Comments
 (0)