diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2000-01-12 19:36:36 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2000-01-12 19:36:36 +0000 |
| commit | f6689a328f07fe579d57c1a419fd8b53db7499c7 (patch) | |
| tree | e2e62cf090af25a999091eaea74f4a59db4d1c9b /src/bin/psql/common.c | |
| parent | 267c6c7f060142d9ec2fd39b312e7f7b35cc6f5d (diff) | |
| download | postgresql-f6689a328f07fe579d57c1a419fd8b53db7499c7.tar.gz postgresql-f6689a328f07fe579d57c1a419fd8b53db7499c7.zip | |
Fixed a few "fixes" and bugs. Adjusted messages and options to GNU suggestions.
Diffstat (limited to 'src/bin/psql/common.c')
| -rw-r--r-- | src/bin/psql/common.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c index 6bbf663733c..fd52d4de8b8 100644 --- a/src/bin/psql/common.c +++ b/src/bin/psql/common.c @@ -491,9 +491,6 @@ SendQuery(PsqlSettings *pset, const char *query) break; case PGRES_COPY_OUT: - if (pset->cur_cmd_interactive && !GetVariableBool(pset->vars, "quiet")) - puts("Copy command returns:"); - success = handleCopyOut(pset->db, pset->queryFout); break; @@ -510,7 +507,7 @@ SendQuery(PsqlSettings *pset, const char *query) case PGRES_FATAL_ERROR: case PGRES_BAD_RESPONSE: success = false; - fputs(PQerrorMessage(pset->db), pset->queryFout); + fputs(PQerrorMessage(pset->db), stderr); break; } @@ -518,6 +515,11 @@ SendQuery(PsqlSettings *pset, const char *query) if (PQstatus(pset->db) == CONNECTION_BAD) { + if (!pset->cur_cmd_interactive) + { + fprintf(stderr, "%s: connection to server was lost", pset->progname); + exit(EXIT_BADCONN); + } fputs("The connection to the server was lost. Attempting reset: ", stderr); PQreset(pset->db); if (PQstatus(pset->db) == CONNECTION_BAD) |