Skip to content

Commit 660ee7b

Browse files
peterepetere
committed
Message and documentation refinements
1 parent 9cd43f6 commit 660ee7b

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

‎doc/src/sgml/protocol.sgml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1980,7 +1980,7 @@ psql "dbname=postgres replication=database" -c "IDENTIFY_SYSTEM;"
19801980
<listitem>
19811981
<para>
19821982
If true, this logical replication slot supports decoding of two-phase
1983-
transactions. With this option, two-phase commands like
1983+
commit. With this option, commands related to two-phase commit such as
19841984
<literal>PREPARE TRANSACTION</literal>, <literal>COMMIT PREPARED</literal>
19851985
and <literal>ROLLBACK PREPARED</literal> are decoded and transmitted.
19861986
The transaction will be decoded and transmitted at
@@ -3046,7 +3046,7 @@ psql "dbname=postgres replication=database" -c "IDENTIFY_SYSTEM;"
30463046
</para>
30473047
<para>
30483048
Version <literal>3</literal> is supported only for server version 15
3049-
and above, and it allows streaming of two-phase transactions.
3049+
and above, and it allows streaming of two-phase commits.
30503050
</para>
30513051
</listitem>
30523052
</varlistentry>

‎src/bin/psql/describe.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -6393,7 +6393,7 @@ describeSubscriptions(const char *pattern, bool verbose)
63936393
appendPQExpBuffer(&buf,
63946394
", subtwophasestate AS \"%s\"\n"
63956395
", subdisableonerr AS \"%s\"\n",
6396-
gettext_noop("Two phase commit"),
6396+
gettext_noop("Two-phase commit"),
63976397
gettext_noop("Disable on error"));
63986398

63996399
appendPQExpBuffer(&buf,

‎src/test/regress/expected/subscription.out

+15-15
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ ERROR: invalid connection string syntax: missing "=" after "foobar" in connecti
7777

7878
\dRs+
7979
List of subscriptions
80-
Name | Owner | Enabled | Publication | Binary | Streaming | Two phase commit | Disable on error | Synchronous commit | Conninfo | Skip LSN
80+
Name | Owner | Enabled | Publication | Binary | Streaming | Two-phase commit | Disable on error | Synchronous commit | Conninfo | Skip LSN
8181
-----------------+---------------------------+---------+-------------+--------+-----------+------------------+------------------+--------------------+-----------------------------+----------
8282
regress_testsub | regress_subscription_user | f | {testpub} | f | f | d | f | off | dbname=regress_doesnotexist | 0/0
8383
(1 row)
@@ -97,7 +97,7 @@ ERROR: unrecognized subscription parameter: "create_slot"
9797
ALTER SUBSCRIPTION regress_testsub SKIP (lsn = '0/12345');
9898
\dRs+
9999
List of subscriptions
100-
Name | Owner | Enabled | Publication | Binary | Streaming | Two phase commit | Disable on error | Synchronous commit | Conninfo | Skip LSN
100+
Name | Owner | Enabled | Publication | Binary | Streaming | Two-phase commit | Disable on error | Synchronous commit | Conninfo | Skip LSN
101101
-----------------+---------------------------+---------+---------------------+--------+-----------+------------------+------------------+--------------------+------------------------------+----------
102102
regress_testsub | regress_subscription_user | f | {testpub2,testpub3} | f | f | d | f | off | dbname=regress_doesnotexist2 | 0/12345
103103
(1 row)
@@ -109,7 +109,7 @@ ALTER SUBSCRIPTION regress_testsub SKIP (lsn = '0/0');
109109
ERROR: invalid WAL location (LSN): 0/0
110110
\dRs+
111111
List of subscriptions
112-
Name | Owner | Enabled | Publication | Binary | Streaming | Two phase commit | Disable on error | Synchronous commit | Conninfo | Skip LSN
112+
Name | Owner | Enabled | Publication | Binary | Streaming | Two-phase commit | Disable on error | Synchronous commit | Conninfo | Skip LSN
113113
-----------------+---------------------------+---------+---------------------+--------+-----------+------------------+------------------+--------------------+------------------------------+----------
114114
regress_testsub | regress_subscription_user | f | {testpub2,testpub3} | f | f | d | f | off | dbname=regress_doesnotexist2 | 0/0
115115
(1 row)
@@ -144,7 +144,7 @@ ERROR: invalid value for parameter "synchronous_commit": "foobar"
144144
HINT: Available values: local, remote_write, remote_apply, on, off.
145145
\dRs+
146146
List of subscriptions
147-
Name | Owner | Enabled | Publication | Binary | Streaming | Two phase commit | Disable on error | Synchronous commit | Conninfo | Skip LSN
147+
Name | Owner | Enabled | Publication | Binary | Streaming | Two-phase commit | Disable on error | Synchronous commit | Conninfo | Skip LSN
148148
---------------------+---------------------------+---------+---------------------+--------+-----------+------------------+------------------+--------------------+------------------------------+----------
149149
regress_testsub_foo | regress_subscription_user | f | {testpub2,testpub3} | f | f | d | f | local | dbname=regress_doesnotexist2 | 0/0
150150
(1 row)
@@ -180,7 +180,7 @@ CREATE SUBSCRIPTION regress_testsub CONNECTION 'dbname=regress_doesnotexist' PUB
180180
WARNING: tables were not subscribed, you will have to run ALTER SUBSCRIPTION ... REFRESH PUBLICATION to subscribe the tables
181181
\dRs+
182182
List of subscriptions
183-
Name | Owner | Enabled | Publication | Binary | Streaming | Two phase commit | Disable on error | Synchronous commit | Conninfo | Skip LSN
183+
Name | Owner | Enabled | Publication | Binary | Streaming | Two-phase commit | Disable on error | Synchronous commit | Conninfo | Skip LSN
184184
-----------------+---------------------------+---------+-------------+--------+-----------+------------------+------------------+--------------------+-----------------------------+----------
185185
regress_testsub | regress_subscription_user | f | {testpub} | t | f | d | f | off | dbname=regress_doesnotexist | 0/0
186186
(1 row)
@@ -189,7 +189,7 @@ ALTER SUBSCRIPTION regress_testsub SET (binary = false);
189189
ALTER SUBSCRIPTION regress_testsub SET (slot_name = NONE);
190190
\dRs+
191191
List of subscriptions
192-
Name | Owner | Enabled | Publication | Binary | Streaming | Two phase commit | Disable on error | Synchronous commit | Conninfo | Skip LSN
192+
Name | Owner | Enabled | Publication | Binary | Streaming | Two-phase commit | Disable on error | Synchronous commit | Conninfo | Skip LSN
193193
-----------------+---------------------------+---------+-------------+--------+-----------+------------------+------------------+--------------------+-----------------------------+----------
194194
regress_testsub | regress_subscription_user | f | {testpub} | f | f | d | f | off | dbname=regress_doesnotexist | 0/0
195195
(1 row)
@@ -203,7 +203,7 @@ CREATE SUBSCRIPTION regress_testsub CONNECTION 'dbname=regress_doesnotexist' PUB
203203
WARNING: tables were not subscribed, you will have to run ALTER SUBSCRIPTION ... REFRESH PUBLICATION to subscribe the tables
204204
\dRs+
205205
List of subscriptions
206-
Name | Owner | Enabled | Publication | Binary | Streaming | Two phase commit | Disable on error | Synchronous commit | Conninfo | Skip LSN
206+
Name | Owner | Enabled | Publication | Binary | Streaming | Two-phase commit | Disable on error | Synchronous commit | Conninfo | Skip LSN
207207
-----------------+---------------------------+---------+-------------+--------+-----------+------------------+------------------+--------------------+-----------------------------+----------
208208
regress_testsub | regress_subscription_user | f | {testpub} | f | t | d | f | off | dbname=regress_doesnotexist | 0/0
209209
(1 row)
@@ -212,7 +212,7 @@ ALTER SUBSCRIPTION regress_testsub SET (streaming = false);
212212
ALTER SUBSCRIPTION regress_testsub SET (slot_name = NONE);
213213
\dRs+
214214
List of subscriptions
215-
Name | Owner | Enabled | Publication | Binary | Streaming | Two phase commit | Disable on error | Synchronous commit | Conninfo | Skip LSN
215+
Name | Owner | Enabled | Publication | Binary | Streaming | Two-phase commit | Disable on error | Synchronous commit | Conninfo | Skip LSN
216216
-----------------+---------------------------+---------+-------------+--------+-----------+------------------+------------------+--------------------+-----------------------------+----------
217217
regress_testsub | regress_subscription_user | f | {testpub} | f | f | d | f | off | dbname=regress_doesnotexist | 0/0
218218
(1 row)
@@ -230,7 +230,7 @@ ALTER SUBSCRIPTION regress_testsub ADD PUBLICATION testpub1, testpub2 WITH (refr
230230
ERROR: publication "testpub1" is already in subscription "regress_testsub"
231231
\dRs+
232232
List of subscriptions
233-
Name | Owner | Enabled | Publication | Binary | Streaming | Two phase commit | Disable on error | Synchronous commit | Conninfo | Skip LSN
233+
Name | Owner | Enabled | Publication | Binary | Streaming | Two-phase commit | Disable on error | Synchronous commit | Conninfo | Skip LSN
234234
-----------------+---------------------------+---------+-----------------------------+--------+-----------+------------------+------------------+--------------------+-----------------------------+----------
235235
regress_testsub | regress_subscription_user | f | {testpub,testpub1,testpub2} | f | f | d | f | off | dbname=regress_doesnotexist | 0/0
236236
(1 row)
@@ -248,7 +248,7 @@ ERROR: publication "testpub3" is not in subscription "regress_testsub"
248248
ALTER SUBSCRIPTION regress_testsub DROP PUBLICATION testpub1, testpub2 WITH (refresh = false);
249249
\dRs+
250250
List of subscriptions
251-
Name | Owner | Enabled | Publication | Binary | Streaming | Two phase commit | Disable on error | Synchronous commit | Conninfo | Skip LSN
251+
Name | Owner | Enabled | Publication | Binary | Streaming | Two-phase commit | Disable on error | Synchronous commit | Conninfo | Skip LSN
252252
-----------------+---------------------------+---------+-------------+--------+-----------+------------------+------------------+--------------------+-----------------------------+----------
253253
regress_testsub | regress_subscription_user | f | {testpub} | f | f | d | f | off | dbname=regress_doesnotexist | 0/0
254254
(1 row)
@@ -285,7 +285,7 @@ CREATE SUBSCRIPTION regress_testsub CONNECTION 'dbname=regress_doesnotexist' PUB
285285
WARNING: tables were not subscribed, you will have to run ALTER SUBSCRIPTION ... REFRESH PUBLICATION to subscribe the tables
286286
\dRs+
287287
List of subscriptions
288-
Name | Owner | Enabled | Publication | Binary | Streaming | Two phase commit | Disable on error | Synchronous commit | Conninfo | Skip LSN
288+
Name | Owner | Enabled | Publication | Binary | Streaming | Two-phase commit | Disable on error | Synchronous commit | Conninfo | Skip LSN
289289
-----------------+---------------------------+---------+-------------+--------+-----------+------------------+------------------+--------------------+-----------------------------+----------
290290
regress_testsub | regress_subscription_user | f | {testpub} | f | f | p | f | off | dbname=regress_doesnotexist | 0/0
291291
(1 row)
@@ -297,7 +297,7 @@ ERROR: unrecognized subscription parameter: "two_phase"
297297
ALTER SUBSCRIPTION regress_testsub SET (streaming = true);
298298
\dRs+
299299
List of subscriptions
300-
Name | Owner | Enabled | Publication | Binary | Streaming | Two phase commit | Disable on error | Synchronous commit | Conninfo | Skip LSN
300+
Name | Owner | Enabled | Publication | Binary | Streaming | Two-phase commit | Disable on error | Synchronous commit | Conninfo | Skip LSN
301301
-----------------+---------------------------+---------+-------------+--------+-----------+------------------+------------------+--------------------+-----------------------------+----------
302302
regress_testsub | regress_subscription_user | f | {testpub} | f | t | p | f | off | dbname=regress_doesnotexist | 0/0
303303
(1 row)
@@ -309,7 +309,7 @@ CREATE SUBSCRIPTION regress_testsub CONNECTION 'dbname=regress_doesnotexist' PUB
309309
WARNING: tables were not subscribed, you will have to run ALTER SUBSCRIPTION ... REFRESH PUBLICATION to subscribe the tables
310310
\dRs+
311311
List of subscriptions
312-
Name | Owner | Enabled | Publication | Binary | Streaming | Two phase commit | Disable on error | Synchronous commit | Conninfo | Skip LSN
312+
Name | Owner | Enabled | Publication | Binary | Streaming | Two-phase commit | Disable on error | Synchronous commit | Conninfo | Skip LSN
313313
-----------------+---------------------------+---------+-------------+--------+-----------+------------------+------------------+--------------------+-----------------------------+----------
314314
regress_testsub | regress_subscription_user | f | {testpub} | f | t | p | f | off | dbname=regress_doesnotexist | 0/0
315315
(1 row)
@@ -324,15 +324,15 @@ CREATE SUBSCRIPTION regress_testsub CONNECTION 'dbname=regress_doesnotexist' PUB
324324
WARNING: tables were not subscribed, you will have to run ALTER SUBSCRIPTION ... REFRESH PUBLICATION to subscribe the tables
325325
\dRs+
326326
List of subscriptions
327-
Name | Owner | Enabled | Publication | Binary | Streaming | Two phase commit | Disable on error | Synchronous commit | Conninfo | Skip LSN
327+
Name | Owner | Enabled | Publication | Binary | Streaming | Two-phase commit | Disable on error | Synchronous commit | Conninfo | Skip LSN
328328
-----------------+---------------------------+---------+-------------+--------+-----------+------------------+------------------+--------------------+-----------------------------+----------
329329
regress_testsub | regress_subscription_user | f | {testpub} | f | f | d | f | off | dbname=regress_doesnotexist | 0/0
330330
(1 row)
331331

332332
ALTER SUBSCRIPTION regress_testsub SET (disable_on_error = true);
333333
\dRs+
334334
List of subscriptions
335-
Name | Owner | Enabled | Publication | Binary | Streaming | Two phase commit | Disable on error | Synchronous commit | Conninfo | Skip LSN
335+
Name | Owner | Enabled | Publication | Binary | Streaming | Two-phase commit | Disable on error | Synchronous commit | Conninfo | Skip LSN
336336
-----------------+---------------------------+---------+-------------+--------+-----------+------------------+------------------+--------------------+-----------------------------+----------
337337
regress_testsub | regress_subscription_user | f | {testpub} | f | f | d | t | off | dbname=regress_doesnotexist | 0/0
338338
(1 row)

0 commit comments

Comments
 (0)