Commite61e4d4

committed

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

descriptions enabled.

1 parentdb12a63 commite61e4d4Copy full SHA for e61e4d4

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ describeTypes(const char name, PsqlSettings pset)`
`158`	`158`	`descbuf[0]='\0';`
`159`	`159`	`strcat(descbuf,"SELECT typname AS \"Type\"");`
`160`	`160`	`if (GetVariableBool(pset->vars,"description"))`
`161`		`-strcat(descbuf,", obj_description(p.oid) as \"Description\"");`
	`161`	`+strcat(descbuf,", obj_description(oid) as \"Description\"");`
`162`	`162`	`strcat(descbuf,"\nFROM pg_type\n"`
`163`	`163`	`"WHERE typrelid = 0 AND typname !~ '^_.*'\n");`
`164`	`164`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -136,9 +136,10 @@ MainLoop(PsqlSettings pset, FILE source)`
`136`	`136`	`if (line==NULL)`
`137`	`137`	`{`
`138`	`138`	`if (GetVariableBool(pset->vars,"echo")&& !GetVariableBool(pset->vars,"quiet"))`
`139`		`-puts("EOF\n");`
`140`		`-else`
`141`		`-puts("");/* put out newline */`
	`139`	`+puts("EOF");`
	`140`	`+elseif (pset->cur_cmd_interactive)`
	`141`	`+puts("");/* just newline */`
	`142`	`+`
`142`	`143`	`eof= true;`
`143`	`144`	`continue;`
`144`	`145`	`}`

Comments

(0)