Message wording improvements

petere · petere · commit c946425176f3 · 2022-09-16T16:37:53.000+02:00
diff --git 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
@@ -406,7 +406,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)
@@ -464,8 +464,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
@@ -177,7 +177,7 @@
 #
 # 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
@@ -46,7 +46,7 @@
 	"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,15 +57,15 @@
 	"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"
 );
 
 # Specifying non-existent publication along with set publication.
 ($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
@@ -41,7 +41,7 @@
 # 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'",

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@`
`177`	`177`	`#`
`178`	`178`	`# When a publisher drops a table from publication, it should also stop sending`
`179`	`179`	`# its changes to subscribers. We look at the subscriber whether it receives`
`180`		`-# the row that is inserted to the table in the publisher after it is dropped`
	`180`	`+# the row that is inserted to the table on the publisher after it is dropped`
`181`	`181`	`# from the publication.`
`182`	`182`	`$result = $node_subscriber->safe_psql('postgres',`
`183`	`183`	`"SELECT count(*), min(a), max(a) FROM tab_ins");`