diff options
Diffstat (limited to 'src/backend/commands/subscriptioncmds.c')
| -rw-r--r-- | src/backend/commands/subscriptioncmds.c | 60 |
1 files changed, 14 insertions, 46 deletions
diff --git a/src/backend/commands/subscriptioncmds.c b/src/backend/commands/subscriptioncmds.c index 02ccc636b80..33575614e72 100644 --- a/src/backend/commands/subscriptioncmds.c +++ b/src/backend/commands/subscriptioncmds.c @@ -440,37 +440,6 @@ parse_subscription_options(ParseState *pstate, List *stmt_options, } /* - * Add publication names from the list to a string. - */ -static void -get_publications_str(List *publications, StringInfo dest, bool quote_literal) -{ - ListCell *lc; - bool first = true; - - Assert(publications != NIL); - - foreach(lc, publications) - { - char *pubname = strVal(lfirst(lc)); - - if (first) - first = false; - else - appendStringInfoString(dest, ", "); - - if (quote_literal) - appendStringInfoString(dest, quote_literal_cstr(pubname)); - else - { - appendStringInfoChar(dest, '"'); - appendStringInfoString(dest, pubname); - appendStringInfoChar(dest, '"'); - } - } -} - -/* * Check that the specified publications are present on the publisher. */ static void @@ -486,7 +455,7 @@ check_publications(WalReceiverConn *wrconn, List *publications) appendStringInfoString(cmd, "SELECT t.pubname FROM\n" " pg_catalog.pg_publication t WHERE\n" " t.pubname IN ("); - get_publications_str(publications, cmd, true); + GetPublicationsStr(publications, cmd, true); appendStringInfoChar(cmd, ')'); res = walrcv_exec(wrconn, cmd->data, 1, tableRow); @@ -523,7 +492,7 @@ check_publications(WalReceiverConn *wrconn, List *publications) /* Prepare the list of non-existent publication(s) for error message. */ StringInfo pubnames = makeStringInfo(); - get_publications_str(publicationsCopy, pubnames, false); + GetPublicationsStr(publicationsCopy, pubnames, false); ereport(WARNING, errcode(ERRCODE_UNDEFINED_OBJECT), errmsg_plural("publication %s does not exist on the publisher", @@ -2151,7 +2120,7 @@ check_publications_origin(WalReceiverConn *wrconn, List *publications, " JOIN pg_subscription_rel PS ON (GPT.relid = PS.srrelid),\n" " pg_class C JOIN pg_namespace N ON (N.oid = C.relnamespace)\n" "WHERE C.oid = GPT.relid AND P.pubname IN ("); - get_publications_str(publications, &cmd, true); + GetPublicationsStr(publications, &cmd, true); appendStringInfoString(&cmd, ")\n"); /* @@ -2208,7 +2177,7 @@ check_publications_origin(WalReceiverConn *wrconn, List *publications, StringInfo pubnames = makeStringInfo(); /* Prepare the list of publication(s) for warning message. */ - get_publications_str(publist, pubnames, false); + GetPublicationsStr(publist, pubnames, false); ereport(WARNING, errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), errmsg("subscription \"%s\" requested copy_data with origin = NONE but might copy data that had a different origin", @@ -2243,17 +2212,17 @@ fetch_table_list(WalReceiverConn *wrconn, List *publications) List *tablelist = NIL; int server_version = walrcv_server_version(wrconn); bool check_columnlist = (server_version >= 150000); + StringInfo pub_names = makeStringInfo(); initStringInfo(&cmd); + /* Build the pub_names comma-separated string. */ + GetPublicationsStr(publications, pub_names, true); + /* Get the list of tables from the publisher. */ if (server_version >= 160000) { - StringInfoData pub_names; - tableRow[2] = INT2VECTOROID; - initStringInfo(&pub_names); - get_publications_str(publications, &pub_names, true); /* * From version 16, we allowed passing multiple publications to the @@ -2275,9 +2244,7 @@ fetch_table_list(WalReceiverConn *wrconn, List *publications) " FROM pg_publication\n" " WHERE pubname IN ( %s )) AS gpt\n" " ON gpt.relid = c.oid\n", - pub_names.data); - - pfree(pub_names.data); + pub_names->data); } else { @@ -2288,12 +2255,13 @@ fetch_table_list(WalReceiverConn *wrconn, List *publications) if (check_columnlist) appendStringInfoString(&cmd, ", t.attnames\n"); - appendStringInfoString(&cmd, "FROM pg_catalog.pg_publication_tables t\n" - " WHERE t.pubname IN ("); - get_publications_str(publications, &cmd, true); - appendStringInfoChar(&cmd, ')'); + appendStringInfo(&cmd, "FROM pg_catalog.pg_publication_tables t\n" + " WHERE t.pubname IN ( %s )", + pub_names->data); } + destroyStringInfo(pub_names); + res = walrcv_exec(wrconn, cmd.data, check_columnlist ? 3 : 2, tableRow); pfree(cmd.data); |