Commitaa41bc7

committed

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

1 parentb522759 commitaa41bc7Copy full SHA for aa41bc7

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 1 deletion

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

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -2845,7 +2845,7 @@ PQconnectPoll(PGconn *conn)`
`2845`	`2845`
`2846`	`2846`	`conn->status=CONNECTION_OK;`
`2847`	`2847`	`if (!PQsendQuery(conn,`
`2848`		`-"show transaction_read_only"))`
	`2848`	`+"SHOW transaction_read_only"))`
`2849`	`2849`	`{`
`2850`	`2850`	`restoreErrorMessage(conn,&savedMessage);`
`2851`	`2851`	`gotoerror_return;`
`@@ -2901,7 +2901,7 @@ PQconnectPoll(PGconn *conn)`
`2901`	`2901`
`2902`	`2902`	`conn->status=CONNECTION_OK;`
`2903`	`2903`	`if (!PQsendQuery(conn,`
`2904`		`-"show transaction_read_only"))`
	`2904`	`+"SHOW transaction_read_only"))`
`2905`	`2905`	`{`
`2906`	`2906`	`restoreErrorMessage(conn,&savedMessage);`
`2907`	`2907`	`gotoerror_return;`
`@@ -3014,14 +3014,14 @@ PQconnectPoll(PGconn *conn)`
`3014`	`3014`	`}`
`3015`	`3015`
`3016`	`3016`	`/*`
`3017`		`- * Something went wrong with "show transaction_read_only". We`
	`3017`	`+ * Something went wrong with "SHOW transaction_read_only". We`
`3018`	`3018`	`* should try next addresses.`
`3019`	`3019`	`*/`
`3020`	`3020`	`if (res)`
`3021`	`3021`	`PQclear(res);`
`3022`	`3022`	`restoreErrorMessage(conn,&savedMessage);`
`3023`	`3023`	`appendPQExpBuffer(&conn->errorMessage,`
`3024`		`-libpq_gettext("test \"show transaction_read_only\" failed "`
	`3024`	`+libpq_gettext("test \"SHOW transaction_read_only\" failed "`
`3025`	`3025`	`" on \"%s:%s\"\n"),`
`3026`	`3026`	`conn->connhost[conn->whichhost].host,`
`3027`	`3027`	`conn->connhost[conn->whichhost].port);`

Comments

(0)