NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit2e56fa8

committed

Call FDW validator functions even when the options list is empty.

This is useful since a validator might want to require certain optionsto be provided. The passed array is an empty text array in this case.Per suggestion by Laurenz Albe, though this is not quite his patch.

1 parent9a0bdc8 commit2e56fa8Copy full SHA for 2e56fa8

File tree

1 file changed

+12

-2

lines changed

src/backend/commands
- foreigncmds.c

1 file changed

+12

-2

lines changed

`‎src/backend/commands/foreigncmds.c`

Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -165,8 +165,18 @@ transformGenericOptions(Oid catalogId,`
`165`	`165`
`166`	`166`	`result=optionListToArray(resultOptions);`
`167`	`167`
`168`		`-if (OidIsValid(fdwvalidator)&&DatumGetPointer(result)!=NULL)`
`169`		`-OidFunctionCall2(fdwvalidator,result,ObjectIdGetDatum(catalogId));`
	`168`	`+if (OidIsValid(fdwvalidator))`
	`169`	`+{`
	`170`	`+Datumvalarg=result;`
	`171`	`+`
	`172`	`+/*`
	`173`	`+ * Pass a null options list as an empty array, so that validators`
	`174`	`+ * don't have to be declared non-strict to handle the case.`
	`175`	`+ */`
	`176`	`+if (DatumGetPointer(valarg)==NULL)`
	`177`	`+valarg=PointerGetDatum(construct_empty_array(TEXTOID));`
	`178`	`+OidFunctionCall2(fdwvalidator,valarg,ObjectIdGetDatum(catalogId));`
	`179`	`+}`
`170`	`180`
`171`	`181`	`returnresult;`
`172`	`182`	`}`

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!

Commit2e56fa8

File tree

1 file changed

1 file changed

`‎src/backend/commands/foreigncmds.c`

0 commit comments