mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix portability problem in Catalog.pm.

Browse Source 
Commit 7666e73a2 introduced a dependency on filehandles' input_line_number
method, but apparently that's a Perl neologism.  Use $. instead, which
works at least back to Perl 5.10, and hopefully back to 5.8.

Jeff Janes

Discussion: https://postgr.es/m/CAMkU=1wuQW=xVfu-14A4VCvxO0ohkD3m9vk6HOj_dprQoKNAQw@mail.gmail.com
This commit is contained in:
Tom Lane 2017-03-09 20:45:52 -05:00
parent 395bfaae8e
commit 15bb93e28e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/catalog/Catalog.pm
View File

@ -66,6 +66,9 @@ sub Catalogs
redo; redo;
} }
# Remember input line number for later.
my $input_line_number = $.;
# Strip useless whitespace and trailing semicolons. # Strip useless whitespace and trailing semicolons.
chomp; chomp;
s/^\s+//; s/^\s+//;
@ -80,7 +83,7 @@ sub Catalogs
elsif (/^DATA\(insert(\s+OID\s+=\s+(\d+))?\s+\(\s*(.*)\s*\)\s*\)$/) elsif (/^DATA\(insert(\s+OID\s+=\s+(\d+))?\s+\(\s*(.*)\s*\)\s*\)$/)
{ {
check_natts($filename, $catalog{natts}, $3, check_natts($filename, $catalog{natts}, $3,
$input_file, INPUT_FILE->input_line_number); $input_file, $input_line_number);
push @{ $catalog{data} }, { oid => $2, bki_values => $3 }; push @{ $catalog{data} }, { oid => $2, bki_values => $3 };
} }
@ -242,4 +245,5 @@ sub check_natts
$file, $line, $natts, scalar @atts $file, $line, $natts, scalar @atts
unless $natts == @atts; unless $natts == @atts;
} }
1; 1;