BBruce Momjian wrote:
> Tom Lane wrote:
> > Bruce Momjian <br...@momjian.us> writes:
> > > The attached patch checks for the proper return from BEGIN/COMMIT, and
> > > properly frees the libpq structures. In testing, this does return 3 as
> > > you expected.
> >
> > Really? It looks to me like you'd get exit(1). Maybe that's the right
> > thing, but MainLoop itself seems to return EXIT_USER not EXIT_FAILURE
> > when it gets an error.
>
> Sorry, you are right. I must have mis-read my tests. Updated patch
> attached.
I thought some more about it and realized I had to check for the
on-error-exit flag too. Updated patch attached.
--
Bruce Momjian <br...@momjian.us> http://momjian.us
EnterpriseDB http://enterprisedb.com
PG East: http://www.enterprisedb.com/community/nav-pg-east-2010.do
Index: src/bin/psql/command.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/psql/command.c,v
retrieving revision 1.216
diff -c -c -r1.216 command.c
*** src/bin/psql/command.c 26 Feb 2010 02:01:17 -0000 1.216
--- src/bin/psql/command.c 8 Mar 2010 00:46:10 -0000
***************
*** 1731,1740 ****
pset.inputfile = filename;
if (single_txn)
! res = PSQLexec("BEGIN", false);
result = MainLoop(fd);
if (single_txn)
! res = PSQLexec("COMMIT", false);
fclose(fd);
pset.inputfile = oldfilename;
--- 1731,1758 ----
pset.inputfile = filename;
if (single_txn)
! {
! if ((res = PSQLexec("BEGIN", false)) == NULL)
! {
! if (pset.on_error_stop)
! return EXIT_USER;
! }
! else
! PQclear(res);
! }
!
result = MainLoop(fd);
+
if (single_txn)
! {
! if ((res = PSQLexec("COMMIT", false)) == NULL)
! {
! if (pset.on_error_stop)
! return EXIT_USER;
! }
! else
! PQclear(res);
! }
fclose(fd);
pset.inputfile = oldfilename;
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
