Skip to content

P
Postgres FD Implementation
Commit 025b2f33 authored by Robert Haas's avatar Robert Haas
Browse files
Options

Fix cross-version pg_dump for aggregate combine functions. 

Fixes a defect in commit a7de3dc5.

David Rowley, per report from Jeff Janes, who also checked that the
fix works.
parent e09507a2
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 20 deletions
src/bin/pg_dump/pg_dump.c
View file @ 025b2f33
...@@ -12454,8 +12454,8 @@ dumpAgg(Archive *fout, AggInfo *agginfo) ...@@ -12454,8 +12454,8 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
{ {
appendPQExpBuffer(query, "SELECT aggtransfn, " appendPQExpBuffer(query, "SELECT aggtransfn, "
"aggfinalfn, aggtranstype::pg_catalog.regtype, " "aggfinalfn, aggtranstype::pg_catalog.regtype, "
"aggmtransfn, aggminvtransfn, aggmfinalfn, " "'-' AS aggcombinefn, aggmtransfn, aggminvtransfn, "
"aggmtranstype::pg_catalog.regtype, " "aggmfinalfn, aggmtranstype::pg_catalog.regtype, "
"aggfinalextra, aggmfinalextra, " "aggfinalextra, aggmfinalextra, "
"aggsortop::pg_catalog.regoperator, " "aggsortop::pg_catalog.regoperator, "
"(aggkind = 'h') AS hypothetical, " "(aggkind = 'h') AS hypothetical, "
...@@ -12473,9 +12473,10 @@ dumpAgg(Archive *fout, AggInfo *agginfo) ...@@ -12473,9 +12473,10 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
{ {
appendPQExpBuffer(query, "SELECT aggtransfn, " appendPQExpBuffer(query, "SELECT aggtransfn, "
"aggfinalfn, aggtranstype::pg_catalog.regtype, " "aggfinalfn, aggtranstype::pg_catalog.regtype, "
"'-' AS aggmtransfn, '-' AS aggminvtransfn, " "'-' AS aggcombinefn, '-' AS aggmtransfn, "
"'-' AS aggmfinalfn, 0 AS aggmtranstype, " "'-' AS aggminvtransfn, '-' AS aggmfinalfn, "
"false AS aggfinalextra, false AS aggmfinalextra, " "0 AS aggmtranstype, false AS aggfinalextra, "
"false AS aggmfinalextra, "
"aggsortop::pg_catalog.regoperator, " "aggsortop::pg_catalog.regoperator, "
"false AS hypothetical, " "false AS hypothetical, "
"0 AS aggtransspace, agginitval, " "0 AS aggtransspace, agginitval, "
...@@ -12492,9 +12493,10 @@ dumpAgg(Archive *fout, AggInfo *agginfo) ...@@ -12492,9 +12493,10 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
{ {
appendPQExpBuffer(query, "SELECT aggtransfn, " appendPQExpBuffer(query, "SELECT aggtransfn, "
"aggfinalfn, aggtranstype::pg_catalog.regtype, " "aggfinalfn, aggtranstype::pg_catalog.regtype, "
"'-' AS aggmtransfn, '-' AS aggminvtransfn, " "'-' AS aggcombinefn, '-' AS aggmtransfn, "
"'-' AS aggmfinalfn, 0 AS aggmtranstype, " "'-' AS aggminvtransfn, '-' AS aggmfinalfn, "
"false AS aggfinalextra, false AS aggmfinalextra, " "0 AS aggmtranstype, false AS aggfinalextra, "
"false AS aggmfinalextra, "
"aggsortop::pg_catalog.regoperator, " "aggsortop::pg_catalog.regoperator, "
"false AS hypothetical, " "false AS hypothetical, "
"0 AS aggtransspace, agginitval, " "0 AS aggtransspace, agginitval, "
...@@ -12509,10 +12511,10 @@ dumpAgg(Archive *fout, AggInfo *agginfo) ...@@ -12509,10 +12511,10 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
{ {
appendPQExpBuffer(query, "SELECT aggtransfn, " appendPQExpBuffer(query, "SELECT aggtransfn, "
"aggfinalfn, aggtranstype::pg_catalog.regtype, " "aggfinalfn, aggtranstype::pg_catalog.regtype, "
"'-' AS aggmtransfn, '-' AS aggminvtransfn, " "'-' AS aggcombinefn, '-' AS aggmtransfn, "
"'-' AS aggmfinalfn, 0 AS aggmtranstype, " "'-' AS aggminvtransfn, '-' AS aggmfinalfn, "
"false AS aggfinalextra, false AS aggmfinalextra, " "0 AS aggmtranstype, false AS aggfinalextra, "
"0 AS aggsortop, " "false AS aggmfinalextra, 0 AS aggsortop, "
"false AS hypothetical, " "false AS hypothetical, "
"0 AS aggtransspace, agginitval, " "0 AS aggtransspace, agginitval, "
"0 AS aggmtransspace, NULL AS aggminitval, " "0 AS aggmtransspace, NULL AS aggminitval, "
...@@ -12526,10 +12528,10 @@ dumpAgg(Archive *fout, AggInfo *agginfo) ...@@ -12526,10 +12528,10 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
{ {
appendPQExpBuffer(query, "SELECT aggtransfn, aggfinalfn, " appendPQExpBuffer(query, "SELECT aggtransfn, aggfinalfn, "
"format_type(aggtranstype, NULL) AS aggtranstype, " "format_type(aggtranstype, NULL) AS aggtranstype, "
"'-' AS aggmtransfn, '-' AS aggminvtransfn, " "'-' AS aggcombinefn, '-' AS aggmtransfn, "
"'-' AS aggmfinalfn, 0 AS aggmtranstype, " "'-' AS aggminvtransfn, '-' AS aggmfinalfn, "
"false AS aggfinalextra, false AS aggmfinalextra, " "0 AS aggmtranstype, false AS aggfinalextra, "
"0 AS aggsortop, " "false AS aggmfinalextra, 0 AS aggsortop, "
"false AS hypothetical, " "false AS hypothetical, "
"0 AS aggtransspace, agginitval, " "0 AS aggtransspace, agginitval, "
"0 AS aggmtransspace, NULL AS aggminitval, " "0 AS aggmtransspace, NULL AS aggminitval, "
...@@ -12543,10 +12545,10 @@ dumpAgg(Archive *fout, AggInfo *agginfo) ...@@ -12543,10 +12545,10 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
appendPQExpBuffer(query, "SELECT aggtransfn1 AS aggtransfn, " appendPQExpBuffer(query, "SELECT aggtransfn1 AS aggtransfn, "
"aggfinalfn, " "aggfinalfn, "
"(SELECT typname FROM pg_type WHERE oid = aggtranstype1) AS aggtranstype, " "(SELECT typname FROM pg_type WHERE oid = aggtranstype1) AS aggtranstype, "
"'-' AS aggmtransfn, '-' AS aggminvtransfn, " "'-' AS aggcombinefn, '-' AS aggmtransfn, "
"'-' AS aggmfinalfn, 0 AS aggmtranstype, " "'-' AS aggminvtransfn, '-' AS aggmfinalfn, "
"false AS aggfinalextra, false AS aggmfinalextra, " "0 AS aggmtranstype, false AS aggfinalextra, "
"0 AS aggsortop, " "false AS aggmfinalextra, 0 AS aggsortop, "
"false AS hypothetical, " "false AS hypothetical, "
"0 AS aggtransspace, agginitval1 AS agginitval, " "0 AS aggtransspace, agginitval1 AS agginitval, "
"0 AS aggmtransspace, NULL AS aggminitval, " "0 AS aggmtransspace, NULL AS aggminitval, "
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment