Fix portability problem in Catalog.pm.
authorTom Lane <tgl@sss.pgh.pa.us>
Fri, 10 Mar 2017 01:45:52 +0000 (20:45 -0500)
committerTom Lane <tgl@sss.pgh.pa.us>
Fri, 10 Mar 2017 01:45:59 +0000 (20:45 -0500)
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

src/backend/catalog/Catalog.pm

index 767a2ecc00a91b742d870bff38124dbcaf66598e..bccbc5118db154f1e3e8c0f020e5d2100c488d95 100644 (file)
@@ -66,6 +66,9 @@ sub Catalogs
                                redo;
                        }
 
+                       # Remember input line number for later.
+                       my $input_line_number = $.;
+
                        # Strip useless whitespace and trailing semicolons.
                        chomp;
                        s/^\s+//;
@@ -80,7 +83,7 @@ sub Catalogs
                        elsif (/^DATA\(insert(\s+OID\s+=\s+(\d+))?\s+\(\s*(.*)\s*\)\s*\)$/)
                        {
                                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 };
                        }
@@ -242,4 +245,5 @@ sub check_natts
                $file, $line, $natts, scalar @atts
          unless $natts == @atts;
 }
+
 1;