rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Capitalize SHOW when testing whether target_session_attrs=read-write. 

This makes it also work for replication connections.

Report and patch by Daisuke Higuchi.

Discussion: http://postgr.es/m/1803D792815FC24D871C00D17AE95905B1A34A@g01jpexmbkw24
This commit is contained in:
Robert Haas 2017-05-19 15:48:10 -04:00
parent b522759508
commit aa41bc794c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/src/sgml/libpq.sgml
View File

@ -1425,7 +1425,7 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
If this parameter is set to <literal>read-write</literal>, only a
connection in which read-write transactions are accepted by default
is considered acceptable. The query
<literal>show transaction_read_only</literal> will be sent upon any
<literal>SHOW transaction_read_only</literal> will be sent upon any
successful connection; if it returns <literal>on</>, the connection
will be closed. If multiple hosts were specified in the connection
string, any remaining servers will be tried just as if the connection

8
src/interfaces/libpq/fe-connect.c
View File

@ -2845,7 +2845,7 @@ keep_going: /* We will come back to here until there is
conn->status = CONNECTION_OK;
if (!PQsendQuery(conn,
"show transaction_read_only"))
"SHOW transaction_read_only"))
{
restoreErrorMessage(conn, &savedMessage);
goto error_return;
@ -2901,7 +2901,7 @@ keep_going: /* We will come back to here until there is
conn->status = CONNECTION_OK;
if (!PQsendQuery(conn,
"show transaction_read_only"))
"SHOW transaction_read_only"))
{
restoreErrorMessage(conn, &savedMessage);
goto error_return;
@ -3014,14 +3014,14 @@ keep_going: /* We will come back to here until there is
}
/*
* Something went wrong with "show transaction_read_only". We
* Something went wrong with "SHOW transaction_read_only". We
* should try next addresses.
*/
if (res)
PQclear(res);
restoreErrorMessage(conn, &savedMessage);
appendPQExpBuffer(&conn->errorMessage,
libpq_gettext("test \"show transaction_read_only\" failed "
libpq_gettext("test \"SHOW transaction_read_only\" failed "
" on \"%s:%s\"\n"),
conn->connhost[conn->whichhost].host,
conn->connhost[conn->whichhost].port);