NotificationsYou must be signed in to change notification settings
Fork5k
Star17.9k

Commit1d617a2

committed

Change one loop in ATRewriteTable to use 1-based attnums

All TupleDescAttr() calls in tablecmds.c that aren't in loops across allattributes use AttrNumber-style indexes (1-based); there was only oneplace in ATRewriteTable that was stashing 0-based indexes in a list forlater processing. Switch that to use attnums for consistency.Author: jian he <jian.universality@gmail.com>Discussion:https://postgr.es/m/CACJufxEoYA5ScUr2=CmA1xcpaS_1ixneDbEkVU77X1ctGxY2mA@mail.gmail.com

1 parentce1a75c commit1d617a2Copy full SHA for 1d617a2

File tree

1 file changed

-7

lines changed

src/backend/commands
- tablecmds.c

1 file changed

-7

lines changed

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

Lines changed: 5 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -6189,7 +6189,7 @@ ATRewriteTable(AlteredTableInfo *tab, Oid OIDNewHeap)`
`6189`	`6189`	`Form_pg_attribute attr = TupleDescAttr(newTupDesc, i);`
`6190`	`6190`
`6191`	`6191`	`if (attr->attnotnull && !attr->attisdropped)`
`6192`		`-notnull_attrs = lappend_int(notnull_attrs,i);`
	`6192`	`+notnull_attrs = lappend_int(notnull_attrs,attr->attnum);`
`6193`	`6193`	`}`
`6194`	`6194`	`if (notnull_attrs)`
`6195`	`6195`	`needscan = true;`
`@@ -6370,20 +6370,18 @@ ATRewriteTable(AlteredTableInfo *tab, Oid OIDNewHeap)`
`6370`	`6370`	`/* Now check any constraints on the possibly-changed tuple */`
`6371`	`6371`	`econtext->ecxt_scantuple = insertslot;`
`6372`	`6372`
`6373`		`-foreach(l, notnull_attrs)`
	`6373`	`+foreach_int(attn, notnull_attrs)`
`6374`	`6374`	`{`
`6375`		`-intattn = lfirst_int(l);`
`6376`		`-`
`6377`		`-if (slot_attisnull(insertslot, attn + 1))`
	`6375`	`+if (slot_attisnull(insertslot, attn))`
`6378`	`6376`	`{`
`6379`		`-Form_pg_attribute attr = TupleDescAttr(newTupDesc, attn);`
	`6377`	`+Form_pg_attribute attr = TupleDescAttr(newTupDesc, attn - 1);`
`6380`	`6378`
`6381`	`6379`	`ereport(ERROR,`
`6382`	`6380`	`(errcode(ERRCODE_NOT_NULL_VIOLATION),`
`6383`	`6381`	`errmsg("column \"%s\" of relation \"%s\" contains null values",`
`6384`	`6382`	`NameStr(attr->attname),`
`6385`	`6383`	`RelationGetRelationName(oldrel)),`
`6386`		`- errtablecol(oldrel, attn + 1)));`
	`6384`	`+ errtablecol(oldrel, attn)));`
`6387`	`6385`	`}`
`6388`	`6386`	`}`
`6389`	`6387`

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!

Commit1d617a2

File tree

1 file changed

1 file changed

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

0 commit comments