Fix portability problem in Catalog.pm.

tglsfdc · tglsfdc · commit 15bb93e28e49 · 2017-03-09T20:45:59.000-05:00
Commit 7666e73 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
diff --git a/src/backend/catalog/Catalog.pm b/src/backend/catalog/Catalog.pm
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,9 @@ sub Catalogs`
`66`	`66`	`redo;`
`67`	`67`	`}`
`68`	`68`
	`69`	`+ # Remember input line number for later.`
	`70`	`+ my $input_line_number = $.;`
	`71`	`+`
`69`	`72`	`# Strip useless whitespace and trailing semicolons.`
`70`	`73`	`chomp;`
`71`	`74`	`s/^\s+//;`
`@@ -80,7 +83,7 @@ sub Catalogs`
`80`	`83`	`elsif (/^DATA\(insert(\s+OID\s+=\s+(\d+))?\s+\(\s(.)\s\)\s\)$/)`
`81`	`84`	`{`
`82`	`85`	`check_natts($filename, $catalog{natts}, $3,`
`83`		`- $input_file, INPUT_FILE->input_line_number);`
	`86`	`+ $input_file, $input_line_number);`
`84`	`87`
`85`	`88`	`push @{ $catalog{data} }, { oid => $2, bki_values => $3 };`
`86`	`89`	`}`
`@@ -242,4 +245,5 @@ sub check_natts`
`242`	`245`	`$file, $line, $natts, scalar @atts`
`243`	`246`	`unless $natts == @atts;`
`244`	`247`	`}`
	`248`	`+`
`245`	`249`	`1;`