Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit33753ac

Browse files
author
Amit Kapila
committed
Add object names to partition integrity violations.
All errors of SQLSTATE class 23 should include the name of an objectassociated with the error in separate fields of the error report message.We do this so that applications need not try to extract them from thepossibly-localized human-readable text of the message.Reported-by: Chris BandyAuthor: Chris BandyReviewed-by: Amit Kapila and Amit LangoteDiscussion:https://postgr.es/m/0aa113a3-3c7f-db48-bcd8-f9290b2269ae@gmail.com
1 parent79dfa8a commit33753ac

File tree

5 files changed

+12
-6
lines changed

5 files changed

+12
-6
lines changed

‎src/backend/commands/tablecmds.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5343,12 +5343,14 @@ ATRewriteTable(AlteredTableInfo *tab, Oid OIDNewHeap, LOCKMODE lockmode)
53435343
ereport(ERROR,
53445344
(errcode(ERRCODE_CHECK_VIOLATION),
53455345
errmsg("updated partition constraint for default partition \"%s\" would be violated by some row",
5346-
RelationGetRelationName(oldrel))));
5346+
RelationGetRelationName(oldrel)),
5347+
errtable(oldrel)));
53475348
else
53485349
ereport(ERROR,
53495350
(errcode(ERRCODE_CHECK_VIOLATION),
53505351
errmsg("partition constraint of relation \"%s\" is violated by some row",
5351-
RelationGetRelationName(oldrel))));
5352+
RelationGetRelationName(oldrel)),
5353+
errtable(oldrel)));
53525354
}
53535355

53545356
/* Write the tuple out to the new relation */

‎src/backend/executor/execMain.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1878,7 +1878,8 @@ ExecPartitionCheckEmitError(ResultRelInfo *resultRelInfo,
18781878
(errcode(ERRCODE_CHECK_VIOLATION),
18791879
errmsg("new row for relation \"%s\" violates partition constraint",
18801880
RelationGetRelationName(resultRelInfo->ri_RelationDesc)),
1881-
val_desc ?errdetail("Failing row contains %s.",val_desc) :0));
1881+
val_desc ?errdetail("Failing row contains %s.",val_desc) :0,
1882+
errtable(resultRelInfo->ri_RelationDesc)));
18821883
}
18831884

18841885
/*

‎src/backend/executor/execPartition.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,8 @@ ExecFindPartition(ModifyTableState *mtstate,
346346
RelationGetRelationName(rel)),
347347
val_desc ?
348348
errdetail("Partition key of the failing row contains %s.",
349-
val_desc) :0));
349+
val_desc) :0,
350+
errtable(rel)));
350351
}
351352

352353
if (partdesc->is_leaf[partidx])

‎src/backend/partitioning/partbounds.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1366,7 +1366,8 @@ check_default_partition_contents(Relation parent, Relation default_rel,
13661366
ereport(ERROR,
13671367
(errcode(ERRCODE_CHECK_VIOLATION),
13681368
errmsg("updated partition constraint for default partition \"%s\" would be violated by some row",
1369-
RelationGetRelationName(default_rel))));
1369+
RelationGetRelationName(default_rel)),
1370+
errtable(default_rel)));
13701371

13711372
ResetExprContext(econtext);
13721373
CHECK_FOR_INTERRUPTS();

‎src/backend/utils/adt/ri_triggers.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2452,7 +2452,8 @@ ri_ReportViolation(const RI_ConstraintInfo *riinfo,
24522452
NameStr(riinfo->conname)),
24532453
errdetail("Key (%s)=(%s) is still referenced from table \"%s\".",
24542454
key_names.data,key_values.data,
2455-
RelationGetRelationName(fk_rel))));
2455+
RelationGetRelationName(fk_rel)),
2456+
errtableconstraint(fk_rel,NameStr(riinfo->conname))));
24562457
elseif (onfk)
24572458
ereport(ERROR,
24582459
(errcode(ERRCODE_FOREIGN_KEY_VIOLATION),

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp