Commit6a62ec6

Maxim Orlov

committed

Use more detailed message in record insert error.

In case of inserting a erroneous record in variable show clear messages, if it isamount of fields or fields types are wrong.

1 parent992db9f commit6a62ec6Copy full SHA for 6a62ec6

File tree

+10

-7

lines changed

+10

-7

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -563,11 +563,11 @@ ERROR: variable "j1" requires "jsonb" value`
`563`	`563`	`SELECT pgv_insert('vars3', 'r1', tab) FROM tab;`
`564`	`564`	`ERROR: there is a record in the variable "r1" with same key`
`565`	`565`	`SELECT pgv_insert('vars3', 'r1', row(1, 'str1', 'str2'));`
`566`		`-ERROR: new record structurediffers fromvariable "r1" structure`
	`566`	`+ERROR: new record structurehave 3 attributes, butvariable "r1" structure have 2.`
`567`	`567`	`SELECT pgv_insert('vars3', 'r1', row(1, 1));`
`568`		`-ERROR: new recordstructurediffers from variable "r1" structure`
	`568`	`+ERROR: new recordattribute type for attribute number 2differs from variable "r1" structure. You may need explicit type casts.`
`569`	`569`	`SELECT pgv_insert('vars3', 'r1', row('str1', 'str1'));`
`570`		`-ERROR: new recordstructurediffers from variable "r1" structure`
	`570`	`+ERROR: new recordattribute type for attribute number 1differs from variable "r1" structure. You may need explicit type casts.`
`571`	`571`	`SELECT pgv_select('vars3', 'r1', ARRAY[[1,2]]); -- fail`
`572`	`572`	`ERROR: searching for elements in multidimensional arrays is not supported`
`573`	`573`	`-- Test variables caching`

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -188,8 +188,9 @@ check_attributes(Variable *variable, TupleDesc tupdesc)`
`188`	`188`	`if (record->tupdesc->natts!=tupdesc->natts)`
`189`	`189`	`ereport(ERROR,`
`190`	`190`	`(errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
`191`		`-errmsg("new record structure differs from variable \"%s\" "`
`192`		`-"structure",GetName(variable))));`
	`191`	`+errmsg("new record structure have %d attributes, but variable "`
	`192`	`+"\"%s\" structure have %d.",`
	`193`	`+tupdesc->natts,GetName(variable),record->tupdesc->natts)));`
`193`	`194`
`194`	`195`	`/* Second, check columns type. */`
`195`	`196`	`for (i=0;i<tupdesc->natts;i++)`
`@@ -202,8 +203,10 @@ check_attributes(Variable *variable, TupleDesc tupdesc)`
`202`	`203`	`\|\| (attr1->atttypmod!=attr2->atttypmod))`
`203`	`204`	`ereport(ERROR,`
`204`	`205`	`(errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
`205`		`-errmsg("new record structure differs from variable \"%s\" "`
`206`		`-"structure",GetName(variable))));`
	`206`	`+errmsg("new record attribute type for attribute number %d "`
	`207`	`+"differs from variable \"%s\" structure. You may "`
	`208`	`+"need explicit type casts.",`
	`209`	`+i+1,GetName(variable))));`
`207`	`210`	`}`
`208`	`211`	`}`
`209`	`212`

Comments

(0)