pg_dump-operator-sort.patch
text/x-patch
Filename: pg_dump-operator-sort.patch
Type: text/x-patch
Part: 0
Message:
sorting operators in pg_dump
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: unified
| File | + | − |
|---|---|---|
| src/bin/pg_dump/pg_dump.c | 6 | 0 |
| src/bin/pg_dump/pg_dump.h | 1 | 0 |
| src/bin/pg_dump/pg_dump_sort.c | 10 | 0 |
diff --git i/src/bin/pg_dump/pg_dump.c w/src/bin/pg_dump/pg_dump.c
index 89a8a23..486cf64 100644
--- i/src/bin/pg_dump/pg_dump.c
+++ w/src/bin/pg_dump/pg_dump.c
@@ -3137,6 +3137,7 @@ getOperators(int *numOprs)
int i_oprname;
int i_oprnamespace;
int i_rolname;
+ int i_oprkind;
int i_oprcode;
/*
@@ -3152,6 +3153,7 @@ getOperators(int *numOprs)
appendPQExpBuffer(query, "SELECT tableoid, oid, oprname, "
"oprnamespace, "
"(%s oprowner) AS rolname, "
+ "oprkind, "
"oprcode::oid AS oprcode "
"FROM pg_operator",
username_subquery);
@@ -3161,6 +3163,7 @@ getOperators(int *numOprs)
appendPQExpBuffer(query, "SELECT tableoid, oid, oprname, "
"0::oid AS oprnamespace, "
"(%s oprowner) AS rolname, "
+ "oprkind, "
"oprcode::oid AS oprcode "
"FROM pg_operator",
username_subquery);
@@ -3172,6 +3175,7 @@ getOperators(int *numOprs)
"oid, oprname, "
"0::oid AS oprnamespace, "
"(%s oprowner) AS rolname, "
+ "oprkind, "
"oprcode::oid AS oprcode "
"FROM pg_operator",
username_subquery);
@@ -3190,6 +3194,7 @@ getOperators(int *numOprs)
i_oprname = PQfnumber(res, "oprname");
i_oprnamespace = PQfnumber(res, "oprnamespace");
i_rolname = PQfnumber(res, "rolname");
+ i_oprkind = PQfnumber(res, "oprkind");
i_oprcode = PQfnumber(res, "oprcode");
for (i = 0; i < ntups; i++)
@@ -3202,6 +3207,7 @@ getOperators(int *numOprs)
oprinfo[i].dobj.namespace = findNamespace(atooid(PQgetvalue(res, i, i_oprnamespace)),
oprinfo[i].dobj.catId.oid);
oprinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
+ oprinfo[i].oprkind = (PQgetvalue(res, i, i_oprkind))[0];
oprinfo[i].oprcode = atooid(PQgetvalue(res, i, i_oprcode));
/* Decide whether we want to dump it */
diff --git i/src/bin/pg_dump/pg_dump.h w/src/bin/pg_dump/pg_dump.h
index 3bfeb31..1c6dd26 100644
--- i/src/bin/pg_dump/pg_dump.h
+++ w/src/bin/pg_dump/pg_dump.h
@@ -204,6 +204,7 @@ typedef struct _oprInfo
{
DumpableObject dobj;
char *rolname;
+ char oprkind;
Oid oprcode;
} OprInfo;
diff --git i/src/bin/pg_dump/pg_dump_sort.c w/src/bin/pg_dump/pg_dump_sort.c
index 368208d..64f38ff 100644
--- i/src/bin/pg_dump/pg_dump_sort.c
+++ w/src/bin/pg_dump/pg_dump_sort.c
@@ -178,6 +178,16 @@ DOTypeNameCompare(const void *p1, const void *p2)
if (cmpval != 0)
return cmpval;
}
+ else if (obj1->objType == DO_OPERATOR)
+ {
+ OprInfo *oobj1 = *(OprInfo * const *) p1;
+ OprInfo *oobj2 = *(OprInfo * const *) p2;
+
+ /* oprkind is 'l', 'r', or 'b'; this sorts prefix, postfix, infix */
+ cmpval = (oobj2->oprkind - oobj1->oprkind);
+ if (cmpval != 0)
+ return cmpval;
+ }
/* Usually shouldn't get here, but if we do, sort by OID */
return oidcmp(obj1->catId.oid, obj2->catId.oid);