diff options
| author | Michael Paquier <michael@paquier.xyz> | 2021-03-09 19:52:36 +0900 |
|---|---|---|
| committer | Michael Paquier <michael@paquier.xyz> | 2021-03-09 19:52:36 +0900 |
| commit | 096bbf7c934a4288c9e48a6ac8e91d8753ac1ccd (patch) | |
| tree | 2d86b33d88c6af53b051437b666506db8ce41ed8 | |
| parent | ff99918c625a84c91e7391db9032112ec8653623 (diff) | |
| download | postgresql-096bbf7c934a4288c9e48a6ac8e91d8753ac1ccd.tar.gz postgresql-096bbf7c934a4288c9e48a6ac8e91d8753ac1ccd.zip | |
Switch back sslcompression to be a normal input field in libpq
Per buildfarm member crake, any servers including a postgres_fdw server
with this option set would fail to do a pg_upgrade properly as the
option got hidden in f9264d1 by becoming a debug option, making the
restore of the FDW server fail.
This changes back the option in libpq to be visible, but still inactive
to fix this upgrade issue.
Discussion: https://postgr.es/m/YEbq15JKJwIX+S6m@paquier.xyz
| -rw-r--r-- | contrib/postgres_fdw/expected/postgres_fdw.out | 3 | ||||
| -rw-r--r-- | contrib/postgres_fdw/sql/postgres_fdw.sql | 1 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-connect.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/contrib/postgres_fdw/expected/postgres_fdw.out b/contrib/postgres_fdw/expected/postgres_fdw.out index c2565dfc709..f17f3b6c294 100644 --- a/contrib/postgres_fdw/expected/postgres_fdw.out +++ b/contrib/postgres_fdw/expected/postgres_fdw.out @@ -167,6 +167,7 @@ ALTER SERVER testserver1 OPTIONS ( sslcert 'value', sslkey 'value', sslrootcert 'value', + sslcompression 'value', sslcrl 'value', --requirepeer 'value', krbsrvname 'value', @@ -8945,7 +8946,7 @@ DO $d$ END; $d$; ERROR: invalid option "password" -HINT: Valid options in this context are: service, passfile, channel_binding, connect_timeout, dbname, host, hostaddr, port, options, application_name, keepalives, keepalives_idle, keepalives_interval, keepalives_count, tcp_user_timeout, sslmode, sslcert, sslkey, sslrootcert, sslcrl, sslcrldir, requirepeer, ssl_min_protocol_version, ssl_max_protocol_version, gssencmode, krbsrvname, gsslib, target_session_attrs, use_remote_estimate, fdw_startup_cost, fdw_tuple_cost, extensions, updatable, fetch_size, batch_size +HINT: Valid options in this context are: service, passfile, channel_binding, connect_timeout, dbname, host, hostaddr, port, options, application_name, keepalives, keepalives_idle, keepalives_interval, keepalives_count, tcp_user_timeout, sslmode, sslcompression, sslcert, sslkey, sslrootcert, sslcrl, sslcrldir, requirepeer, ssl_min_protocol_version, ssl_max_protocol_version, gssencmode, krbsrvname, gsslib, target_session_attrs, use_remote_estimate, fdw_startup_cost, fdw_tuple_cost, extensions, updatable, fetch_size, batch_size CONTEXT: SQL statement "ALTER SERVER loopback_nopw OPTIONS (ADD password 'dummypw')" PL/pgSQL function inline_code_block line 3 at EXECUTE -- If we add a password for our user mapping instead, we should get a different diff --git a/contrib/postgres_fdw/sql/postgres_fdw.sql b/contrib/postgres_fdw/sql/postgres_fdw.sql index a143a704064..be5618f7592 100644 --- a/contrib/postgres_fdw/sql/postgres_fdw.sql +++ b/contrib/postgres_fdw/sql/postgres_fdw.sql @@ -181,6 +181,7 @@ ALTER SERVER testserver1 OPTIONS ( sslcert 'value', sslkey 'value', sslrootcert 'value', + sslcompression 'value', sslcrl 'value', --requirepeer 'value', krbsrvname 'value', diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index fed06bb038c..a294d293ebe 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -298,7 +298,7 @@ static const internalPQconninfoOption PQconninfoOptions[] = { * compatibility. */ {"sslcompression", NULL, NULL, NULL, - "SSL-Compression", "D", 1, -1}, + "SSL-Compression", "", 1, -1}, {"sslcert", "PGSSLCERT", NULL, NULL, "SSL-Client-Cert", "", 64, |