agora inbox for [email protected]help / color / mirror / Atom feed
[PATCH v12 6/7] Row pattern recognition patch (tests). 29+ messages / 2 participants [nested] [flat]
* [PATCH v12 6/7] Row pattern recognition patch (tests). @ 2023-12-04 11:23 Tatsuo Ishii <[email protected]> 0 siblings, 0 replies; 29+ messages in thread From: Tatsuo Ishii @ 2023-12-04 11:23 UTC (permalink / raw) --- src/test/regress/expected/rpr.out | 821 +++++++++++++++++++++++++++++ src/test/regress/parallel_schedule | 2 +- src/test/regress/sql/rpr.sql | 392 ++++++++++++++ 3 files changed, 1214 insertions(+), 1 deletion(-) create mode 100644 src/test/regress/expected/rpr.out create mode 100644 src/test/regress/sql/rpr.sql diff --git a/src/test/regress/expected/rpr.out b/src/test/regress/expected/rpr.out new file mode 100644 index 0000000000..e8998ebf45 --- /dev/null +++ b/src/test/regress/expected/rpr.out @@ -0,0 +1,821 @@ +-- +-- Test for row pattern definition clause +-- +CREATE TEMP TABLE stock ( + company TEXT, + tdate DATE, + price INTEGER +); +INSERT INTO stock VALUES ('company1', '2023-07-01', 100); +INSERT INTO stock VALUES ('company1', '2023-07-02', 200); +INSERT INTO stock VALUES ('company1', '2023-07-03', 150); +INSERT INTO stock VALUES ('company1', '2023-07-04', 140); +INSERT INTO stock VALUES ('company1', '2023-07-05', 150); +INSERT INTO stock VALUES ('company1', '2023-07-06', 90); +INSERT INTO stock VALUES ('company1', '2023-07-07', 110); +INSERT INTO stock VALUES ('company1', '2023-07-08', 130); +INSERT INTO stock VALUES ('company1', '2023-07-09', 120); +INSERT INTO stock VALUES ('company1', '2023-07-10', 130); +INSERT INTO stock VALUES ('company2', '2023-07-01', 50); +INSERT INTO stock VALUES ('company2', '2023-07-02', 2000); +INSERT INTO stock VALUES ('company2', '2023-07-03', 1500); +INSERT INTO stock VALUES ('company2', '2023-07-04', 1400); +INSERT INTO stock VALUES ('company2', '2023-07-05', 1500); +INSERT INTO stock VALUES ('company2', '2023-07-06', 60); +INSERT INTO stock VALUES ('company2', '2023-07-07', 1100); +INSERT INTO stock VALUES ('company2', '2023-07-08', 1300); +INSERT INTO stock VALUES ('company2', '2023-07-09', 1200); +INSERT INTO stock VALUES ('company2', '2023-07-10', 1300); +SELECT * FROM stock; + company | tdate | price +----------+------------+------- + company1 | 07-01-2023 | 100 + company1 | 07-02-2023 | 200 + company1 | 07-03-2023 | 150 + company1 | 07-04-2023 | 140 + company1 | 07-05-2023 | 150 + company1 | 07-06-2023 | 90 + company1 | 07-07-2023 | 110 + company1 | 07-08-2023 | 130 + company1 | 07-09-2023 | 120 + company1 | 07-10-2023 | 130 + company2 | 07-01-2023 | 50 + company2 | 07-02-2023 | 2000 + company2 | 07-03-2023 | 1500 + company2 | 07-04-2023 | 1400 + company2 | 07-05-2023 | 1500 + company2 | 07-06-2023 | 60 + company2 | 07-07-2023 | 1100 + company2 | 07-08-2023 | 1300 + company2 | 07-09-2023 | 1200 + company2 | 07-10-2023 | 1300 +(20 rows) + +-- basic test using PREV +SELECT company, tdate, price, first_value(price) OVER w, last_value(price) OVER w, + nth_value(tdate, 2) OVER w AS nth_second + FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (START UP+ DOWN+) + DEFINE + START AS TRUE, + UP AS price > PREV(price), + DOWN AS price < PREV(price) +); + company | tdate | price | first_value | last_value | nth_second +----------+------------+-------+-------------+------------+------------ + company1 | 07-01-2023 | 100 | 100 | 140 | 07-02-2023 + company1 | 07-02-2023 | 200 | | | + company1 | 07-03-2023 | 150 | | | + company1 | 07-04-2023 | 140 | | | + company1 | 07-05-2023 | 150 | | | + company1 | 07-06-2023 | 90 | 90 | 120 | 07-07-2023 + company1 | 07-07-2023 | 110 | | | + company1 | 07-08-2023 | 130 | | | + company1 | 07-09-2023 | 120 | | | + company1 | 07-10-2023 | 130 | | | + company2 | 07-01-2023 | 50 | 50 | 1400 | 07-02-2023 + company2 | 07-02-2023 | 2000 | | | + company2 | 07-03-2023 | 1500 | | | + company2 | 07-04-2023 | 1400 | | | + company2 | 07-05-2023 | 1500 | | | + company2 | 07-06-2023 | 60 | 60 | 1200 | 07-07-2023 + company2 | 07-07-2023 | 1100 | | | + company2 | 07-08-2023 | 1300 | | | + company2 | 07-09-2023 | 1200 | | | + company2 | 07-10-2023 | 1300 | | | +(20 rows) + +-- basic test using PREV. UP appears twice +SELECT company, tdate, price, first_value(price) OVER w, last_value(price) OVER w, + nth_value(tdate, 2) OVER w AS nth_second + FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (START UP+ DOWN+ UP+) + DEFINE + START AS TRUE, + UP AS price > PREV(price), + DOWN AS price < PREV(price) +); + company | tdate | price | first_value | last_value | nth_second +----------+------------+-------+-------------+------------+------------ + company1 | 07-01-2023 | 100 | 100 | 150 | 07-02-2023 + company1 | 07-02-2023 | 200 | | | + company1 | 07-03-2023 | 150 | | | + company1 | 07-04-2023 | 140 | | | + company1 | 07-05-2023 | 150 | | | + company1 | 07-06-2023 | 90 | 90 | 130 | 07-07-2023 + company1 | 07-07-2023 | 110 | | | + company1 | 07-08-2023 | 130 | | | + company1 | 07-09-2023 | 120 | | | + company1 | 07-10-2023 | 130 | | | + company2 | 07-01-2023 | 50 | 50 | 1500 | 07-02-2023 + company2 | 07-02-2023 | 2000 | | | + company2 | 07-03-2023 | 1500 | | | + company2 | 07-04-2023 | 1400 | | | + company2 | 07-05-2023 | 1500 | | | + company2 | 07-06-2023 | 60 | 60 | 1300 | 07-07-2023 + company2 | 07-07-2023 | 1100 | | | + company2 | 07-08-2023 | 1300 | | | + company2 | 07-09-2023 | 1200 | | | + company2 | 07-10-2023 | 1300 | | | +(20 rows) + +-- basic test using PREV. Use '*' +SELECT company, tdate, price, first_value(price) OVER w, last_value(price) OVER w, + nth_value(tdate, 2) OVER w AS nth_second + FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (START UP* DOWN+) + DEFINE + START AS TRUE, + UP AS price > PREV(price), + DOWN AS price < PREV(price) +); + company | tdate | price | first_value | last_value | nth_second +----------+------------+-------+-------------+------------+------------ + company1 | 07-01-2023 | 100 | 100 | 140 | 07-02-2023 + company1 | 07-02-2023 | 200 | | | + company1 | 07-03-2023 | 150 | | | + company1 | 07-04-2023 | 140 | | | + company1 | 07-05-2023 | 150 | 150 | 90 | 07-06-2023 + company1 | 07-06-2023 | 90 | | | + company1 | 07-07-2023 | 110 | 110 | 120 | 07-08-2023 + company1 | 07-08-2023 | 130 | | | + company1 | 07-09-2023 | 120 | | | + company1 | 07-10-2023 | 130 | | | + company2 | 07-01-2023 | 50 | 50 | 1400 | 07-02-2023 + company2 | 07-02-2023 | 2000 | | | + company2 | 07-03-2023 | 1500 | | | + company2 | 07-04-2023 | 1400 | | | + company2 | 07-05-2023 | 1500 | 1500 | 60 | 07-06-2023 + company2 | 07-06-2023 | 60 | | | + company2 | 07-07-2023 | 1100 | 1100 | 1200 | 07-08-2023 + company2 | 07-08-2023 | 1300 | | | + company2 | 07-09-2023 | 1200 | | | + company2 | 07-10-2023 | 1300 | | | +(20 rows) + +-- basic test with none greedy pattern +SELECT company, tdate, price, count(*) OVER w + FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (A A A) + DEFINE + A AS price >= 140 AND price <= 150 +); + company | tdate | price | count +----------+------------+-------+------- + company1 | 07-01-2023 | 100 | 0 + company1 | 07-02-2023 | 200 | 0 + company1 | 07-03-2023 | 150 | 3 + company1 | 07-04-2023 | 140 | + company1 | 07-05-2023 | 150 | + company1 | 07-06-2023 | 90 | 0 + company1 | 07-07-2023 | 110 | 0 + company1 | 07-08-2023 | 130 | 0 + company1 | 07-09-2023 | 120 | 0 + company1 | 07-10-2023 | 130 | 0 + company2 | 07-01-2023 | 50 | 0 + company2 | 07-02-2023 | 2000 | 0 + company2 | 07-03-2023 | 1500 | 0 + company2 | 07-04-2023 | 1400 | 0 + company2 | 07-05-2023 | 1500 | 0 + company2 | 07-06-2023 | 60 | 0 + company2 | 07-07-2023 | 1100 | 0 + company2 | 07-08-2023 | 1300 | 0 + company2 | 07-09-2023 | 1200 | 0 + company2 | 07-10-2023 | 1300 | 0 +(20 rows) + +-- last_value() should remain consistent +SELECT company, tdate, price, last_value(price) OVER w + FROM stock + WINDOW w AS ( + PARTITION BY company + ORDER BY tdate + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (START UP+ DOWN+) + DEFINE + START AS TRUE, + UP AS price > PREV(price), + DOWN AS price < PREV(price) +); + company | tdate | price | last_value +----------+------------+-------+------------ + company1 | 07-01-2023 | 100 | 140 + company1 | 07-02-2023 | 200 | + company1 | 07-03-2023 | 150 | + company1 | 07-04-2023 | 140 | + company1 | 07-05-2023 | 150 | + company1 | 07-06-2023 | 90 | 120 + company1 | 07-07-2023 | 110 | + company1 | 07-08-2023 | 130 | + company1 | 07-09-2023 | 120 | + company1 | 07-10-2023 | 130 | + company2 | 07-01-2023 | 50 | 1400 + company2 | 07-02-2023 | 2000 | + company2 | 07-03-2023 | 1500 | + company2 | 07-04-2023 | 1400 | + company2 | 07-05-2023 | 1500 | + company2 | 07-06-2023 | 60 | 1200 + company2 | 07-07-2023 | 1100 | + company2 | 07-08-2023 | 1300 | + company2 | 07-09-2023 | 1200 | + company2 | 07-10-2023 | 1300 | +(20 rows) + +-- omit "START" in DEFINE but it is ok because "START AS TRUE" is +-- implicitly defined. per spec. +SELECT company, tdate, price, first_value(price) OVER w, last_value(price) OVER w, + nth_value(tdate, 2) OVER w AS nth_second + FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (START UP+ DOWN+) + DEFINE + UP AS price > PREV(price), + DOWN AS price < PREV(price) +); + company | tdate | price | first_value | last_value | nth_second +----------+------------+-------+-------------+------------+------------ + company1 | 07-01-2023 | 100 | 100 | 140 | 07-02-2023 + company1 | 07-02-2023 | 200 | | | + company1 | 07-03-2023 | 150 | | | + company1 | 07-04-2023 | 140 | | | + company1 | 07-05-2023 | 150 | | | + company1 | 07-06-2023 | 90 | 90 | 120 | 07-07-2023 + company1 | 07-07-2023 | 110 | | | + company1 | 07-08-2023 | 130 | | | + company1 | 07-09-2023 | 120 | | | + company1 | 07-10-2023 | 130 | | | + company2 | 07-01-2023 | 50 | 50 | 1400 | 07-02-2023 + company2 | 07-02-2023 | 2000 | | | + company2 | 07-03-2023 | 1500 | | | + company2 | 07-04-2023 | 1400 | | | + company2 | 07-05-2023 | 1500 | | | + company2 | 07-06-2023 | 60 | 60 | 1200 | 07-07-2023 + company2 | 07-07-2023 | 1100 | | | + company2 | 07-08-2023 | 1300 | | | + company2 | 07-09-2023 | 1200 | | | + company2 | 07-10-2023 | 1300 | | | +(20 rows) + +-- the first row start with less than or equal to 100 +SELECT company, tdate, price, first_value(price) OVER w, last_value(price) OVER w + FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (LOWPRICE UP+ DOWN+) + DEFINE + LOWPRICE AS price <= 100, + UP AS price > PREV(price), + DOWN AS price < PREV(price) +); + company | tdate | price | first_value | last_value +----------+------------+-------+-------------+------------ + company1 | 07-01-2023 | 100 | 100 | 140 + company1 | 07-02-2023 | 200 | | + company1 | 07-03-2023 | 150 | | + company1 | 07-04-2023 | 140 | | + company1 | 07-05-2023 | 150 | | + company1 | 07-06-2023 | 90 | 90 | 120 + company1 | 07-07-2023 | 110 | | + company1 | 07-08-2023 | 130 | | + company1 | 07-09-2023 | 120 | | + company1 | 07-10-2023 | 130 | | + company2 | 07-01-2023 | 50 | 50 | 1400 + company2 | 07-02-2023 | 2000 | | + company2 | 07-03-2023 | 1500 | | + company2 | 07-04-2023 | 1400 | | + company2 | 07-05-2023 | 1500 | | + company2 | 07-06-2023 | 60 | 60 | 1200 + company2 | 07-07-2023 | 1100 | | + company2 | 07-08-2023 | 1300 | | + company2 | 07-09-2023 | 1200 | | + company2 | 07-10-2023 | 1300 | | +(20 rows) + +-- second row raises 120% +SELECT company, tdate, price, first_value(price) OVER w, last_value(price) OVER w + FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (LOWPRICE UP+ DOWN+) + DEFINE + LOWPRICE AS price <= 100, + UP AS price > PREV(price) * 1.2, + DOWN AS price < PREV(price) +); + company | tdate | price | first_value | last_value +----------+------------+-------+-------------+------------ + company1 | 07-01-2023 | 100 | 100 | 140 + company1 | 07-02-2023 | 200 | | + company1 | 07-03-2023 | 150 | | + company1 | 07-04-2023 | 140 | | + company1 | 07-05-2023 | 150 | | + company1 | 07-06-2023 | 90 | | + company1 | 07-07-2023 | 110 | | + company1 | 07-08-2023 | 130 | | + company1 | 07-09-2023 | 120 | | + company1 | 07-10-2023 | 130 | | + company2 | 07-01-2023 | 50 | 50 | 1400 + company2 | 07-02-2023 | 2000 | | + company2 | 07-03-2023 | 1500 | | + company2 | 07-04-2023 | 1400 | | + company2 | 07-05-2023 | 1500 | | + company2 | 07-06-2023 | 60 | | + company2 | 07-07-2023 | 1100 | | + company2 | 07-08-2023 | 1300 | | + company2 | 07-09-2023 | 1200 | | + company2 | 07-10-2023 | 1300 | | +(20 rows) + +-- using NEXT +SELECT company, tdate, price, first_value(price) OVER w, last_value(price) OVER w + FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (START UPDOWN) + DEFINE + START AS TRUE, + UPDOWN AS price > PREV(price) AND price > NEXT(price) +); + company | tdate | price | first_value | last_value +----------+------------+-------+-------------+------------ + company1 | 07-01-2023 | 100 | 100 | 200 + company1 | 07-02-2023 | 200 | | + company1 | 07-03-2023 | 150 | | + company1 | 07-04-2023 | 140 | 140 | 150 + company1 | 07-05-2023 | 150 | | + company1 | 07-06-2023 | 90 | | + company1 | 07-07-2023 | 110 | 110 | 130 + company1 | 07-08-2023 | 130 | | + company1 | 07-09-2023 | 120 | | + company1 | 07-10-2023 | 130 | | + company2 | 07-01-2023 | 50 | 50 | 2000 + company2 | 07-02-2023 | 2000 | | + company2 | 07-03-2023 | 1500 | | + company2 | 07-04-2023 | 1400 | 1400 | 1500 + company2 | 07-05-2023 | 1500 | | + company2 | 07-06-2023 | 60 | | + company2 | 07-07-2023 | 1100 | 1100 | 1300 + company2 | 07-08-2023 | 1300 | | + company2 | 07-09-2023 | 1200 | | + company2 | 07-10-2023 | 1300 | | +(20 rows) + +-- using AFTER MATCH SKIP TO NEXT ROW +SELECT company, tdate, price, first_value(price) OVER w, last_value(price) OVER w + FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + AFTER MATCH SKIP TO NEXT ROW + INITIAL + PATTERN (START UPDOWN) + DEFINE + START AS TRUE, + UPDOWN AS price > PREV(price) AND price > NEXT(price) +); + company | tdate | price | first_value | last_value +----------+------------+-------+-------------+------------ + company1 | 07-01-2023 | 100 | 100 | 200 + company1 | 07-02-2023 | 200 | | + company1 | 07-03-2023 | 150 | | + company1 | 07-04-2023 | 140 | 140 | 150 + company1 | 07-05-2023 | 150 | | + company1 | 07-06-2023 | 90 | | + company1 | 07-07-2023 | 110 | 110 | 130 + company1 | 07-08-2023 | 130 | | + company1 | 07-09-2023 | 120 | | + company1 | 07-10-2023 | 130 | | + company2 | 07-01-2023 | 50 | 50 | 2000 + company2 | 07-02-2023 | 2000 | | + company2 | 07-03-2023 | 1500 | | + company2 | 07-04-2023 | 1400 | 1400 | 1500 + company2 | 07-05-2023 | 1500 | | + company2 | 07-06-2023 | 60 | | + company2 | 07-07-2023 | 1100 | 1100 | 1300 + company2 | 07-08-2023 | 1300 | | + company2 | 07-09-2023 | 1200 | | + company2 | 07-10-2023 | 1300 | | +(20 rows) + +-- match everything +SELECT company, tdate, price, first_value(price) OVER w, last_value(price) OVER w + FROM stock + WINDOW w AS ( + PARTITION BY company + ORDER BY tdate + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + AFTER MATCH SKIP PAST LAST ROW + INITIAL + PATTERN (A+) + DEFINE + A AS TRUE +); + company | tdate | price | first_value | last_value +----------+------------+-------+-------------+------------ + company1 | 07-01-2023 | 100 | 100 | 130 + company1 | 07-02-2023 | 200 | | + company1 | 07-03-2023 | 150 | | + company1 | 07-04-2023 | 140 | | + company1 | 07-05-2023 | 150 | | + company1 | 07-06-2023 | 90 | | + company1 | 07-07-2023 | 110 | | + company1 | 07-08-2023 | 130 | | + company1 | 07-09-2023 | 120 | | + company1 | 07-10-2023 | 130 | | + company2 | 07-01-2023 | 50 | 50 | 1300 + company2 | 07-02-2023 | 2000 | | + company2 | 07-03-2023 | 1500 | | + company2 | 07-04-2023 | 1400 | | + company2 | 07-05-2023 | 1500 | | + company2 | 07-06-2023 | 60 | | + company2 | 07-07-2023 | 1100 | | + company2 | 07-08-2023 | 1300 | | + company2 | 07-09-2023 | 1200 | | + company2 | 07-10-2023 | 1300 | | +(20 rows) + +-- backtracking with reclassification of rows +-- using AFTER MATCH SKIP PAST LAST ROW +SELECT company, tdate, price, first_value(tdate) OVER w, last_value(tdate) OVER w + FROM stock + WINDOW w AS ( + PARTITION BY company + ORDER BY tdate + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + AFTER MATCH SKIP PAST LAST ROW + INITIAL + PATTERN (A+ B+) + DEFINE + A AS price > 100, + B AS price > 100 +); + company | tdate | price | first_value | last_value +----------+------------+-------+-------------+------------ + company1 | 07-01-2023 | 100 | | + company1 | 07-02-2023 | 200 | 07-02-2023 | 07-05-2023 + company1 | 07-03-2023 | 150 | | + company1 | 07-04-2023 | 140 | | + company1 | 07-05-2023 | 150 | | + company1 | 07-06-2023 | 90 | | + company1 | 07-07-2023 | 110 | 07-07-2023 | 07-10-2023 + company1 | 07-08-2023 | 130 | | + company1 | 07-09-2023 | 120 | | + company1 | 07-10-2023 | 130 | | + company2 | 07-01-2023 | 50 | | + company2 | 07-02-2023 | 2000 | 07-02-2023 | 07-05-2023 + company2 | 07-03-2023 | 1500 | | + company2 | 07-04-2023 | 1400 | | + company2 | 07-05-2023 | 1500 | | + company2 | 07-06-2023 | 60 | | + company2 | 07-07-2023 | 1100 | 07-07-2023 | 07-10-2023 + company2 | 07-08-2023 | 1300 | | + company2 | 07-09-2023 | 1200 | | + company2 | 07-10-2023 | 1300 | | +(20 rows) + +-- backtracking with reclassification of rows +-- using AFTER MATCH SKIP TO NEXT ROW +SELECT company, tdate, price, first_value(tdate) OVER w, last_value(tdate) OVER w + FROM stock + WINDOW w AS ( + PARTITION BY company + ORDER BY tdate + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + AFTER MATCH SKIP TO NEXT ROW + INITIAL + PATTERN (A+ B+) + DEFINE + A AS price > 100, + B AS price > 100 +); + company | tdate | price | first_value | last_value +----------+------------+-------+-------------+------------ + company1 | 07-01-2023 | 100 | | + company1 | 07-02-2023 | 200 | 07-02-2023 | 07-05-2023 + company1 | 07-03-2023 | 150 | 07-03-2023 | 07-05-2023 + company1 | 07-04-2023 | 140 | 07-04-2023 | 07-05-2023 + company1 | 07-05-2023 | 150 | | + company1 | 07-06-2023 | 90 | | + company1 | 07-07-2023 | 110 | 07-07-2023 | 07-10-2023 + company1 | 07-08-2023 | 130 | 07-08-2023 | 07-10-2023 + company1 | 07-09-2023 | 120 | 07-09-2023 | 07-10-2023 + company1 | 07-10-2023 | 130 | | + company2 | 07-01-2023 | 50 | | + company2 | 07-02-2023 | 2000 | 07-02-2023 | 07-05-2023 + company2 | 07-03-2023 | 1500 | 07-03-2023 | 07-05-2023 + company2 | 07-04-2023 | 1400 | 07-04-2023 | 07-05-2023 + company2 | 07-05-2023 | 1500 | | + company2 | 07-06-2023 | 60 | | + company2 | 07-07-2023 | 1100 | 07-07-2023 | 07-10-2023 + company2 | 07-08-2023 | 1300 | 07-08-2023 | 07-10-2023 + company2 | 07-09-2023 | 1200 | 07-09-2023 | 07-10-2023 + company2 | 07-10-2023 | 1300 | | +(20 rows) + +-- ROWS BETWEEN CURRENT ROW AND offset FOLLOWING +SELECT company, tdate, price, first_value(tdate) OVER w, last_value(tdate) OVER w, + count(*) OVER w + FROM stock + WINDOW w AS ( + PARTITION BY company + ORDER BY tdate + ROWS BETWEEN CURRENT ROW AND 2 FOLLOWING + AFTER MATCH SKIP PAST LAST ROW + PATTERN (START UP+ DOWN+) + DEFINE + START AS TRUE, + UP AS price > PREV(price), + DOWN AS price < PREV(price) +); + company | tdate | price | first_value | last_value | count +----------+------------+-------+-------------+------------+------- + company1 | 07-01-2023 | 100 | 07-01-2023 | 07-03-2023 | 3 + company1 | 07-02-2023 | 200 | | | + company1 | 07-03-2023 | 150 | | | + company1 | 07-04-2023 | 140 | 07-04-2023 | 07-06-2023 | 3 + company1 | 07-05-2023 | 150 | | | + company1 | 07-06-2023 | 90 | | | + company1 | 07-07-2023 | 110 | 07-07-2023 | 07-09-2023 | 3 + company1 | 07-08-2023 | 130 | | | + company1 | 07-09-2023 | 120 | | | + company1 | 07-10-2023 | 130 | | | 0 + company2 | 07-01-2023 | 50 | 07-01-2023 | 07-03-2023 | 3 + company2 | 07-02-2023 | 2000 | | | + company2 | 07-03-2023 | 1500 | | | + company2 | 07-04-2023 | 1400 | 07-04-2023 | 07-06-2023 | 3 + company2 | 07-05-2023 | 1500 | | | + company2 | 07-06-2023 | 60 | | | + company2 | 07-07-2023 | 1100 | 07-07-2023 | 07-09-2023 | 3 + company2 | 07-08-2023 | 1300 | | | + company2 | 07-09-2023 | 1200 | | | + company2 | 07-10-2023 | 1300 | | | 0 +(20 rows) + +-- +-- Aggregates +-- +-- using AFTER MATCH SKIP PAST LAST ROW +SELECT company, tdate, price, + first_value(price) OVER w, + last_value(price) OVER w, + max(price) OVER w, + min(price) OVER w, + sum(price) OVER w, + avg(price) OVER w, + count(price) OVER w +FROM stock +WINDOW w AS ( +PARTITION BY company +ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING +AFTER MATCH SKIP PAST LAST ROW +INITIAL +PATTERN (START UP+ DOWN+) +DEFINE +START AS TRUE, +UP AS price > PREV(price), +DOWN AS price < PREV(price) +); + company | tdate | price | first_value | last_value | max | min | sum | avg | count +----------+------------+-------+-------------+------------+------+-----+------+-----------------------+------- + company1 | 07-01-2023 | 100 | 100 | 140 | 200 | 100 | 590 | 147.5000000000000000 | 4 + company1 | 07-02-2023 | 200 | | | | | | | + company1 | 07-03-2023 | 150 | | | | | | | + company1 | 07-04-2023 | 140 | | | | | | | + company1 | 07-05-2023 | 150 | | | | | | | 0 + company1 | 07-06-2023 | 90 | 90 | 120 | 130 | 90 | 450 | 112.5000000000000000 | 4 + company1 | 07-07-2023 | 110 | | | | | | | + company1 | 07-08-2023 | 130 | | | | | | | + company1 | 07-09-2023 | 120 | | | | | | | + company1 | 07-10-2023 | 130 | | | | | | | 0 + company2 | 07-01-2023 | 50 | 50 | 1400 | 2000 | 50 | 4950 | 1237.5000000000000000 | 4 + company2 | 07-02-2023 | 2000 | | | | | | | + company2 | 07-03-2023 | 1500 | | | | | | | + company2 | 07-04-2023 | 1400 | | | | | | | + company2 | 07-05-2023 | 1500 | | | | | | | 0 + company2 | 07-06-2023 | 60 | 60 | 1200 | 1300 | 60 | 3660 | 915.0000000000000000 | 4 + company2 | 07-07-2023 | 1100 | | | | | | | + company2 | 07-08-2023 | 1300 | | | | | | | + company2 | 07-09-2023 | 1200 | | | | | | | + company2 | 07-10-2023 | 1300 | | | | | | | 0 +(20 rows) + +-- using AFTER MATCH SKIP TO NEXT ROW +SELECT company, tdate, price, + first_value(price) OVER w, + last_value(price) OVER w, + max(price) OVER w, + min(price) OVER w, + sum(price) OVER w, + avg(price) OVER w, + count(price) OVER w +FROM stock +WINDOW w AS ( +PARTITION BY company +ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING +AFTER MATCH SKIP TO NEXT ROW +INITIAL +PATTERN (START UP+ DOWN+) +DEFINE +START AS TRUE, +UP AS price > PREV(price), +DOWN AS price < PREV(price) +); + company | tdate | price | first_value | last_value | max | min | sum | avg | count +----------+------------+-------+-------------+------------+------+------+------+-----------------------+------- + company1 | 07-01-2023 | 100 | 100 | 140 | 200 | 100 | 590 | 147.5000000000000000 | 4 + company1 | 07-02-2023 | 200 | | | | | | | 0 + company1 | 07-03-2023 | 150 | | | | | | | 0 + company1 | 07-04-2023 | 140 | 140 | 90 | 150 | 90 | 380 | 126.6666666666666667 | 3 + company1 | 07-05-2023 | 150 | | | | | | | 0 + company1 | 07-06-2023 | 90 | 90 | 120 | 130 | 90 | 450 | 112.5000000000000000 | 4 + company1 | 07-07-2023 | 110 | 110 | 120 | 130 | 110 | 360 | 120.0000000000000000 | 3 + company1 | 07-08-2023 | 130 | | | | | | | 0 + company1 | 07-09-2023 | 120 | | | | | | | 0 + company1 | 07-10-2023 | 130 | | | | | | | 0 + company2 | 07-01-2023 | 50 | 50 | 1400 | 2000 | 50 | 4950 | 1237.5000000000000000 | 4 + company2 | 07-02-2023 | 2000 | | | | | | | 0 + company2 | 07-03-2023 | 1500 | | | | | | | 0 + company2 | 07-04-2023 | 1400 | 1400 | 60 | 1500 | 60 | 2960 | 986.6666666666666667 | 3 + company2 | 07-05-2023 | 1500 | | | | | | | 0 + company2 | 07-06-2023 | 60 | 60 | 1200 | 1300 | 60 | 3660 | 915.0000000000000000 | 4 + company2 | 07-07-2023 | 1100 | 1100 | 1200 | 1300 | 1100 | 3600 | 1200.0000000000000000 | 3 + company2 | 07-08-2023 | 1300 | | | | | | | 0 + company2 | 07-09-2023 | 1200 | | | | | | | 0 + company2 | 07-10-2023 | 1300 | | | | | | | 0 +(20 rows) + +-- JOIN case +CREATE TEMP TABLE t1 (i int, v1 int); +CREATE TEMP TABLE t2 (j int, v2 int); +INSERT INTO t1 VALUES(1,10); +INSERT INTO t1 VALUES(1,11); +INSERT INTO t1 VALUES(1,12); +INSERT INTO t2 VALUES(2,10); +INSERT INTO t2 VALUES(2,11); +INSERT INTO t2 VALUES(2,12); +SELECT * FROM t1, t2 WHERE t1.v1 <= 11 AND t2.v2 <= 11; + i | v1 | j | v2 +---+----+---+---- + 1 | 10 | 2 | 10 + 1 | 10 | 2 | 11 + 1 | 11 | 2 | 10 + 1 | 11 | 2 | 11 +(4 rows) + +SELECT *, count(*) OVER w FROM t1, t2 +WINDOW w AS ( + PARTITION BY t1.i + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (A) + DEFINE + A AS v1 <= 11 AND v2 <= 11 +); + i | v1 | j | v2 | count +---+----+---+----+------- + 1 | 10 | 2 | 10 | 1 + 1 | 10 | 2 | 11 | 1 + 1 | 10 | 2 | 12 | 0 + 1 | 11 | 2 | 10 | 1 + 1 | 11 | 2 | 11 | 1 + 1 | 11 | 2 | 12 | 0 + 1 | 12 | 2 | 10 | 0 + 1 | 12 | 2 | 11 | 0 + 1 | 12 | 2 | 12 | 0 +(9 rows) + +-- WITH case +WITH wstock AS ( + SELECT * FROM stock WHERE tdate < '2023-07-08' +) +SELECT tdate, price, +first_value(tdate) OVER w, +count(*) OVER w + FROM wstock + WINDOW w AS ( + PARTITION BY company + ORDER BY tdate + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (START UP+ DOWN+) + DEFINE + START AS TRUE, + UP AS price > PREV(price), + DOWN AS price < PREV(price) +); + tdate | price | first_value | count +------------+-------+-------------+------- + 07-01-2023 | 100 | 07-01-2023 | 4 + 07-02-2023 | 200 | | + 07-03-2023 | 150 | | + 07-04-2023 | 140 | | + 07-05-2023 | 150 | | 0 + 07-06-2023 | 90 | | 0 + 07-07-2023 | 110 | | 0 + 07-01-2023 | 50 | 07-01-2023 | 4 + 07-02-2023 | 2000 | | + 07-03-2023 | 1500 | | + 07-04-2023 | 1400 | | + 07-05-2023 | 1500 | | 0 + 07-06-2023 | 60 | | 0 + 07-07-2023 | 1100 | | 0 +(14 rows) + +-- +-- Error cases +-- +-- row pattern definition variable name must not appear more than once +SELECT company, tdate, price, first_value(price) OVER w, last_value(price) OVER w + FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + ORDER BY tdate + INITIAL + PATTERN (START UP+ DOWN+) + DEFINE + START AS TRUE, + UP AS price > PREV(price), + DOWN AS price < PREV(price), + UP AS price > PREV(price) +); +ERROR: syntax error at or near "ORDER" +LINE 6: ORDER BY tdate + ^ +-- pattern variable name must appear in DEFINE +SELECT company, tdate, price, first_value(price) OVER w, last_value(price) OVER w + FROM stock + WINDOW w AS ( + PARTITION BY company + ORDER BY tdate + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (START UP+ DOWN+ END) + DEFINE + START AS TRUE, + UP AS price > PREV(price), + DOWN AS price < PREV(price) +); +ERROR: syntax error at or near "END" +LINE 8: PATTERN (START UP+ DOWN+ END) + ^ +-- FRAME must start at current row when row patttern recognition is used +SELECT company, tdate, price, first_value(price) OVER w, last_value(price) OVER w + FROM stock + WINDOW w AS ( + PARTITION BY company + ORDER BY tdate + ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (START UP+ DOWN+) + DEFINE + START AS TRUE, + UP AS price > PREV(price), + DOWN AS price < PREV(price) +); +ERROR: FRAME must start at current row when row patttern recognition is used +-- SEEK is not supported +SELECT company, tdate, price, first_value(price) OVER w, last_value(price) OVER w + FROM stock + WINDOW w AS ( + PARTITION BY company + ORDER BY tdate + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + AFTER MATCH SKIP TO NEXT ROW + SEEK + PATTERN (START UP+ DOWN+) + DEFINE + START AS TRUE, + UP AS price > PREV(price), + DOWN AS price < PREV(price) +); +ERROR: SEEK is not supported +LINE 8: SEEK + ^ +HINT: Use INITIAL. diff --git a/src/test/regress/parallel_schedule b/src/test/regress/parallel_schedule index f0987ff537..a6542f3dea 100644 --- a/src/test/regress/parallel_schedule +++ b/src/test/regress/parallel_schedule @@ -98,7 +98,7 @@ test: publication subscription # Another group of parallel tests # select_views depends on create_view # ---------- -test: select_views portals_p2 foreign_key cluster dependency guc bitmapops combocid tsearch tsdicts foreign_data window xmlmap functional_deps advisory_lock indirect_toast equivclass +test: select_views portals_p2 foreign_key cluster dependency guc bitmapops combocid tsearch tsdicts foreign_data window xmlmap functional_deps advisory_lock indirect_toast equivclass rpr # ---------- # Another group of parallel tests (JSON related) diff --git a/src/test/regress/sql/rpr.sql b/src/test/regress/sql/rpr.sql new file mode 100644 index 0000000000..0a69cc0e11 --- /dev/null +++ b/src/test/regress/sql/rpr.sql @@ -0,0 +1,392 @@ +-- +-- Test for row pattern definition clause +-- + +CREATE TEMP TABLE stock ( + company TEXT, + tdate DATE, + price INTEGER +); +INSERT INTO stock VALUES ('company1', '2023-07-01', 100); +INSERT INTO stock VALUES ('company1', '2023-07-02', 200); +INSERT INTO stock VALUES ('company1', '2023-07-03', 150); +INSERT INTO stock VALUES ('company1', '2023-07-04', 140); +INSERT INTO stock VALUES ('company1', '2023-07-05', 150); +INSERT INTO stock VALUES ('company1', '2023-07-06', 90); +INSERT INTO stock VALUES ('company1', '2023-07-07', 110); +INSERT INTO stock VALUES ('company1', '2023-07-08', 130); +INSERT INTO stock VALUES ('company1', '2023-07-09', 120); +INSERT INTO stock VALUES ('company1', '2023-07-10', 130); +INSERT INTO stock VALUES ('company2', '2023-07-01', 50); +INSERT INTO stock VALUES ('company2', '2023-07-02', 2000); +INSERT INTO stock VALUES ('company2', '2023-07-03', 1500); +INSERT INTO stock VALUES ('company2', '2023-07-04', 1400); +INSERT INTO stock VALUES ('company2', '2023-07-05', 1500); +INSERT INTO stock VALUES ('company2', '2023-07-06', 60); +INSERT INTO stock VALUES ('company2', '2023-07-07', 1100); +INSERT INTO stock VALUES ('company2', '2023-07-08', 1300); +INSERT INTO stock VALUES ('company2', '2023-07-09', 1200); +INSERT INTO stock VALUES ('company2', '2023-07-10', 1300); + +SELECT * FROM stock; + +-- basic test using PREV +SELECT company, tdate, price, first_value(price) OVER w, last_value(price) OVER w, + nth_value(tdate, 2) OVER w AS nth_second + FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (START UP+ DOWN+) + DEFINE + START AS TRUE, + UP AS price > PREV(price), + DOWN AS price < PREV(price) +); + +-- basic test using PREV. UP appears twice +SELECT company, tdate, price, first_value(price) OVER w, last_value(price) OVER w, + nth_value(tdate, 2) OVER w AS nth_second + FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (START UP+ DOWN+ UP+) + DEFINE + START AS TRUE, + UP AS price > PREV(price), + DOWN AS price < PREV(price) +); + +-- basic test using PREV. Use '*' +SELECT company, tdate, price, first_value(price) OVER w, last_value(price) OVER w, + nth_value(tdate, 2) OVER w AS nth_second + FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (START UP* DOWN+) + DEFINE + START AS TRUE, + UP AS price > PREV(price), + DOWN AS price < PREV(price) +); + +-- basic test with none greedy pattern +SELECT company, tdate, price, count(*) OVER w + FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (A A A) + DEFINE + A AS price >= 140 AND price <= 150 +); + +-- last_value() should remain consistent +SELECT company, tdate, price, last_value(price) OVER w + FROM stock + WINDOW w AS ( + PARTITION BY company + ORDER BY tdate + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (START UP+ DOWN+) + DEFINE + START AS TRUE, + UP AS price > PREV(price), + DOWN AS price < PREV(price) +); + +-- omit "START" in DEFINE but it is ok because "START AS TRUE" is +-- implicitly defined. per spec. +SELECT company, tdate, price, first_value(price) OVER w, last_value(price) OVER w, + nth_value(tdate, 2) OVER w AS nth_second + FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (START UP+ DOWN+) + DEFINE + UP AS price > PREV(price), + DOWN AS price < PREV(price) +); + +-- the first row start with less than or equal to 100 +SELECT company, tdate, price, first_value(price) OVER w, last_value(price) OVER w + FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (LOWPRICE UP+ DOWN+) + DEFINE + LOWPRICE AS price <= 100, + UP AS price > PREV(price), + DOWN AS price < PREV(price) +); + +-- second row raises 120% +SELECT company, tdate, price, first_value(price) OVER w, last_value(price) OVER w + FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (LOWPRICE UP+ DOWN+) + DEFINE + LOWPRICE AS price <= 100, + UP AS price > PREV(price) * 1.2, + DOWN AS price < PREV(price) +); + +-- using NEXT +SELECT company, tdate, price, first_value(price) OVER w, last_value(price) OVER w + FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (START UPDOWN) + DEFINE + START AS TRUE, + UPDOWN AS price > PREV(price) AND price > NEXT(price) +); + +-- using AFTER MATCH SKIP TO NEXT ROW +SELECT company, tdate, price, first_value(price) OVER w, last_value(price) OVER w + FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + AFTER MATCH SKIP TO NEXT ROW + INITIAL + PATTERN (START UPDOWN) + DEFINE + START AS TRUE, + UPDOWN AS price > PREV(price) AND price > NEXT(price) +); + +-- match everything + +SELECT company, tdate, price, first_value(price) OVER w, last_value(price) OVER w + FROM stock + WINDOW w AS ( + PARTITION BY company + ORDER BY tdate + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + AFTER MATCH SKIP PAST LAST ROW + INITIAL + PATTERN (A+) + DEFINE + A AS TRUE +); + +-- backtracking with reclassification of rows +-- using AFTER MATCH SKIP PAST LAST ROW +SELECT company, tdate, price, first_value(tdate) OVER w, last_value(tdate) OVER w + FROM stock + WINDOW w AS ( + PARTITION BY company + ORDER BY tdate + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + AFTER MATCH SKIP PAST LAST ROW + INITIAL + PATTERN (A+ B+) + DEFINE + A AS price > 100, + B AS price > 100 +); + +-- backtracking with reclassification of rows +-- using AFTER MATCH SKIP TO NEXT ROW +SELECT company, tdate, price, first_value(tdate) OVER w, last_value(tdate) OVER w + FROM stock + WINDOW w AS ( + PARTITION BY company + ORDER BY tdate + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + AFTER MATCH SKIP TO NEXT ROW + INITIAL + PATTERN (A+ B+) + DEFINE + A AS price > 100, + B AS price > 100 +); + +-- ROWS BETWEEN CURRENT ROW AND offset FOLLOWING +SELECT company, tdate, price, first_value(tdate) OVER w, last_value(tdate) OVER w, + count(*) OVER w + FROM stock + WINDOW w AS ( + PARTITION BY company + ORDER BY tdate + ROWS BETWEEN CURRENT ROW AND 2 FOLLOWING + AFTER MATCH SKIP PAST LAST ROW + PATTERN (START UP+ DOWN+) + DEFINE + START AS TRUE, + UP AS price > PREV(price), + DOWN AS price < PREV(price) +); + +-- +-- Aggregates +-- + +-- using AFTER MATCH SKIP PAST LAST ROW +SELECT company, tdate, price, + first_value(price) OVER w, + last_value(price) OVER w, + max(price) OVER w, + min(price) OVER w, + sum(price) OVER w, + avg(price) OVER w, + count(price) OVER w +FROM stock +WINDOW w AS ( +PARTITION BY company +ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING +AFTER MATCH SKIP PAST LAST ROW +INITIAL +PATTERN (START UP+ DOWN+) +DEFINE +START AS TRUE, +UP AS price > PREV(price), +DOWN AS price < PREV(price) +); + +-- using AFTER MATCH SKIP TO NEXT ROW +SELECT company, tdate, price, + first_value(price) OVER w, + last_value(price) OVER w, + max(price) OVER w, + min(price) OVER w, + sum(price) OVER w, + avg(price) OVER w, + count(price) OVER w +FROM stock +WINDOW w AS ( +PARTITION BY company +ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING +AFTER MATCH SKIP TO NEXT ROW +INITIAL +PATTERN (START UP+ DOWN+) +DEFINE +START AS TRUE, +UP AS price > PREV(price), +DOWN AS price < PREV(price) +); + +-- JOIN case +CREATE TEMP TABLE t1 (i int, v1 int); +CREATE TEMP TABLE t2 (j int, v2 int); +INSERT INTO t1 VALUES(1,10); +INSERT INTO t1 VALUES(1,11); +INSERT INTO t1 VALUES(1,12); +INSERT INTO t2 VALUES(2,10); +INSERT INTO t2 VALUES(2,11); +INSERT INTO t2 VALUES(2,12); + +SELECT * FROM t1, t2 WHERE t1.v1 <= 11 AND t2.v2 <= 11; + +SELECT *, count(*) OVER w FROM t1, t2 +WINDOW w AS ( + PARTITION BY t1.i + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (A) + DEFINE + A AS v1 <= 11 AND v2 <= 11 +); + +-- WITH case +WITH wstock AS ( + SELECT * FROM stock WHERE tdate < '2023-07-08' +) +SELECT tdate, price, +first_value(tdate) OVER w, +count(*) OVER w + FROM wstock + WINDOW w AS ( + PARTITION BY company + ORDER BY tdate + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (START UP+ DOWN+) + DEFINE + START AS TRUE, + UP AS price > PREV(price), + DOWN AS price < PREV(price) +); + +-- +-- Error cases +-- + +-- row pattern definition variable name must not appear more than once +SELECT company, tdate, price, first_value(price) OVER w, last_value(price) OVER w + FROM stock + WINDOW w AS ( + PARTITION BY company + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + ORDER BY tdate + INITIAL + PATTERN (START UP+ DOWN+) + DEFINE + START AS TRUE, + UP AS price > PREV(price), + DOWN AS price < PREV(price), + UP AS price > PREV(price) +); + +-- pattern variable name must appear in DEFINE +SELECT company, tdate, price, first_value(price) OVER w, last_value(price) OVER w + FROM stock + WINDOW w AS ( + PARTITION BY company + ORDER BY tdate + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (START UP+ DOWN+ END) + DEFINE + START AS TRUE, + UP AS price > PREV(price), + DOWN AS price < PREV(price) +); + +-- FRAME must start at current row when row patttern recognition is used +SELECT company, tdate, price, first_value(price) OVER w, last_value(price) OVER w + FROM stock + WINDOW w AS ( + PARTITION BY company + ORDER BY tdate + ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING + INITIAL + PATTERN (START UP+ DOWN+) + DEFINE + START AS TRUE, + UP AS price > PREV(price), + DOWN AS price < PREV(price) +); + +-- SEEK is not supported +SELECT company, tdate, price, first_value(price) OVER w, last_value(price) OVER w + FROM stock + WINDOW w AS ( + PARTITION BY company + ORDER BY tdate + ROWS BETWEEN CURRENT ROW AND UNBOUNDED FOLLOWING + AFTER MATCH SKIP TO NEXT ROW + SEEK + PATTERN (START UP+ DOWN+) + DEFINE + START AS TRUE, + UP AS price > PREV(price), + DOWN AS price < PREV(price) +); -- 2.25.1 ----Next_Part(Fri_Dec__8_10_16_13_2023_489)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="v12-0007-Allow-to-print-raw-parse-tree.patch" ^ permalink raw reply [nested|flat] 29+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 29+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 29+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 29+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 29+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 29+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 29+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 29+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 29+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 29+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 29+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 29+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 29+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 29+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 29+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 29+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 29+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 29+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 29+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 29+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 29+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 29+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 29+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 29+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 29+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 29+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 29+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 29+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 29+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 29+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 29+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 29+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 29+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 29+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 29+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 29+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 29+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 29+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 29+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 29+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 29+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 29+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 29+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 29+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 29+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 29+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 29+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 29+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 29+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 29+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 29+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 29+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 29+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 29+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 29+ messages in thread
* [PATCH v1] Mark object class descriptions for translation @ 2026-07-03 06:06 Kyotaro Horiguchi <[email protected]> 0 siblings, 0 replies; 29+ messages in thread From: Kyotaro Horiguchi @ 2026-07-03 06:06 UTC (permalink / raw) ObjectPropertyType.class_descr was originally intended for internal error messages, but is now also used in a translated error message. Mark the object class descriptions for translation and translate the return value of get_object_class_descr(). --- src/backend/catalog/objectaddress.c | 88 ++++++++++++++--------------- src/backend/catalog/pg_depend.c | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index af0e4703616..12dc76b712a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -100,8 +100,8 @@ */ typedef struct { - const char *class_descr; /* string describing the catalog, for internal - * error messages */ + const char *class_descr; /* string describing the catalog, for error + * messages */ Oid class_oid; /* oid of catalog */ Oid oid_index_oid; /* oid of index on system oid column */ SysCacheIdentifier oid_catcache_id; /* id of catcache on system oid column */ @@ -124,7 +124,7 @@ typedef struct static const ObjectPropertyType ObjectProperty[] = { { - "access method", + gettext_noop("access method"), AccessMethodRelationId, AmOidIndexId, AMOID, @@ -138,7 +138,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "access method operator", + gettext_noop("access method operator"), AccessMethodOperatorRelationId, AccessMethodOperatorOidIndexId, SYSCACHEID_INVALID, @@ -152,7 +152,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "access method procedure", + gettext_noop("access method procedure"), AccessMethodProcedureRelationId, AccessMethodProcedureOidIndexId, SYSCACHEID_INVALID, @@ -166,7 +166,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "cast", + gettext_noop("cast"), CastRelationId, CastOidIndexId, SYSCACHEID_INVALID, @@ -180,7 +180,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "collation", + gettext_noop("collation"), CollationRelationId, CollationOidIndexId, COLLOID, @@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "constraint", + gettext_noop("constraint"), ConstraintRelationId, ConstraintOidIndexId, CONSTROID, @@ -208,7 +208,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "conversion", + gettext_noop("conversion"), ConversionRelationId, ConversionOidIndexId, CONVOID, @@ -222,7 +222,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "database", + gettext_noop("database"), DatabaseRelationId, DatabaseOidIndexId, DATABASEOID, @@ -236,7 +236,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "default ACL", + gettext_noop("default ACL"), DefaultAclRelationId, DefaultAclOidIndexId, SYSCACHEID_INVALID, @@ -250,7 +250,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "extension", + gettext_noop("extension"), ExtensionRelationId, ExtensionOidIndexId, SYSCACHEID_INVALID, @@ -264,7 +264,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign-data wrapper", + gettext_noop("foreign-data wrapper"), ForeignDataWrapperRelationId, ForeignDataWrapperOidIndexId, FOREIGNDATAWRAPPEROID, @@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "foreign server", + gettext_noop("foreign server"), ForeignServerRelationId, ForeignServerOidIndexId, FOREIGNSERVEROID, @@ -292,7 +292,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "function", + gettext_noop("function"), ProcedureRelationId, ProcedureOidIndexId, PROCOID, @@ -306,7 +306,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "language", + gettext_noop("language"), LanguageRelationId, LanguageOidIndexId, LANGOID, @@ -320,7 +320,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "large object metadata", + gettext_noop("large object metadata"), LargeObjectMetadataRelationId, LargeObjectMetadataOidIndexId, SYSCACHEID_INVALID, @@ -334,7 +334,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator class", + gettext_noop("operator class"), OperatorClassRelationId, OpclassOidIndexId, CLAOID, @@ -348,7 +348,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "operator", + gettext_noop("operator"), OperatorRelationId, OperatorOidIndexId, OPEROID, @@ -362,7 +362,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "operator family", + gettext_noop("operator family"), OperatorFamilyRelationId, OpfamilyOidIndexId, OPFAMILYOID, @@ -376,7 +376,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "property graph element", + gettext_noop("property graph element"), PropgraphElementRelationId, PropgraphElementObjectIndexId, PROPGRAPHELOID, @@ -390,7 +390,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph element label", + gettext_noop("property graph element label"), PropgraphElementLabelRelationId, PropgraphElementLabelObjectIndexId, -1, @@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label", + gettext_noop("property graph label"), PropgraphLabelRelationId, PropgraphLabelObjectIndexId, PROPGRAPHLABELOID, @@ -418,7 +418,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph label property", + gettext_noop("property graph label property"), PropgraphLabelPropertyRelationId, PropgraphLabelPropertyObjectIndexId, -1, @@ -432,7 +432,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "property graph property", + gettext_noop("property graph property"), PropgraphPropertyRelationId, PropgraphPropertyObjectIndexId, -1, @@ -446,7 +446,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "role", + gettext_noop("role"), AuthIdRelationId, AuthIdOidIndexId, AUTHOID, @@ -460,7 +460,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "role membership", + gettext_noop("role membership"), AuthMemRelationId, AuthMemOidIndexId, SYSCACHEID_INVALID, @@ -474,7 +474,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "rule", + gettext_noop("rule"), RewriteRelationId, RewriteOidIndexId, SYSCACHEID_INVALID, @@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "schema", + gettext_noop("schema"), NamespaceRelationId, NamespaceOidIndexId, NAMESPACEOID, @@ -502,7 +502,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "relation", + gettext_noop("relation"), RelationRelationId, ClassOidIndexId, RELOID, @@ -516,7 +516,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "tablespace", + gettext_noop("tablespace"), TableSpaceRelationId, TablespaceOidIndexId, TABLESPACEOID, @@ -530,7 +530,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "transform", + gettext_noop("transform"), TransformRelationId, TransformOidIndexId, TRFOID, @@ -544,7 +544,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "trigger", + gettext_noop("trigger"), TriggerRelationId, TriggerOidIndexId, SYSCACHEID_INVALID, @@ -558,7 +558,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "policy", + gettext_noop("policy"), PolicyRelationId, PolicyOidIndexId, SYSCACHEID_INVALID, @@ -572,7 +572,7 @@ static const ObjectPropertyType ObjectProperty[] = false }, { - "event trigger", + gettext_noop("event trigger"), EventTriggerRelationId, EventTriggerOidIndexId, EVENTTRIGGEROID, @@ -586,7 +586,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search configuration", + gettext_noop("text search configuration"), TSConfigRelationId, TSConfigOidIndexId, TSCONFIGOID, @@ -600,7 +600,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search dictionary", + gettext_noop("text search dictionary"), TSDictionaryRelationId, TSDictionaryOidIndexId, TSDICTOID, @@ -614,7 +614,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search parser", + gettext_noop("text search parser"), TSParserRelationId, TSParserOidIndexId, TSPARSEROID, @@ -628,7 +628,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "text search template", + gettext_noop("text search template"), TSTemplateRelationId, TSTemplateOidIndexId, TSTEMPLATEOID, @@ -642,7 +642,7 @@ static const ObjectPropertyType ObjectProperty[] = true, }, { - "type", + gettext_noop("type"), TypeRelationId, TypeOidIndexId, TYPEOID, @@ -656,7 +656,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "publication", + gettext_noop("publication"), PublicationRelationId, PublicationObjectIndexId, PUBLICATIONOID, @@ -670,7 +670,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "subscription", + gettext_noop("subscription"), SubscriptionRelationId, SubscriptionObjectIndexId, SUBSCRIPTIONOID, @@ -684,7 +684,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "extended statistics", + gettext_noop("extended statistics"), StatisticExtRelationId, StatisticExtOidIndexId, STATEXTOID, @@ -698,7 +698,7 @@ static const ObjectPropertyType ObjectProperty[] = true }, { - "user mapping", + gettext_noop("user mapping"), UserMappingRelationId, UserMappingOidIndexId, USERMAPPINGOID, diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 9a7a401aced..0d28d34412d 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -810,7 +810,7 @@ dependencyLockAndCheckObject(Oid classId, Oid objectId) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("referenced %s was concurrently dropped", - get_object_class_descr(classId)))); + _(get_object_class_descr(classId))))); systable_endscan(scan); table_close(rel, AccessShareLock); -- 2.52.0 ----Next_Part(Fri_Jul__3_15_37_42_2026_665)---- ^ permalink raw reply [nested|flat] 29+ messages in thread
end of thread, other threads:[~2026-07-03 06:06 UTC | newest] Thread overview: 29+ messages (download: mbox mbox.gz follow: Atom feed) -- links below jump to the message on this page -- 2023-12-04 11:23 [PATCH v12 6/7] Row pattern recognition patch (tests). Tatsuo Ishii <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]> 2026-07-03 06:06 [PATCH v1] Mark object class descriptions for translation Kyotaro Horiguchi <[email protected]>
This inbox is served by agora; see mirroring instructions for how to clone and mirror all data and code used for this inbox