database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Department of second thoughts: let's show the exact key during unique index

Browse Source 
build failures, too.  Refactor a bit more since that error message isn't
spelled the same.
This commit is contained in:
Tom Lane
2009-08-01 20:59:17 +00:00
parent b680ae4bdb
commit 527f0ae3fa
6 changed files with 44 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/backend/access/index/genam.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/access/index/genam.c,v 1.75 2009/08/01 19:59:41 tgl Exp $
* $PostgreSQL: pgsql/src/backend/access/index/genam.c,v 1.76 2009/08/01 20:59:17 tgl Exp $
*
* NOTES
* many of the old access method routines have been turned into
@ -133,13 +133,16 @@ IndexScanEnd(IndexScanDesc scan)
}
/*
* ReportUniqueViolation -- Report a unique-constraint violation.
* BuildIndexValueDescription
*
* The index entry represented by values[]/isnull[] violates the unique
* constraint enforced by this index. Throw a suitable error.
* Construct a string describing the contents of an index entry, in the
* form "(key_name, ...)=(key_value, ...)". This is currently used
* only for building unique-constraint error messages, but we don't want
* to hardwire the spelling of the messages here.
*/
void
ReportUniqueViolation(Relation indexRelation, Datum *values, bool *isnull)
char *
BuildIndexValueDescription(Relation indexRelation,
Datum *values, bool *isnull)
{
/*
* XXX for the moment we use the index's tupdesc as a guide to the
@ -148,14 +151,14 @@ ReportUniqueViolation(Relation indexRelation, Datum *values, bool *isnull)
* are ever to support non-btree unique indexes.
*/
TupleDesc tupdesc = RelationGetDescr(indexRelation);
char *key_names;
StringInfoData key_values;
StringInfoData buf;
int i;
key_names = pg_get_indexdef_columns(RelationGetRelid(indexRelation), true);
initStringInfo(&buf);
appendStringInfo(&buf, "(%s)=(",
pg_get_indexdef_columns(RelationGetRelid(indexRelation),
true));
/* Get printable versions of the key values */
initStringInfo(&key_values);
for (i = 0; i < tupdesc->natts; i++)
{
char *val;
@ -173,16 +176,13 @@ ReportUniqueViolation(Relation indexRelation, Datum *values, bool *isnull)
}
if (i > 0)
appendStringInfoString(&key_values, ", ");
appendStringInfoString(&key_values, val);
appendStringInfoString(&buf, ", ");
appendStringInfoString(&buf, val);
}
ereport(ERROR,
(errcode(ERRCODE_UNIQUE_VIOLATION),
errmsg("duplicate key value violates unique constraint \"%s\"",
RelationGetRelationName(indexRelation)),
errdetail("Key (%s)=(%s) already exists.",
key_names, key_values.data)));
appendStringInfoChar(&buf, ')');
return buf.data;
}

12
src/backend/access/nbtree/nbtinsert.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.172 2009/08/01 19:59:41 tgl Exp $
* $PostgreSQL: pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.173 2009/08/01 20:59:17 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -365,7 +365,7 @@ _bt_check_unique(Relation rel, IndexTuple itup, Relation heapRel,
* This is a definite conflict. Break the tuple down
* into datums and report the error. But first, make
* sure we release the buffer locks we're holding ---
* the error reporting code could make catalog accesses,
* BuildIndexValueDescription could make catalog accesses,
* which in the worst case might touch this same index
* and cause deadlocks.
*/
@ -379,7 +379,13 @@ _bt_check_unique(Relation rel, IndexTuple itup, Relation heapRel,
index_deform_tuple(itup, RelationGetDescr(rel),
values, isnull);
ReportUniqueViolation(rel, values, isnull);
ereport(ERROR,
(errcode(ERRCODE_UNIQUE_VIOLATION),
errmsg("duplicate key value violates unique constraint \"%s\"",
RelationGetRelationName(rel)),
errdetail("Key %s already exists.",
BuildIndexValueDescription(rel,
values, isnull))));
}
}
else if (all_dead)