opensourcemirror
/
postgresql
mirror of git://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix for psql control-d and .psqlrc that I broke. Fix for \dT with 

descriptions enabled.
This commit is contained in:
Bruce Momjian 1999-11-13 19:16:47 +00:00
parent db12a63ef1
commit e61e4d460c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/psql/describe.c
View File

@ -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");

7
src/bin/psql/mainloop.c
View File

@ -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;
}