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

Return proper exit code (3) from psql when ON_ERROR_STOP=on and

Browse Source 
--single-transaction are both used and the failure happens in commit,
e.g. failed deferred trigger.  Also properly free BEGIN/COMMIT result
structures from --single-transaction.

Per report from Dominic Bevacqua
This commit is contained in:
Bruce Momjian 2010-03-08 23:03:00 +00:00
parent aa8eed3172
commit b989662bf1
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/bin/psql/command.c
View File

@ -3,7 +3,7 @@
* *
* Copyright (c) 2000-2010, PostgreSQL Global Development Group * Copyright (c) 2000-2010, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.216 2010/02/26 02:01:17 momjian Exp $ * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.217 2010/03/08 23:03:00 momjian Exp $
*/ */
#include "postgres_fe.h" #include "postgres_fe.h"
#include "command.h" #include "command.h"
@ -1731,10 +1731,28 @@ process_file(char *filename, bool single_txn)
pset.inputfile = filename; pset.inputfile = filename;
if (single_txn) if (single_txn)
res = PSQLexec("BEGIN", false); {
if ((res = PSQLexec("BEGIN", false)) == NULL)
{
if (pset.on_error_stop)
return EXIT_USER;
}
else
PQclear(res);
}
result = MainLoop(fd); result = MainLoop(fd);
if (single_txn) if (single_txn)
res = PSQLexec("COMMIT", false); {
if ((res = PSQLexec("COMMIT", false)) == NULL)
{
if (pset.on_error_stop)
return EXIT_USER;
}
else
PQclear(res);
}
fclose(fd); fclose(fd);
pset.inputfile = oldfilename; pset.inputfile = oldfilename;