NotificationsYou must be signed in to change notification settings
Fork4.9k
Star17.7k

Commit442e25d

committed

Convert enum_in() to report errors softly.

I missed this in my initial survey, probably because I examinedthe contents of pg_type in the postgres database, which lacksany enumerated types.Discussion:https://postgr.es/m/CAAJ_b97KeDWUdpTKGOaFYPv0OicjOu6EW+QYWj-Ywrgj_aEy1g@mail.gmail.com

1 parent361ec43 commit442e25dCopy full SHA for 442e25d

File tree

3 files changed

+40

-3

lines changed

src
- backend/utils/adt
  - enum.c
- test/regress
  - expected
    - enum.out
  - sql
    - enum.sql

3 files changed

+40

-3

lines changed

`‎src/backend/utils/adt/enum.c`

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -110,12 +110,13 @@ enum_in(PG_FUNCTION_ARGS)`
`110`	`110`	`{`
`111`	`111`	`char*name=PG_GETARG_CSTRING(0);`
`112`	`112`	`Oidenumtypoid=PG_GETARG_OID(1);`
	`113`	`+Node*escontext=fcinfo->context;`
`113`	`114`	`Oidenumoid;`
`114`	`115`	`HeapTupletup;`
`115`	`116`
`116`	`117`	`/* must check length to prevent Assert failure within SearchSysCache */`
`117`	`118`	`if (strlen(name) >=NAMEDATALEN)`
`118`		`-ereport(ERROR,`
	`119`	`+ereturn(escontext, (Datum)0,`
`119`	`120`	`(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),`
`120`	`121`	`errmsg("invalid input value for enum %s: \"%s\"",`
`121`	`122`	`format_type_be(enumtypoid),`
`@@ -125,13 +126,18 @@ enum_in(PG_FUNCTION_ARGS)`
`125`	`126`	`ObjectIdGetDatum(enumtypoid),`
`126`	`127`	`CStringGetDatum(name));`
`127`	`128`	`if (!HeapTupleIsValid(tup))`
`128`		`-ereport(ERROR,`
	`129`	`+ereturn(escontext, (Datum)0,`
`129`	`130`	`(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),`
`130`	`131`	`errmsg("invalid input value for enum %s: \"%s\"",`
`131`	`132`	`format_type_be(enumtypoid),`
`132`	`133`	`name)));`
`133`	`134`
`134`		`-/* check it's safe to use in SQL */`
	`135`	`+/*`
	`136`	`+ * Check it's safe to use in SQL. Perhaps we should take the trouble to`
	`137`	`+ * report "unsafe use" softly; but it's unclear that it's worth the`
	`138`	`+ * trouble, or indeed that that is a legitimate bad-input case at all`
	`139`	`+ * rather than an implementation shortcoming.`
	`140`	`+ */`
`135`	`141`	`check_safe_enum_use(tup);`
`136`	`142`
`137`	`143`	`/*`

`‎src/test/regress/expected/enum.out`

Lines changed: 25 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,31 @@ SELECT 'mauve'::rainbow;`
`24`	`24`	`ERROR: invalid input value for enum rainbow: "mauve"`
`25`	`25`	`LINE 1: SELECT 'mauve'::rainbow;`
`26`	`26`	`^`
	`27`	`+-- Also try it with non-error-throwing API`
	`28`	`+SELECT pg_input_is_valid('red', 'rainbow');`
	`29`	`+ pg_input_is_valid`
	`30`	`+-------------------`
	`31`	`+ t`
	`32`	`+(1 row)`
	`33`	`+`
	`34`	`+SELECT pg_input_is_valid('mauve', 'rainbow');`
	`35`	`+ pg_input_is_valid`
	`36`	`+-------------------`
	`37`	`+ f`
	`38`	`+(1 row)`
	`39`	`+`
	`40`	`+SELECT pg_input_error_message('mauve', 'rainbow');`
	`41`	`+ pg_input_error_message`
	`42`	`+-----------------------------------------------`
	`43`	`+ invalid input value for enum rainbow: "mauve"`
	`44`	`+(1 row)`
	`45`	`+`
	`46`	`+SELECT pg_input_error_message(repeat('too_long', 32), 'rainbow');`
	`47`	`+ pg_input_error_message`
	`48`	`+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------`
	`49`	`+ invalid input value for enum rainbow: "too_longtoo_longtoo_longtoo_longtoo_longtoo_longtoo_longtoo_longtoo_longtoo_longtoo_longtoo_longtoo_longtoo_longtoo_longtoo_longtoo_longtoo_longtoo_longtoo_longtoo_longtoo_longtoo_longtoo_longtoo_longtoo_longtoo_longtoo_longtoo_longtoo_longtoo_longtoo_long"`
	`50`	`+(1 row)`
	`51`	`+`
`27`	`52`	`--`
`28`	`53`	`-- adding new values`
`29`	`54`	`--`

`‎src/test/regress/sql/enum.sql`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,12 @@ SELECT COUNT(*) FROM pg_enum WHERE enumtypid = 'rainbow'::regtype;`
`15`	`15`	`SELECT'red'::rainbow;`
`16`	`16`	`SELECT'mauve'::rainbow;`
`17`	`17`
	`18`	`+-- Also try it with non-error-throwing API`
	`19`	`+SELECT pg_input_is_valid('red','rainbow');`
	`20`	`+SELECT pg_input_is_valid('mauve','rainbow');`
	`21`	`+SELECT pg_input_error_message('mauve','rainbow');`
	`22`	`+SELECT pg_input_error_message(repeat('too_long',32),'rainbow');`
	`23`	`+`
`18`	`24`	`--`
`19`	`25`	`-- adding new values`
`20`	`26`	`--`

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!

Commit442e25d

File tree

3 files changed

3 files changed

`‎src/backend/utils/adt/enum.c`

`‎src/test/regress/expected/enum.out`

`‎src/test/regress/sql/enum.sql`

0 commit comments