database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Message wording improvements

Browse Source
This commit is contained in:
Peter Eisentraut
2022-09-16 16:37:53 +02:00
parent 8135d0bd45
commit c946425176
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/commands/subscriptioncmds.c
View File

@ -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));
}

2
src/test/subscription/t/001_rep_changes.pl
View File

@ -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");

6
src/test/subscription/t/007_ddl.pl
View File

@ -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"
);

2
src/test/subscription/t/020_messages.pl
View File

@ -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'",