MIME-Version: 1.0
References: <E1tlBJt-000LUO-16@gemulon.postgresql.org>
 <003dc9936317ab987faa0242f8e33e1cd2fcaf57.camel@j-davis.com>
 <40c1e76334f2baa747334c8fc513d12b8cb297bf.camel@j-davis.com>
 <3815127.1740189601@sss.pgh.pa.us>
 <5ebc188e731ac2b98d68459ce1a9ef3066981774.camel@j-davis.com>
 <3892121.1740193866@sss.pgh.pa.us>
 <976dcc37-b629-490e-a052-a057477d062f@dunslane.net>
 <301492.1740249291@sss.pgh.pa.us> <684274.1740273302@sss.pgh.pa.us>
 <812817.1740277228@sss.pgh.pa.us>
 <10bd5e38-c8e1-4162-8dd7-ef65e71170b4@dunslane.net>
 <1144186.1740338230@sss.pgh.pa.us>
 <CAA5RZ0u9dV3CdKqkqdusA_RdvBkwWe0c0rxcFWj++VYoutFYSw@mail.gmail.com>
 <2768649.1740765297@sss.pgh.pa.us>
In-Reply-To: <2768649.1740765297@sss.pgh.pa.us>
From: Sami Imseih <samimseih@gmail.com>
Date: Fri, 28 Feb 2025 12:15:52 -0600
Message-ID: 
 <CAA5RZ0udD=7o6pjBSiEEzN60Jd3X1=vrXed+0YivYCVrqvav=Q@mail.gmail.com>
Subject: Re: pgsql: Trial fix for old cross-version upgrades.
To: Tom Lane <tgl@sss.pgh.pa.us>
Cc: Andrew Dunstan <andrew@dunslane.net>, Jeff Davis <pgsql@j-davis.com>,
	Jeff Davis <jdavis@postgresql.org>, pgsql-committers@lists.postgresql.org
Content-Type: text/plain; charset="UTF-8"
Archived-At: 
 <https://www.postgresql.org/message-id/CAA5RZ0udD%3D7o6pjBSiEEzN60Jd3X1%3DvrXed%2B0YivYCVrqvav%3DQ%40mail.gmail.com>
Precedence: bulk

> 5.16 is still supported according to our install instructions,
> so let's see if we can adjust that regex so it works with 5.16.
> The first thing I'd try is
>
> -       $dump =~ s {(^\s+'version',) '\d+'::integer,$}
> +       $dump =~ s {^(\s+'version',) '\d+'::integer,$}
>

With the diff below, I still observed the same issue.

@@ -296,7 +296,7 @@ sub adjust_old_dumpfile

        # Same with version argument to pg_restore_relation_stats() or
        # pg_restore_attribute_stats().
-       $dump =~ s {(^\s+'version',) '\d+'::integer,$}
+       $dump =~ s {^(\s+'version',) '\d+'::integer,$}
                {$1 '000000'::integer,}mg;

        if ($old_version < 16)
@@ -645,7 +645,7 @@ sub adjust_new_dumpfile

        # Same with version argument to pg_restore_relation_stats() or
        # pg_restore_attribute_stats().
-       $dump =~ s {(^\s+'version',) '\d+'::integer,$}
+       $dump =~ s {^(\s+'version',) '\d+'::integer,$}
                {$1 '000000'::integer,}mg;


I also tested the same regexp expression in isolation
and I could not repro the issue. Will try a real dumpfile next.

/tmp/test.pl
"""
use strict;

my $dump = " 'version', '180000'::integer,";
print "$dump\n";

$dump =~ s [(^\s+'version',) '\d+'::integer,$] [$1 '000000'::integer,]mg;

print "$dump\n";

"""

simseih %  /usr/bin/perl -v | grep "This is perl"
This is perl 5, version 16, subversion 3 (v5.16.3) built for
x86_64-linux-thread-multi

simseih % /usr/bin/perl /tmp/test.pl
 'version', '180000'::integer,
 'version', '000000'::integer,

--

Sami