diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2017-05-12 08:57:01 -0400 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2017-05-12 08:57:49 -0400 |
| commit | b807f59828fbc02fea612e1cbc0066c6dfa3be9b (patch) | |
| tree | 3dcd63108c0d721a41f61354e1df73e38e2de3fa /src/bin/pg_dump/pg_dump.c | |
| parent | 734cb4c2e7de92972c01b6339a3e15ac4bc605dd (diff) | |
| download | postgresql-b807f59828fbc02fea612e1cbc0066c6dfa3be9b.tar.gz postgresql-b807f59828fbc02fea612e1cbc0066c6dfa3be9b.zip | |
Rework the options syntax for logical replication commands
For CREATE/ALTER PUBLICATION/SUBSCRIPTION, use similar option style as
other statements that use a WITH clause for options.
Author: Petr Jelinek <petr.jelinek@2ndquadrant.com>
Diffstat (limited to 'src/bin/pg_dump/pg_dump.c')
| -rw-r--r-- | src/bin/pg_dump/pg_dump.c | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index d724b119354..05e1d4e9a91 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -3460,6 +3460,7 @@ dumpPublication(Archive *fout, PublicationInfo *pubinfo) PQExpBuffer delq; PQExpBuffer query; PQExpBuffer labelq; + bool first = true; if (!(pubinfo->dobj.dump & DUMP_COMPONENT_DEFINITION)) return; @@ -3479,23 +3480,32 @@ dumpPublication(Archive *fout, PublicationInfo *pubinfo) if (pubinfo->puballtables) appendPQExpBufferStr(query, " FOR ALL TABLES"); - appendPQExpBufferStr(query, " WITH ("); + appendPQExpBufferStr(query, " WITH (publish = '"); if (pubinfo->pubinsert) - appendPQExpBufferStr(query, "PUBLISH INSERT"); - else - appendPQExpBufferStr(query, "NOPUBLISH INSERT"); + { + appendPQExpBufferStr(query, "insert"); + first = false; + } + + if (!first) + appendPQExpBufferStr(query, ", "); if (pubinfo->pubupdate) - appendPQExpBufferStr(query, ", PUBLISH UPDATE"); - else - appendPQExpBufferStr(query, ", NOPUBLISH UPDATE"); + { + appendPQExpBufferStr(query, "update"); + first = false; + } + + if (!first) + appendPQExpBufferStr(query, ", "); if (pubinfo->pubdelete) - appendPQExpBufferStr(query, ", PUBLISH DELETE"); - else - appendPQExpBufferStr(query, ", NOPUBLISH DELETE"); + { + appendPQExpBufferStr(query, "delete"); + first = false; + } - appendPQExpBufferStr(query, ");\n"); + appendPQExpBufferStr(query, "');\n"); ArchiveEntry(fout, pubinfo->dobj.catId, pubinfo->dobj.dumpId, pubinfo->dobj.name, @@ -3817,11 +3827,11 @@ dumpSubscription(Archive *fout, SubscriptionInfo *subinfo) appendPQExpBufferStr(publications, fmtId(pubnames[i])); } - appendPQExpBuffer(query, " PUBLICATION %s WITH (NOCONNECT, SLOT NAME = ", publications->data); + appendPQExpBuffer(query, " PUBLICATION %s WITH (connect = false, slot_name = ", publications->data); appendStringLiteralAH(query, subinfo->subslotname, fout); if (strcmp(subinfo->subsynccommit, "off") != 0) - appendPQExpBuffer(query, ", SYNCHRONOUS_COMMIT = %s", fmtId(subinfo->subsynccommit)); + appendPQExpBuffer(query, ", synchronous_commit = %s", fmtId(subinfo->subsynccommit)); appendPQExpBufferStr(query, ");\n"); |