diff options
Diffstat (limited to 'contrib/sepgsql/dml.c')
| -rw-r--r-- | contrib/sepgsql/dml.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/contrib/sepgsql/dml.c b/contrib/sepgsql/dml.c index 0e9aa47eed3..53f6f41c5c4 100644 --- a/contrib/sepgsql/dml.c +++ b/contrib/sepgsql/dml.c @@ -30,9 +30,9 @@ /* * fixup_whole_row_references * - * When user reference a whole of row, it is equivalent to reference to + * When user references a whole-row Var, it is equivalent to referencing * all the user columns (not system columns). So, we need to fix up the - * given bitmapset, if it contains a whole of the row reference. + * given bitmapset, if it contains a whole-row reference. */ static Bitmapset * fixup_whole_row_references(Oid relOid, Bitmapset *columns) @@ -43,7 +43,7 @@ fixup_whole_row_references(Oid relOid, Bitmapset *columns) AttrNumber attno; int index; - /* if no whole of row references, do not anything */ + /* if no whole-row references, nothing to do */ index = InvalidAttrNumber - FirstLowInvalidHeapAttributeNumber; if (!bms_is_member(index, columns)) return columns; @@ -55,7 +55,7 @@ fixup_whole_row_references(Oid relOid, Bitmapset *columns) natts = ((Form_pg_class) GETSTRUCT(tuple))->relnatts; ReleaseSysCache(tuple); - /* fix up the given columns */ + /* remove bit 0 from column set, add in all the non-dropped columns */ result = bms_copy(columns); result = bms_del_member(result, index); @@ -65,14 +65,13 @@ fixup_whole_row_references(Oid relOid, Bitmapset *columns) ObjectIdGetDatum(relOid), Int16GetDatum(attno)); if (!HeapTupleIsValid(tuple)) - continue; - - if (((Form_pg_attribute) GETSTRUCT(tuple))->attisdropped) - continue; - - index = attno - FirstLowInvalidHeapAttributeNumber; + continue; /* unexpected case, should we error? */ - result = bms_add_member(result, index); + if (!((Form_pg_attribute) GETSTRUCT(tuple))->attisdropped) + { + index = attno - FirstLowInvalidHeapAttributeNumber; + result = bms_add_member(result, index); + } ReleaseSysCache(tuple); } |