NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit02a5786

committed

Improve error reporting in opclasscmds.c

This commit improves error reporting introduced by911e702. It putsargument of errmsg() to the single line for easier grepping source for errortext. Also it improves wording of errhint().

1 parent087d3d0 commit02a5786Copy full SHA for 02a5786

File tree

2 files changed

-6

lines changed

src
- backend/commands
  - opclasscmds.c
- test/regress/expected
  - alter_generic.out

2 files changed

-6

lines changed

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

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1156,16 +1156,14 @@ assignProcTypes(OpFamilyMember *member, Oid amoid, Oid typeoid,`
`1156`	`1156`	`(OidIsValid(member->righttype)&&member->righttype!=typeoid))`
`1157`	`1157`	`ereport(ERROR,`
`1158`	`1158`	`(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),`
`1159`		`-errmsg("associated data types for opclass options "`
`1160`		`-"parsing functions must match opclass input type")));`
	`1159`	`+errmsg("associated data types for opclass options parsing functions must match opclass input type")));`
`1161`	`1160`	`}`
`1162`	`1161`	`else`
`1163`	`1162`	`{`
`1164`	`1163`	`if (member->lefttype!=member->righttype)`
`1165`	`1164`	`ereport(ERROR,`
`1166`	`1165`	`(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),`
`1167`		`-errmsg("left and right associated data types for "`
`1168`		`-"opclass options parsing functions must match")));`
	`1166`	`+errmsg("left and right associated data types for opclass options parsing functions must match")));`
`1169`	`1167`	`}`
`1170`	`1168`
`1171`	`1169`	`if (procform->prorettype!=VOIDOID\|\|`
`@@ -1174,9 +1172,10 @@ assignProcTypes(OpFamilyMember *member, Oid amoid, Oid typeoid,`
`1174`	`1172`	`ereport(ERROR,`
`1175`	`1173`	`(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),`
`1176`	`1174`	`errmsg("invalid opclass options parsing function"),`
`1177`		`-errhint("opclass options parsing functionmust have signature'%s'",`
	`1175`	`+errhint("Valid signature ofopclass options parsing functionis'%s'.",`
`1178`	`1176`	`"(internal) RETURNS void")));`
`1179`	`1177`	`}`
	`1178`	`+`
`1180`	`1179`	`/*`
`1181`	`1180`	`* btree comparison procs must be 2-arg procs returning int4. btree`
`1182`	`1181`	`* sortsupport procs must take internal and return void. btree in_range`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -506,7 +506,7 @@ ALTER OPERATOR FAMILY alt_opf19 USING btree ADD FUNCTION 5 test_opclass_options_`
`506`	`506`	`ERROR: function test_opclass_options_func(internal, text[], boolean) does not exist`
`507`	`507`	`ALTER OPERATOR FAMILY alt_opf19 USING btree ADD FUNCTION 5 (int4) btint42cmp(int4, int2);`
`508`	`508`	`ERROR: invalid opclass options parsing function`
`509`		`-HINT: opclass options parsing functionmust have signature'(internal) RETURNS void'`
	`509`	`+HINT:Valid signature ofopclass options parsing functionis'(internal) RETURNS void'.`
`510`	`510`	`ALTER OPERATOR FAMILY alt_opf19 USING btree ADD FUNCTION 5 (int4, int2) btint42cmp(int4, int2);`
`511`	`511`	`ERROR: left and right associated data types for opclass options parsing functions must match`
`512`	`512`	`ALTER OPERATOR FAMILY alt_opf19 USING btree ADD FUNCTION 5 (int4) test_opclass_options_func(internal); -- Ok`

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!

Commit02a5786

File tree

2 files changed

2 files changed

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

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

0 commit comments