From: Kyotaro Horiguchi Date: Thu, 5 Feb 2026 13:17:58 +0900 Subject: [PATCH 2/6] Consolidate target-only message variants Consolidate two messages that differ only in their targets into a single translation unit. --- src/backend/partitioning/partbounds.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/backend/partitioning/partbounds.c b/src/backend/partitioning/partbounds.c index 0ca312ac27d..d8f48cb0868 100644 --- a/src/backend/partitioning/partbounds.c +++ b/src/backend/partitioning/partbounds.c @@ -5033,7 +5033,8 @@ check_two_partitions_bounds_range(Relation parent, second_name->relname, first_name->relname), errdetail("lower bound of partition \"%s\" is not equal to the upper bound of partition \"%s\"", second_name->relname, first_name->relname), - errhint("ALTER TABLE ... MERGE PARTITIONS requires the partition bounds to be adjacent."), + errhint("%s requires the partition bounds to be adjacent.", + "ALTER TABLE ... MERGE PARTITIONS"), parser_errposition(pstate, datum->location)); else ereport(ERROR, @@ -5042,7 +5043,8 @@ check_two_partitions_bounds_range(Relation parent, second_name->relname, first_name->relname), errdetail("lower bound of partition \"%s\" is not equal to the upper bound of partition \"%s\"", second_name->relname, first_name->relname), - errhint("ALTER TABLE ... SPLIT PARTITION requires the partition bounds to be adjacent."), + errhint("%s requires the partition bounds to be adjacent.", + "ALTER TABLE ... SPLIT PARTITION"), parser_errposition(pstate, datum->location)); } } -- 2.47.3 ----Next_Part(Tue_Feb_10_14_37_52_2026_180)-- Content-Type: Text/X-Patch; charset=utf-8 Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0003-Fix-grammar-in-a-partition-related-message.patch" RnJvbSBkYzIyMTRlNDYwYjE5YTEwNWMyODU4MzYyYThkYWE2NTNjZTM4YjE3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQ0KRnJvbTogS3lvdGFybyBIb3JpZ3VjaGkgPGhvcmlreW90YS5udHRAZ21h aWwuY29tPg0KRGF0ZTogVHVlLCAxMCBGZWIgMjAyNiAxMzo0NjoxNyArMDkwMA0KU3ViamVjdDog W1BBVENIIDMvNl0gRml4IGdyYW1tYXIgaW4gYSBwYXJ0aXRpb24tcmVsYXRlZCBtZXNzYWdlDQpN SU1FLVZlcnNpb246IDEuMA0KQ29udGVudC1UeXBlOiB0ZXh0L3BsYWluOyBjaGFyc2V0PVVURi04 DQpDb250ZW50LVRyYW5zZmVyLUVuY29kaW5nOiA4Yml0DQoNCkZpeCBzdWJqZWN04oCTdmVyYiBh Z3JlZW1lbnQuDQotLS0NCiBzcmMvYmFja2VuZC9wYXJ0aXRpb25pbmcvcGFydGJvdW5kcy5jIHwg MTIgKysrKysrLS0tLS0tDQogMSBmaWxlIGNoYW5nZWQsIDYgaW5zZXJ0aW9ucygrKSwgNiBkZWxl dGlvbnMoLSkNCg0KZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5kL3BhcnRpdGlvbmluZy9wYXJ0Ym91 bmRzLmMgYi9zcmMvYmFja2VuZC9wYXJ0aXRpb25pbmcvcGFydGJvdW5kcy5jDQppbmRleCBkOGY0 OGNiMDg2OC4uYTQ0ODc1MjFhNjcgMTAwNjQ0DQotLS0gYS9zcmMvYmFja2VuZC9wYXJ0aXRpb25p bmcvcGFydGJvdW5kcy5jDQorKysgYi9zcmMvYmFja2VuZC9wYXJ0aXRpb25pbmcvcGFydGJvdW5k cy5jDQpAQCAtNTQwNiw3ICs1NDA2LDcgQEAgY2hlY2tfcGFydGl0aW9uX2JvdW5kc19mb3Jfc3Bs aXRfcmFuZ2UoUmVsYXRpb24gcGFyZW50LA0KIAkJCQkJCQllcnJtc2coImxvd2VyIGJvdW5kIG9m IHBhcnRpdGlvbiBcIiVzXCIgaXMgbm90IGVxdWFsIHRvIGxvd2VyIGJvdW5kIG9mIHNwbGl0IHBh cnRpdGlvbiBcIiVzXCIiLA0KIAkJCQkJCQkJICAgcmVsbmFtZSwNCiAJCQkJCQkJCSAgIGdldF9y ZWxfbmFtZShzcGxpdFBhcnRPaWQpKSwNCi0JCQkJCQkJZXJyaGludCgiJXMgcmVxdWlyZSBjb21i aW5lZCBib3VuZHMgb2YgbmV3IHBhcnRpdGlvbnMgbXVzdCBleGFjdGx5IG1hdGNoIHRoZSBib3Vu ZCBvZiB0aGUgc3BsaXQgcGFydGl0aW9uIiwNCisJCQkJCQkJZXJyaGludCgiJXMgcmVxdWlyZXMg Y29tYmluZWQgYm91bmRzIG9mIG5ldyBwYXJ0aXRpb25zIG11c3QgZXhhY3RseSBtYXRjaCB0aGUg Ym91bmQgb2YgdGhlIHNwbGl0IHBhcnRpdGlvbiIsDQogCQkJCQkJCQkJIkFMVEVSIFRBQkxFIC4u LiBTUExJVCBQQVJUSVRJT04iKSwNCiAJCQkJCQkJcGFyc2VyX2VycnBvc2l0aW9uKHBzdGF0ZSwg ZXhwckxvY2F0aW9uKChOb2RlICopIGRhdHVtKSkpOw0KIAkJCX0NCkBAIC01NDE2LDcgKzU0MTYs NyBAQCBjaGVja19wYXJ0aXRpb25fYm91bmRzX2Zvcl9zcGxpdF9yYW5nZShSZWxhdGlvbiBwYXJl bnQsDQogCQkJCQkJZXJybXNnKCJsb3dlciBib3VuZCBvZiBwYXJ0aXRpb24gXCIlc1wiIGlzIGxl c3MgdGhhbiBsb3dlciBib3VuZCBvZiBzcGxpdCBwYXJ0aXRpb24gXCIlc1wiIiwNCiAJCQkJCQkJ ICAgcmVsbmFtZSwNCiAJCQkJCQkJICAgZ2V0X3JlbF9uYW1lKHNwbGl0UGFydE9pZCkpLA0KLQkJ CQkJCWVycmhpbnQoIiVzIHJlcXVpcmUgY29tYmluZWQgYm91bmRzIG9mIG5ldyBwYXJ0aXRpb25z IG11c3QgZXhhY3RseSBtYXRjaCB0aGUgYm91bmQgb2YgdGhlIHNwbGl0IHBhcnRpdGlvbiIsDQor CQkJCQkJZXJyaGludCgiJXMgcmVxdWlyZXMgY29tYmluZWQgYm91bmRzIG9mIG5ldyBwYXJ0aXRp b25zIG11c3QgZXhhY3RseSBtYXRjaCB0aGUgYm91bmQgb2YgdGhlIHNwbGl0IHBhcnRpdGlvbiIs DQogCQkJCQkJCQkiQUxURVIgVEFCTEUgLi4uIFNQTElUIFBBUlRJVElPTiIpLA0KIAkJCQkJCXBh cnNlcl9lcnJwb3NpdGlvbihwc3RhdGUsIGV4cHJMb2NhdGlvbigoTm9kZSAqKSBkYXR1bSkpKTsN CiAJCX0NCkBAIC01NDQ4LDcgKzU0NDgsNyBAQCBjaGVja19wYXJ0aXRpb25fYm91bmRzX2Zvcl9z cGxpdF9yYW5nZShSZWxhdGlvbiBwYXJlbnQsDQogCQkJCQkJCWVycm1zZygidXBwZXIgYm91bmQg b2YgcGFydGl0aW9uIFwiJXNcIiBpcyBub3QgZXF1YWwgdG8gdXBwZXIgYm91bmQgb2Ygc3BsaXQg cGFydGl0aW9uIFwiJXNcIiIsDQogCQkJCQkJCQkgICByZWxuYW1lLA0KIAkJCQkJCQkJICAgZ2V0 X3JlbF9uYW1lKHNwbGl0UGFydE9pZCkpLA0KLQkJCQkJCQllcnJoaW50KCIlcyByZXF1aXJlIGNv bWJpbmVkIGJvdW5kcyBvZiBuZXcgcGFydGl0aW9ucyBtdXN0IGV4YWN0bHkgbWF0Y2ggdGhlIGJv dW5kIG9mIHRoZSBzcGxpdCBwYXJ0aXRpb24iLA0KKwkJCQkJCQllcnJoaW50KCIlcyByZXF1aXJl cyBjb21iaW5lZCBib3VuZHMgb2YgbmV3IHBhcnRpdGlvbnMgbXVzdCBleGFjdGx5IG1hdGNoIHRo ZSBib3VuZCBvZiB0aGUgc3BsaXQgcGFydGl0aW9uIiwNCiAJCQkJCQkJCQkiQUxURVIgVEFCTEUg Li4uIFNQTElUIFBBUlRJVElPTiIpLA0KIAkJCQkJCQlwYXJzZXJfZXJycG9zaXRpb24ocHN0YXRl LCBleHByTG9jYXRpb24oKE5vZGUgKikgZGF0dW0pKSk7DQogCQkJfQ0KQEAgLTU0NTgsNyArNTQ1 OCw3IEBAIGNoZWNrX3BhcnRpdGlvbl9ib3VuZHNfZm9yX3NwbGl0X3JhbmdlKFJlbGF0aW9uIHBh cmVudCwNCiAJCQkJCQllcnJtc2coInVwcGVyIGJvdW5kIG9mIHBhcnRpdGlvbiBcIiVzXCIgaXMg Z3JlYXRlciB0aGFuIHVwcGVyIGJvdW5kIG9mIHNwbGl0IHBhcnRpdGlvbiBcIiVzXCIiLA0KIAkJ CQkJCQkgICByZWxuYW1lLA0KIAkJCQkJCQkgICBnZXRfcmVsX25hbWUoc3BsaXRQYXJ0T2lkKSks DQotCQkJCQkJZXJyaGludCgiJXMgcmVxdWlyZSBjb21iaW5lZCBib3VuZHMgb2YgbmV3IHBhcnRp dGlvbnMgbXVzdCBleGFjdGx5IG1hdGNoIHRoZSBib3VuZCBvZiB0aGUgc3BsaXQgcGFydGl0aW9u IiwNCisJCQkJCQllcnJoaW50KCIlcyByZXF1aXJlcyBjb21iaW5lZCBib3VuZHMgb2YgbmV3IHBh cnRpdGlvbnMgbXVzdCBleGFjdGx5IG1hdGNoIHRoZSBib3VuZCBvZiB0aGUgc3BsaXQgcGFydGl0 aW9uIiwNCiAJCQkJCQkJCSJBTFRFUiBUQUJMRSAuLi4gU1BMSVQgUEFSVElUSU9OIiksDQogCQkJ CQkJcGFyc2VyX2VycnBvc2l0aW9uKHBzdGF0ZSwgZXhwckxvY2F0aW9uKChOb2RlICopIGRhdHVt KSkpOw0KIAkJfQ0KQEAgLTU2NTQsNyArNTY1NCw3IEBAIGNoZWNrX3BhcmVudF92YWx1ZXNfaW5f bmV3X3BhcnRpdGlvbnMoUmVsYXRpb24gcGFyZW50LA0KIAkJCQllcnJtc2coIm5ldyBwYXJ0aXRp b25zIGNvbWJpbmVkIHBhcnRpdGlvbiBib3VuZHMgZG8gbm90IGNvbnRhaW4gdmFsdWUgKCVzKSBi dXQgc3BsaXQgcGFydGl0aW9uIFwiJXNcIiBkb2VzIiwNCiAJCQkJCSAgICJOVUxMIiwNCiAJCQkJ CSAgIGdldF9yZWxfbmFtZShwYXJ0T2lkKSksDQotCQkJCWVycmhpbnQoIiVzIHJlcXVpcmUgY29t YmluZWQgYm91bmRzIG9mIG5ldyBwYXJ0aXRpb25zIG11c3QgZXhhY3RseSBtYXRjaCB0aGUgYm91 bmQgb2YgdGhlIHNwbGl0IHBhcnRpdGlvbiIsDQorCQkJCWVycmhpbnQoIiVzIHJlcXVpcmVzIGNv bWJpbmVkIGJvdW5kcyBvZiBuZXcgcGFydGl0aW9ucyBtdXN0IGV4YWN0bHkgbWF0Y2ggdGhlIGJv dW5kIG9mIHRoZSBzcGxpdCBwYXJ0aXRpb24iLA0KIAkJCQkJCSJBTFRFUiBUQUJMRSAuLi4gU1BM SVQgUEFSVElUSU9OIikpOw0KIA0KIAkvKg0KQEAgLTU2OTcsNyArNTY5Nyw3IEBAIGNoZWNrX3Bh cmVudF92YWx1ZXNfaW5fbmV3X3BhcnRpdGlvbnMoUmVsYXRpb24gcGFyZW50LA0KIAkJCQllcnJt c2coIm5ldyBwYXJ0aXRpb25zIGNvbWJpbmVkIHBhcnRpdGlvbiBib3VuZHMgZG8gbm90IGNvbnRh aW4gdmFsdWUgKCVzKSBidXQgc3BsaXQgcGFydGl0aW9uIFwiJXNcIiBkb2VzIiwNCiAJCQkJCSAg IGRlcGFyc2VfZXhwcmVzc2lvbigoTm9kZSAqKSBub3RGb3VuZFZhbCwgTklMLCBmYWxzZSwgZmFs c2UpLA0KIAkJCQkJICAgZ2V0X3JlbF9uYW1lKHBhcnRPaWQpKSwNCi0JCQkJZXJyaGludCgiJXMg cmVxdWlyZSBjb21iaW5lZCBib3VuZHMgb2YgbmV3IHBhcnRpdGlvbnMgbXVzdCBleGFjdGx5IG1h dGNoIHRoZSBib3VuZCBvZiB0aGUgc3BsaXQgcGFydGl0aW9uIiwNCisJCQkJZXJyaGludCgiJXMg cmVxdWlyZXMgY29tYmluZWQgYm91bmRzIG9mIG5ldyBwYXJ0aXRpb25zIG11c3QgZXhhY3RseSBt YXRjaCB0aGUgYm91bmQgb2YgdGhlIHNwbGl0IHBhcnRpdGlvbiIsDQogCQkJCQkJIkFMVEVSIFRB QkxFIC4uLiBTUExJVCBQQVJUSVRJT04iKSk7DQogCX0NCiB9DQotLSANCjIuNDcuMw0KDQo= ----Next_Part(Tue_Feb_10_14_37_52_2026_180)-- Content-Type: Text/X-Patch; charset=iso-2022-jp Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0004-Add-omitted-that-for-clarity-in-some-messages.patch"