Commit f31980e

committed

Merge branch 'psql-command-errors' into 'master'

fix: process psql errors with successful exit code See merge request postgres-ai/joe!189

2 parents 2708d10 + bc992c0 commit f31980eCopy full SHA for f31980e

File tree

-0

lines changed

-0

lines changed

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,15 @@ func (tr Transmitter) Run(commandParam string) (string, error) {`
`46`	`46`	`out, err := tr.runPsql(cmdStr)`
`47`	`47`	`if err != nil {`
`48`	`48`	`if runnerError, ok := err.(runners.RunnerError); ok {`
	`49`	`+ if runnerError.ExitStatus == 0 {`
	`50`	`+ errMessage := runnerError.Stderr`
	`51`	`+ if _, after, found := strings.Cut(runnerError.Stderr, "error: "); found {`
	`52`	`+ errMessage = after`
	`53`	`+ }`
	`54`	`+`
	`55`	`+ return "", errors.New(errMessage)`
	`56`	`+ }`
	`57`	`+`
`49`	`58`	`return "", fmt.Errorf("psql error: %w", runnerError)`
`50`	`59`	`}`
`51`	`60`

Comments

(0)