0001-Handle-DEFAULT-ACL-case-in-DOTypeNameCompare-functio.patch
application/octet-stream
Filename: 0001-Handle-DEFAULT-ACL-case-in-DOTypeNameCompare-functio.patch
Type: application/octet-stream
Part: 0
Patch
Same data as JSON:
GET /api/v1/attachments/:id/patch
the parsed metadata as JSON — format, series position, per-file stats; never the diff bytes.
API reference →
Format: format-patch
Series: patch 0001
Subject: Handle DEFAULT ACL case in DOTypeNameCompare function
| File | + | − |
|---|---|---|
| src/bin/pg_dump/pg_dump_sort.c | 10 | 0 |
From f271fcb56f32fb6f9ebf96710145305791932061 Mon Sep 17 00:00:00 2001
From: reshke <reshke@double.cloud>
Date: Sun, 10 Aug 2025 11:34:37 +0000
Subject: [PATCH] Handle DEFAULT ACL case in DOTypeNameCompare function
Previously, default acl objects used to be sorted by OID in
pg_dump output. Since 0decd5e this is considered as bad pratice,
so compare them by defaclrole.
---
src/bin/pg_dump/pg_dump_sort.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/src/bin/pg_dump/pg_dump_sort.c b/src/bin/pg_dump/pg_dump_sort.c
index a02da3e9652..08667e95a40 100644
--- a/src/bin/pg_dump/pg_dump_sort.c
+++ b/src/bin/pg_dump/pg_dump_sort.c
@@ -440,6 +440,16 @@ DOTypeNameCompare(const void *p1, const void *p2)
if (cmpval != 0)
return cmpval;
}
+ else if (obj1->objType == DO_DEFAULT_ACL)
+ {
+ DefaultACLInfo *daclobj1 = *(DefaultACLInfo *const *) p1;
+ DefaultACLInfo *daclobj2 = *(DefaultACLInfo *const *) p2;
+
+ /* Sort by defaclrole */
+ cmpval = strcmp(daclobj1->defaclrole, daclobj2->defaclrole);
+ if (cmpval != 0)
+ return cmpval;
+ }
/*
* Shouldn't get here except after catalog corruption, but if we do, sort
--
2.43.0