mirror of
https://github.com/postgres/postgres.git
synced 2025-06-27 23:21:58 +03:00
Change tupledesc->attrs[n] to TupleDescAttr(tupledesc, n).
This is a mechanical change in preparation for a later commit that will change the layout of TupleDesc. Introducing a macro to abstract the details of where attributes are stored will allow us to change that in separate step and revise it in future. Author: Thomas Munro, editorialized by Andres Freund Reviewed-By: Andres Freund Discussion: https://postgr.es/m/CAEepm=0ZtQ-SpsgCyzzYpsXS6e=kZWqk3g5Ygn3MDV7A8dabUA@mail.gmail.com
This commit is contained in:
@ -765,8 +765,10 @@ SPI_fnumber(TupleDesc tupdesc, const char *fname)
|
||||
|
||||
for (res = 0; res < tupdesc->natts; res++)
|
||||
{
|
||||
if (namestrcmp(&tupdesc->attrs[res]->attname, fname) == 0 &&
|
||||
!tupdesc->attrs[res]->attisdropped)
|
||||
Form_pg_attribute attr = TupleDescAttr(tupdesc, res);
|
||||
|
||||
if (namestrcmp(&attr->attname, fname) == 0 &&
|
||||
!attr->attisdropped)
|
||||
return res + 1;
|
||||
}
|
||||
|
||||
@ -793,7 +795,7 @@ SPI_fname(TupleDesc tupdesc, int fnumber)
|
||||
}
|
||||
|
||||
if (fnumber > 0)
|
||||
att = tupdesc->attrs[fnumber - 1];
|
||||
att = TupleDescAttr(tupdesc, fnumber - 1);
|
||||
else
|
||||
att = SystemAttributeDefinition(fnumber, true);
|
||||
|
||||
@ -823,7 +825,7 @@ SPI_getvalue(HeapTuple tuple, TupleDesc tupdesc, int fnumber)
|
||||
return NULL;
|
||||
|
||||
if (fnumber > 0)
|
||||
typoid = tupdesc->attrs[fnumber - 1]->atttypid;
|
||||
typoid = TupleDescAttr(tupdesc, fnumber - 1)->atttypid;
|
||||
else
|
||||
typoid = (SystemAttributeDefinition(fnumber, true))->atttypid;
|
||||
|
||||
@ -865,7 +867,7 @@ SPI_gettype(TupleDesc tupdesc, int fnumber)
|
||||
}
|
||||
|
||||
if (fnumber > 0)
|
||||
typoid = tupdesc->attrs[fnumber - 1]->atttypid;
|
||||
typoid = TupleDescAttr(tupdesc, fnumber - 1)->atttypid;
|
||||
else
|
||||
typoid = (SystemAttributeDefinition(fnumber, true))->atttypid;
|
||||
|
||||
@ -901,7 +903,7 @@ SPI_gettypeid(TupleDesc tupdesc, int fnumber)
|
||||
}
|
||||
|
||||
if (fnumber > 0)
|
||||
return tupdesc->attrs[fnumber - 1]->atttypid;
|
||||
return TupleDescAttr(tupdesc, fnumber - 1)->atttypid;
|
||||
else
|
||||
return (SystemAttributeDefinition(fnumber, true))->atttypid;
|
||||
}
|
||||
|
Reference in New Issue
Block a user