Commit0525572

committed

Fix enum errdetail to mention bytes, not chars

The enum label length is in terms of bytes, not charactes.Author: Ian Lawrence Barwick <barwick@gmail.com>Reviewed-by: Julien Rouhaud <rjuju123@gmail.com>Discussion:https://www.postgresql.org/message-id/flat/CAB8KJ=itZEJ7C9BacTHSYgeUysH4xx8wDiOnyppnSLyn6-g+Bw@mail.gmail.com

1 parent9213462 commit0525572Copy full SHA for 0525572

File tree

-4

lines changed

-4

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ EnumValuesCreate(Oid enumTypeOid, List *vals)`
`125`	`125`	`ereport(ERROR,`
`126`	`126`	`(errcode(ERRCODE_INVALID_NAME),`
`127`	`127`	`errmsg("invalid enum label \"%s\"",lab),`
`128`		`-errdetail("Labels must be %dcharacters or less.",`
	`128`	`+errdetail("Labels must be %dbytes or less.",`
`129`	`129`	`NAMEDATALEN-1)));`
`130`	`130`
`131`	`131`	`values[Anum_pg_enum_oid-1]=ObjectIdGetDatum(oids[elemno]);`
`@@ -228,7 +228,7 @@ AddEnumLabel(Oid enumTypeOid,`
`228`	`228`	`ereport(ERROR,`
`229`	`229`	`(errcode(ERRCODE_INVALID_NAME),`
`230`	`230`	`errmsg("invalid enum label \"%s\"",newVal),`
`231`		`-errdetail("Labels must be %dcharacters or less.",`
	`231`	`+errdetail("Labels must be %dbytes or less.",`
`232`	`232`	`NAMEDATALEN-1)));`
`233`	`233`
`234`	`234`	`/*`
`@@ -523,7 +523,7 @@ RenameEnumLabel(Oid enumTypeOid,`
`523`	`523`	`ereport(ERROR,`
`524`	`524`	`(errcode(ERRCODE_INVALID_NAME),`
`525`	`525`	`errmsg("invalid enum label \"%s\"",newVal),`
`526`		`-errdetail("Labels must be %dcharacters or less.",`
	`526`	`+errdetail("Labels must be %dbytes or less.",`
`527`	`527`	`NAMEDATALEN-1)));`
`528`	`528`
`529`	`529`	`/*`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ ORDER BY enumlabel::planets;`
`92`	`92`	`ALTER TYPE planets ADD VALUE`
`93`	`93`	`'plutoplutoplutoplutoplutoplutoplutoplutoplutoplutoplutoplutoplutopluto';`
`94`	`94`	`ERROR: invalid enum label "plutoplutoplutoplutoplutoplutoplutoplutoplutoplutoplutoplutoplutopluto"`
`95`		`-DETAIL: Labels must be 63characters or less.`
	`95`	`+DETAIL: Labels must be 63bytes or less.`
`96`	`96`	`ALTER TYPE planets ADD VALUE 'pluto' AFTER 'zeus';`
`97`	`97`	`ERROR: "zeus" is not an existing enum label`
`98`	`98`	`-- if not exists tests`

Comments

(0)