Skip to content

Commit 025b2f3

Browse files
robertmhaasrobertmhaas
committed
Fix cross-version pg_dump for aggregate combine functions.
Fixes a defect in commit a7de3dc. David Rowley, per report from Jeff Janes, who also checked that the fix works.
1 parent e09507a commit 025b2f3

File tree

1 file changed

+22
-20
lines changed

1 file changed

+22
-20
lines changed

‎src/bin/pg_dump/pg_dump.c

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12454,8 +12454,8 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
1245412454
{
1245512455
appendPQExpBuffer(query, "SELECT aggtransfn, "
1245612456
"aggfinalfn, aggtranstype::pg_catalog.regtype, "
12457-
"aggmtransfn, aggminvtransfn, aggmfinalfn, "
12458-
"aggmtranstype::pg_catalog.regtype, "
12457+
"'-' AS aggcombinefn, aggmtransfn, aggminvtransfn, "
12458+
"aggmfinalfn, aggmtranstype::pg_catalog.regtype, "
1245912459
"aggfinalextra, aggmfinalextra, "
1246012460
"aggsortop::pg_catalog.regoperator, "
1246112461
"(aggkind = 'h') AS hypothetical, "
@@ -12473,9 +12473,10 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
1247312473
{
1247412474
appendPQExpBuffer(query, "SELECT aggtransfn, "
1247512475
"aggfinalfn, aggtranstype::pg_catalog.regtype, "
12476-
"'-' AS aggmtransfn, '-' AS aggminvtransfn, "
12477-
"'-' AS aggmfinalfn, 0 AS aggmtranstype, "
12478-
"false AS aggfinalextra, false AS aggmfinalextra, "
12476+
"'-' AS aggcombinefn, '-' AS aggmtransfn, "
12477+
"'-' AS aggminvtransfn, '-' AS aggmfinalfn, "
12478+
"0 AS aggmtranstype, false AS aggfinalextra, "
12479+
"false AS aggmfinalextra, "
1247912480
"aggsortop::pg_catalog.regoperator, "
1248012481
"false AS hypothetical, "
1248112482
"0 AS aggtransspace, agginitval, "
@@ -12492,9 +12493,10 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
1249212493
{
1249312494
appendPQExpBuffer(query, "SELECT aggtransfn, "
1249412495
"aggfinalfn, aggtranstype::pg_catalog.regtype, "
12495-
"'-' AS aggmtransfn, '-' AS aggminvtransfn, "
12496-
"'-' AS aggmfinalfn, 0 AS aggmtranstype, "
12497-
"false AS aggfinalextra, false AS aggmfinalextra, "
12496+
"'-' AS aggcombinefn, '-' AS aggmtransfn, "
12497+
"'-' AS aggminvtransfn, '-' AS aggmfinalfn, "
12498+
"0 AS aggmtranstype, false AS aggfinalextra, "
12499+
"false AS aggmfinalextra, "
1249812500
"aggsortop::pg_catalog.regoperator, "
1249912501
"false AS hypothetical, "
1250012502
"0 AS aggtransspace, agginitval, "
@@ -12509,10 +12511,10 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
1250912511
{
1251012512
appendPQExpBuffer(query, "SELECT aggtransfn, "
1251112513
"aggfinalfn, aggtranstype::pg_catalog.regtype, "
12512-
"'-' AS aggmtransfn, '-' AS aggminvtransfn, "
12513-
"'-' AS aggmfinalfn, 0 AS aggmtranstype, "
12514-
"false AS aggfinalextra, false AS aggmfinalextra, "
12515-
"0 AS aggsortop, "
12514+
"'-' AS aggcombinefn, '-' AS aggmtransfn, "
12515+
"'-' AS aggminvtransfn, '-' AS aggmfinalfn, "
12516+
"0 AS aggmtranstype, false AS aggfinalextra, "
12517+
"false AS aggmfinalextra, 0 AS aggsortop, "
1251612518
"false AS hypothetical, "
1251712519
"0 AS aggtransspace, agginitval, "
1251812520
"0 AS aggmtransspace, NULL AS aggminitval, "
@@ -12526,10 +12528,10 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
1252612528
{
1252712529
appendPQExpBuffer(query, "SELECT aggtransfn, aggfinalfn, "
1252812530
"format_type(aggtranstype, NULL) AS aggtranstype, "
12529-
"'-' AS aggmtransfn, '-' AS aggminvtransfn, "
12530-
"'-' AS aggmfinalfn, 0 AS aggmtranstype, "
12531-
"false AS aggfinalextra, false AS aggmfinalextra, "
12532-
"0 AS aggsortop, "
12531+
"'-' AS aggcombinefn, '-' AS aggmtransfn, "
12532+
"'-' AS aggminvtransfn, '-' AS aggmfinalfn, "
12533+
"0 AS aggmtranstype, false AS aggfinalextra, "
12534+
"false AS aggmfinalextra, 0 AS aggsortop, "
1253312535
"false AS hypothetical, "
1253412536
"0 AS aggtransspace, agginitval, "
1253512537
"0 AS aggmtransspace, NULL AS aggminitval, "
@@ -12543,10 +12545,10 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
1254312545
appendPQExpBuffer(query, "SELECT aggtransfn1 AS aggtransfn, "
1254412546
"aggfinalfn, "
1254512547
"(SELECT typname FROM pg_type WHERE oid = aggtranstype1) AS aggtranstype, "
12546-
"'-' AS aggmtransfn, '-' AS aggminvtransfn, "
12547-
"'-' AS aggmfinalfn, 0 AS aggmtranstype, "
12548-
"false AS aggfinalextra, false AS aggmfinalextra, "
12549-
"0 AS aggsortop, "
12548+
"'-' AS aggcombinefn, '-' AS aggmtransfn, "
12549+
"'-' AS aggminvtransfn, '-' AS aggmfinalfn, "
12550+
"0 AS aggmtranstype, false AS aggfinalextra, "
12551+
"false AS aggmfinalextra, 0 AS aggsortop, "
1255012552
"false AS hypothetical, "
1255112553
"0 AS aggtransspace, agginitval1 AS agginitval, "
1255212554
"0 AS aggmtransspace, NULL AS aggminitval, "

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy