mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-12-21 08:29:39 +08:00
psql: Improve error display for psql -f -
Running "psql -f -" used to print
psql:<stdin>:1: ERROR: blah
but that got broken between 8.4 and 9.0 (commit
b291c0fba8
), and now it printed
psql:-:1: ERROR: blah
This reverts to the old behavior and cleans up some code that was left
dead or useless by the mentioned commit.
This commit is contained in:
parent
3433c6ba00
commit
89c2f573a3
@ -2062,14 +2062,17 @@ process_file(char *filename, bool single_txn, bool use_relative_path)
|
||||
}
|
||||
|
||||
fd = fopen(filename, PG_BINARY_R);
|
||||
|
||||
if (!fd)
|
||||
{
|
||||
psql_error("%s: %s\n", filename, strerror(errno));
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
}
|
||||
else
|
||||
fd = stdin;
|
||||
|
||||
if (!fd)
|
||||
{
|
||||
psql_error("%s: %s\n", filename, strerror(errno));
|
||||
return EXIT_FAILURE;
|
||||
fd = stdin;
|
||||
filename = "<stdin>"; /* for future error messages */
|
||||
}
|
||||
|
||||
oldfilename = pset.inputfile;
|
||||
|
@ -313,8 +313,6 @@ main(int argc, char *argv[])
|
||||
printf(_("Type \"help\" for help.\n\n"));
|
||||
if (!pset.notty)
|
||||
initializeInput(options.no_readline ? 0 : 1);
|
||||
if (options.action_string) /* -f - was used */
|
||||
pset.inputfile = "<stdin>";
|
||||
|
||||
successResult = MainLoop(stdin);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user