diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2021-12-16 14:02:28 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2021-12-16 14:02:28 -0500 |
| commit | cf0cab868aa4758b7eec5f9412f2ec74acda7f45 (patch) | |
| tree | 08134fff4f15b4609259765407e391e671bdd1bb /src/bin/psql/common.c | |
| parent | c49d926833fa6a987e3f9a66027f4a01d7a008be (diff) | |
| download | postgresql-cf0cab868aa4758b7eec5f9412f2ec74acda7f45.tar.gz postgresql-cf0cab868aa4758b7eec5f9412f2ec74acda7f45.zip | |
Remove psql support for server versions preceding 9.2.
Per discussion, we'll limit support for old servers to those branches
that can still be built easily on modern platforms, which as of now
is 9.2 and up.
Aside from removing code that is dead per the assumption of
server >= 9.2, I tweaked the startup warning for unsupported versions
to complain about too-old servers as well as too-new ones. The
warning that "Some psql features might not work" applies precisely
to both cases.
Discussion: https://postgr.es/m/2923349.1634942313@sss.pgh.pa.us
Diffstat (limited to 'src/bin/psql/common.c')
| -rw-r--r-- | src/bin/psql/common.c | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c index 1b224bf9e42..ec975c3e2a5 100644 --- a/src/bin/psql/common.c +++ b/src/bin/psql/common.c @@ -1200,7 +1200,6 @@ SendQuery(const char *query) bool OK = false; int i; bool on_error_rollback_savepoint = false; - static bool on_error_rollback_warning = false; if (!pset.db) { @@ -1264,28 +1263,16 @@ SendQuery(const char *query) (pset.cur_cmd_interactive || pset.on_error_rollback == PSQL_ERROR_ROLLBACK_ON)) { - if (on_error_rollback_warning == false && pset.sversion < 80000) - { - char sverbuf[32]; - - pg_log_warning("The server (version %s) does not support savepoints for ON_ERROR_ROLLBACK.", - formatPGVersionNumber(pset.sversion, false, - sverbuf, sizeof(sverbuf))); - on_error_rollback_warning = true; - } - else + results = PQexec(pset.db, "SAVEPOINT pg_psql_temporary_savepoint"); + if (PQresultStatus(results) != PGRES_COMMAND_OK) { - results = PQexec(pset.db, "SAVEPOINT pg_psql_temporary_savepoint"); - if (PQresultStatus(results) != PGRES_COMMAND_OK) - { - pg_log_info("%s", PQerrorMessage(pset.db)); - ClearOrSaveResult(results); - ResetCancelConn(); - goto sendquery_cleanup; - } + pg_log_info("%s", PQerrorMessage(pset.db)); ClearOrSaveResult(results); - on_error_rollback_savepoint = true; + ResetCancelConn(); + goto sendquery_cleanup; } + ClearOrSaveResult(results); + on_error_rollback_savepoint = true; } if (pset.gdesc_flag) |