Commit6630420

committed

Restrict name list len for domain constraints

This avoids an ugly-looking "cache lookup failure" message.Ugliness pointed out by Andres Freund.

1 parent289121a commit6630420Copy full SHA for 6630420

File tree

-2

lines changed

src
- backend/catalog
  - objectaddress.c
- test/regress/expected
  - object_address.out

-2

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1534,6 +1534,12 @@ pg_get_object_address(PG_FUNCTION_ARGS)`
`1534`	`1534`	`*/`
`1535`	`1535`	`switch (type)`
`1536`	`1536`	`{`
	`1537`	`+caseOBJECT_DOMCONSTRAINT:`
	`1538`	`+if (list_length(name)<2)`
	`1539`	`+ereport(ERROR,`
	`1540`	`+(errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
	`1541`	`+errmsg("name list length must be at least %d",2)));`
	`1542`	`+break;`
`1537`	`1543`	`caseOBJECT_LARGEOBJECT:`
`1538`	`1544`	`if (list_length(name)!=1)`
`1539`	`1545`	`ereport(ERROR,`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -171,8 +171,8 @@ WARNING: error for table constraint,{addr_nsp,zwei},{}: relation "addr_nsp" doe`
`171`	`171`	`WARNING: error for table constraint,{addr_nsp,zwei},{integer}: relation "addr_nsp" does not exist`
`172`	`172`	`WARNING: error for table constraint,{eins,zwei,drei},{}: schema "eins" does not exist`
`173`	`173`	`WARNING: error for table constraint,{eins,zwei,drei},{integer}: schema "eins" does not exist`
`174`		`-WARNING: error for domain constraint,{eins},{}:cache lookup failed for type 0`
`175`		`-WARNING: error for domain constraint,{eins},{integer}:cache lookup failed for type 0`
	`174`	`+WARNING: error for domain constraint,{eins},{}:name list length must be at least 2`
	`175`	`+WARNING: error for domain constraint,{eins},{integer}:name list length must be at least 2`
`176`	`176`	`WARNING: error for domain constraint,{addr_nsp,zwei},{}: type "addr_nsp" does not exist`
`177`	`177`	`WARNING: error for domain constraint,{addr_nsp,zwei},{integer}: type "addr_nsp" does not exist`
`178`	`178`	`WARNING: error for domain constraint,{eins,zwei,drei},{}: schema "eins" does not exist`

Comments

(0)