Message wording improvements

diff --git a/doc/src/sgml/logical-replication.sgml b/doc/src/sgml/logical-replication.sgml
index 1ae3287f228e45704bbc1dd88095a8e9c06de38f..48fd8e33dcc939f069be9ea26bdd8cede7781921 100644 (file)
--- a/doc/src/sgml/logical-replication.sgml
+++ b/doc/src/sgml/logical-replication.sgml
@@ -1096,7 +1096,7 @@ test_sub=# SELECT * FROM child ORDER BY a;
    Each publication can optionally specify which columns of each table are
    replicated to subscribers. The table on the subscriber side must have at
    least all the columns that are published. If no column list is specified,
-   then all columns in the publisher are replicated.
+   then all columns on the publisher are replicated.
    See <xref linkend="sql-createpublication"/> for details on the syntax.
   </para>
 

diff --git a/src/backend/commands/subscriptioncmds.c b/src/backend/commands/subscriptioncmds.c
index 27cc5f0e65a3dd6f436ed43003f8ea09508c1732..d042abe341412a3e0c1f530288e47de011f20305 100644 (file)
--- a/src/backend/commands/subscriptioncmds.c
+++ b/src/backend/commands/subscriptioncmds.c
@@ -437,7 +437,7 @@ get_publications_str(List *publications, StringInfo dest, bool quote_literal)
 }
 
 /*
- * Check the specified publication(s) is(are) present in the publisher.
+ * Check that the specified publications are present on the publisher.
  */
 static void
 check_publications(WalReceiverConn *wrconn, List *publications)
@@ -495,8 +495,8 @@ check_publications(WalReceiverConn *wrconn, List *publications)
        get_publications_str(publicationsCopy, pubnames, false);
        ereport(WARNING,
                errcode(ERRCODE_UNDEFINED_OBJECT),
-               errmsg_plural("publication %s does not exist in the publisher",
-                             "publications %s do not exist in the publisher",
+               errmsg_plural("publication %s does not exist on the publisher",
+                             "publications %s do not exist on the publisher",
                              list_length(publicationsCopy),
                              pubnames->data));
    }

diff --git a/src/test/subscription/t/001_rep_changes.pl b/src/test/subscription/t/001_rep_changes.pl
index c5b5be419cc2732ab56d2c5575a9621b565cfb85..6ed9265b2ba6bce853d1b1877133edc8c181e2e9 100644 (file)
--- a/src/test/subscription/t/001_rep_changes.pl
+++ b/src/test/subscription/t/001_rep_changes.pl
@@ -177,7 +177,7 @@ $node_publisher->safe_psql('postgres',
 #
 # When a publisher drops a table from publication, it should also stop sending
 # its changes to subscribers. We look at the subscriber whether it receives
-# the row that is inserted to the table in the publisher after it is dropped
+# the row that is inserted to the table on the publisher after it is dropped
 # from the publication.
 $result = $node_subscriber->safe_psql('postgres',
    "SELECT count(*), min(a), max(a) FROM tab_ins");

diff --git a/src/test/subscription/t/007_ddl.pl b/src/test/subscription/t/007_ddl.pl
index 8882addc18f85e9c85ed1f4e9ce6c65e6dbd3b79..5756f1568dc490aa9acbddbdbbe8aba024a314b5 100644 (file)
--- a/src/test/subscription/t/007_ddl.pl
+++ b/src/test/subscription/t/007_ddl.pl
@@ -46,7 +46,7 @@ my ($ret, $stdout, $stderr) = $node_subscriber->psql('postgres',
    "CREATE SUBSCRIPTION mysub1 CONNECTION '$publisher_connstr' PUBLICATION mypub, non_existent_pub"
 );
 ok( $stderr =~
-     m/WARNING:  publication "non_existent_pub" does not exist in the publisher/,
+     m/WARNING:  publication "non_existent_pub" does not exist on the publisher/,
    "Create subscription throws warning for non-existent publication");
 
 # Wait for initial table sync to finish.
@@ -57,7 +57,7 @@ $node_subscriber->wait_for_subscription_sync($node_publisher, 'mysub1');
    "ALTER SUBSCRIPTION mysub1 ADD PUBLICATION non_existent_pub1, non_existent_pub2"
 );
 ok( $stderr =~
-     m/WARNING:  publications "non_existent_pub1", "non_existent_pub2" do not exist in the publisher/,
+     m/WARNING:  publications "non_existent_pub1", "non_existent_pub2" do not exist on the publisher/,
    "Alter subscription add publication throws warning for non-existent publications"
 );
 
@@ -65,7 +65,7 @@ ok( $stderr =~
 ($ret, $stdout, $stderr) = $node_subscriber->psql('postgres',
    "ALTER SUBSCRIPTION mysub1 SET PUBLICATION non_existent_pub");
 ok( $stderr =~
-     m/WARNING:  publication "non_existent_pub" does not exist in the publisher/,
+     m/WARNING:  publication "non_existent_pub" does not exist on the publisher/,
    "Alter subscription set publication throws warning for non-existent publication"
 );
 

diff --git a/src/test/subscription/t/020_messages.pl b/src/test/subscription/t/020_messages.pl
index d21d929c2d8c86df23aafd6c0d2a559eb6cdeaaf..533419be29d4a8a3193267d36d92988fd474fd6d 100644 (file)
--- a/src/test/subscription/t/020_messages.pl
+++ b/src/test/subscription/t/020_messages.pl
@@ -41,7 +41,7 @@ $node_publisher->wait_for_catchup('tap_sub');
 # Ensure a transactional logical decoding message shows up on the slot
 $node_subscriber->safe_psql('postgres', "ALTER SUBSCRIPTION tap_sub DISABLE");
 
-# wait for the replication slot to become inactive in the publisher
+# wait for the replication slot to become inactive on the publisher
 $node_publisher->poll_query_until(
    'postgres',
    "SELECT COUNT(*) FROM pg_catalog.pg_replication_slots WHERE slot_name = 'tap_sub' AND active='f'",

diff --git a/src/test/subscription/t/030_origin.pl b/src/test/subscription/t/030_origin.pl
index d3b78d4b3e288f72137f1d263bf1a478b69ef441..e0d6f5735ca08866fe2ec5106cfdf660a2685dbe 100644 (file)
--- a/src/test/subscription/t/030_origin.pl
+++ b/src/test/subscription/t/030_origin.pl
@@ -185,7 +185,7 @@ $node_B->safe_psql('postgres',
    "ALTER PUBLICATION tap_pub_B ADD TABLE tab_new");
 
 # Alter subscription ... refresh publication should log a warning when a new
-# table in the publisher is subscribing data from a different publication
+# table on the publisher is subscribing data from a different publication
 ($result, $stdout, $stderr) = $node_A->psql(
    'postgres', "
         ALTER SUBSCRIPTION $subname_AB2 REFRESH PUBLICATION");