postgres.git / summary / log / commit / refs

commit    302cbc5fa6f5927a36bf22b5cfb356c1fe4284a6
Author:   Kevin Grittner <kgrittn@postgresql.org>
Date:     Sun Dec 29 21:19:46 2013 +0000
First released in: 9.4.0, 8.4.20, 9.0.16, 9.1.12, 9.2.7, 9.3.3

    Don't attempt to limit target database for pg_restore.
    
    There was an apparent attempt to limit the target database for
    pg_restore to version 7.1.0 or later.  Due to a leading zero this
    was interpreted as an octal number, which allowed targets with
    version numbers down to 2.87.36.  The lowest actual release above
    that was 6.0.0, so that was effectively the limit.
    
    Since the success of the restore attempt will depend primarily on
    on what statements were generated by the dump run, we don't want
    pg_restore trying to guess whether a given target should be allowed
    based on version number.  Allow a connection to any version.  Since
    it is very unlikely that anyone would be using a recent version of
    pg_restore to restore to a pre-6.0 database, this has little to no
    practical impact, but it makes the code less confusing to read.
    
    Issue reported and initial patch suggestion from Joel Jacobson
    based on an article by Andrey Karpov reporting on issues found by
    PVS-Studio static code analyzer.  Final patch based on analysis by
    Tom Lane.  Back-patch to all supported branches.


src/bin/pg_dump/pg_backup_archiver.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c index 742177b46d1..4914e2e9cfc 100644 --- a/src/bin/pg_dump/pg_backup_archiver.c +++ b/src/bin/pg_dump/pg_backup_archiver.c @@ -266,8 +266,12 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt) if (AH->version < K_VERS_1_3) die_horribly(AH, modulename, "direct database connections are not supported in pre-1.3 archives\n"); - /* XXX Should get this from the archive */ - AHX->minRemoteVersion = 070100; + /* + * We don't want to guess at whether the dump will successfully + * restore; allow the attempt regardless of the version of the restore + * target. + */ + AHX->minRemoteVersion = 0; AHX->maxRemoteVersion = 999999; ConnectDatabase(AHX, ropt->dbname, [parent: b2d80147d5a3]