Commitb8dd19a

committed

Improve INSERT .. ON CONFLICT error message.

Peter Geoghegan, reviewed by me.

1 parent869f693 commitb8dd19aCopy full SHA for b8dd19a

File tree

-3

lines changed

src
- backend/executor
  - execIndexing.c
- test/regress/output
  - constraints.source

-3

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -535,8 +535,8 @@ ExecCheckIndexConstraints(TupleTableSlot *slot,`
`535`	`535`
`536`	`536`	`if (!indexRelation->rd_index->indimmediate)`
`537`	`537`	`ereport(ERROR,`
`538`		`-(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
`539`		`-errmsg("ON CONFLICT does not supportdeferred unique constraints/exclusion constraints as arbiters"),`
	`538`	`+(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),`
	`539`	`+errmsg("ON CONFLICT does not supportdeferrable unique constraints/exclusion constraints as arbiters"),`
`540`	`540`	`errtableconstraint(heapRelation,`
`541`	`541`	`RelationGetRelationName(indexRelation))));`
`542`	`542`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -643,7 +643,7 @@ INSERT INTO deferred_excl VALUES(1); -- fail`
`643`	`643`	`ERROR: conflicting key value violates exclusion constraint "deferred_excl_con"`
`644`	`644`	`DETAIL: Key (f1)=(1) conflicts with existing key (f1)=(1).`
`645`	`645`	`INSERT INTO deferred_excl VALUES(1) ON CONFLICT ON CONSTRAINT deferred_excl_con DO NOTHING; -- fail`
`646`		`-ERROR: ON CONFLICT does not supportdeferred unique constraints/exclusion constraints as arbiters`
	`646`	`+ERROR: ON CONFLICT does not supportdeferrable unique constraints/exclusion constraints as arbiters`
`647`	`647`	`BEGIN;`
`648`	`648`	`INSERT INTO deferred_excl VALUES(2); -- no fail here`
`649`	`649`	`COMMIT; -- should fail here`

Comments

(0)