NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit5b29e6b

committed

In PL/Tcl tests, don't choke if optional error fields are missing.

This fixes a portability issue introduced by commit961bed0: with acompiler that doesn't support PG_FUNCNAME_MACRO, the "funcname" field oferrorCode won't be provided, leading to a failure of the unset command.I added -nocomplain to the unset commands for filename and lineno too, justin case, though I know of no platform that wouldn't populate those fields.(BTW, -nocomplain is new in Tcl 8.4, but fortunately we dropped supportfor pre-8.4 Tcl some time ago.)Per buildfarm member pademelon.

1 parent7f5b043 commit5b29e6bCopy full SHA for 5b29e6b

File tree

2 files changed

-6

lines changed

src/pl/tcl
- expected
  - pltcl_setup.out
- sql
  - pltcl_setup.sql

2 files changed

-6

lines changed

`‎src/pl/tcl/expected/pltcl_setup.out`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -608,9 +608,9 @@ as $function$`
`608`	`608`	`# Get rid of keys that can't be expected to remain constant`
`609`	`609`	`array set myArray $::errorCode`
`610`	`610`	`unset myArray(POSTGRES)`
`611`		`- unset myArray(funcname)`
`612`		`- unset myArray(filename)`
`613`		`- unset myArray(lineno)`
	`611`	`+ unset-nocomplainmyArray(funcname)`
	`612`	`+ unset-nocomplainmyArray(filename)`
	`613`	`+ unset-nocomplainmyArray(lineno)`
`614`	`614`
`615`	`615`	`# Format into something nicer`
`616`	`616`	`set vals []`

`‎src/pl/tcl/sql/pltcl_setup.sql`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -653,9 +653,9 @@ as $function$`
`653`	`653`	`# Get rid of keys that can't be expected to remain constant`
`654`	`654`	`arrayset myArray $::errorCode`
`655`	`655`	`unset myArray(POSTGRES)`
`656`		`- unset myArray(funcname)`
`657`		`- unset myArray(filename)`
`658`		`- unset myArray(lineno)`
	`656`	`+ unset-nocomplainmyArray(funcname)`
	`657`	`+ unset-nocomplainmyArray(filename)`
	`658`	`+ unset-nocomplainmyArray(lineno)`
`659`	`659`
`660`	`660`	`# Format into something nicer`
`661`	`661`	`set vals []`

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!

Commit5b29e6b

File tree

2 files changed

2 files changed

`‎src/pl/tcl/expected/pltcl_setup.out`

`‎src/pl/tcl/sql/pltcl_setup.sql`

0 commit comments