NotificationsYou must be signed in to change notification settings
Fork28
Star153

Commitb034369

committed

psql: Catch and report errors while printing result table

Errors (for example I/O errors or disk full) while printing out resulttables were completely ignored, which could result in silentlytruncated output in scripts, for example. Fix by adding some basicerror checking and reporting.Author: Daniel Verite <daniel@manitou-mail.org>Author: David Zhang <david.zhang@highgo.ca>Discussion:https://www.postgresql.org/message-id/flat/9a0b3c8d-ee14-4b1d-9d0a-2c993bdabacc@manitou-mail.org

1 parent85f6b49 commitb034369Copy full SHA for b034369

File tree

1 file changed

+14

-1

lines changed

src/bin/psql
- common.c

1 file changed

+14

-1

lines changed

`‎src/bin/psql/common.c‎`

Lines changed: 14 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -708,6 +708,7 @@ static bool`
`708`	`708`	`PrintQueryTuples(constPGresult*results)`
`709`	`709`	`{`
`710`	`710`	`printQueryOptmy_popt=pset.popt;`
	`711`	`+boolresult= true;`
`711`	`712`
`712`	`713`	`/* one-shot expanded output requested via \gx */`
`713`	`714`	`if (pset.g_expanded)`
`@@ -725,6 +726,11 @@ PrintQueryTuples(const PGresult *results)`
`725`	`726`	`disable_sigpipe_trap();`
`726`	`727`
`727`	`728`	`printQuery(results,&my_popt,fout, false,pset.logfile);`
	`729`	`+if (ferror(fout))`
	`730`	`+{`
	`731`	`+pg_log_error("could not print result table: %m");`
	`732`	`+result= false;`
	`733`	`+}`
`728`	`734`
`729`	`735`	`if (is_pipe)`
`730`	`736`	`{`
`@@ -735,9 +741,16 @@ PrintQueryTuples(const PGresult *results)`
`735`	`741`	`fclose(fout);`
`736`	`742`	`}`
`737`	`743`	`else`
	`744`	`+{`
`738`	`745`	`printQuery(results,&my_popt,pset.queryFout, false,pset.logfile);`
	`746`	`+if (ferror(pset.queryFout))`
	`747`	`+{`
	`748`	`+pg_log_error("could not print result table: %m");`
	`749`	`+result= false;`
	`750`	`+}`
	`751`	`+}`
`739`	`752`
`740`		`-returntrue;`
	`753`	`+returnresult;`
`741`	`754`	`}`
`742`	`755`
`743`	`756`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitb034369

File tree

1 file changed

1 file changed

`‎src/bin/psql/common.c‎`

0 commit comments