diff options
| author | Bruce Momjian <bruce@momjian.us> | 1999-11-13 19:16:47 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1999-11-13 19:16:47 +0000 |
| commit | e61e4d460c4073688bf64140b6a59a05ac0857f0 (patch) | |
| tree | f1d36f29081d9edf4961f657e902c0e4083ed2ab | |
| parent | db12a63ef10f615462cef7fd9f704153fcf10550 (diff) | |
| download | postgresql-e61e4d460c4073688bf64140b6a59a05ac0857f0.tar.gz | |
Fix for psql control-d and .psqlrc that I broke. Fix for \dT with
descriptions enabled.
| -rw-r--r-- | src/bin/psql/describe.c | 2 | ||||
| -rw-r--r-- | src/bin/psql/mainloop.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c index 5e40779cd1..6af2b06a8b 100644 --- a/src/bin/psql/describe.c +++ b/src/bin/psql/describe.c @@ -158,7 +158,7 @@ describeTypes(const char *name, PsqlSettings *pset) descbuf[0] = '\0'; strcat(descbuf, "SELECT typname AS \"Type\""); if (GetVariableBool(pset->vars, "description")) - strcat(descbuf, ", obj_description(p.oid) as \"Description\""); + strcat(descbuf, ", obj_description(oid) as \"Description\""); strcat(descbuf, "\nFROM pg_type\n" "WHERE typrelid = 0 AND typname !~ '^_.*'\n"); diff --git a/src/bin/psql/mainloop.c b/src/bin/psql/mainloop.c index b43926577d..3db4a45901 100644 --- a/src/bin/psql/mainloop.c +++ b/src/bin/psql/mainloop.c @@ -136,9 +136,10 @@ MainLoop(PsqlSettings *pset, FILE *source) if (line == NULL) { if (GetVariableBool(pset->vars, "echo") && !GetVariableBool(pset->vars, "quiet")) - puts("EOF\n"); - else - puts(""); /* put out newline */ + puts("EOF"); + else if (pset->cur_cmd_interactive) + puts(""); /* just newline */ + eof = true; continue; } |