mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-21 08:29:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

I discovered that TupleDescGetAttInMetadata and BuildTupleFromCStrings

Browse Source 
don't deal well with tuples having dropped columns. The attached fixes
the issue. Please apply.

Joe Conway
This commit is contained in:
Bruce Momjian 2003-09-29 18:22:48 +00:00
parent f3db606592
commit fc7a2affab
1 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/backend/executor/execTuples.c
View File

@ -15,7 +15,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.71 2003/08/08 21:41:40 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.72 2003/09/29 18:22:48 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -674,16 +674,20 @@ TupleDescGetAttInMetadata(TupleDesc tupdesc)
* Gather info needed later to call the "in" function for each * Gather info needed later to call the "in" function for each
* attribute * attribute
*/ */
attinfuncinfo = (FmgrInfo *) palloc(natts * sizeof(FmgrInfo)); attinfuncinfo = (FmgrInfo *) palloc0(natts * sizeof(FmgrInfo));
attelems = (Oid *) palloc(natts * sizeof(Oid)); attelems = (Oid *) palloc0(natts * sizeof(Oid));
atttypmods = (int32 *) palloc(natts * sizeof(int32)); atttypmods = (int32 *) palloc0(natts * sizeof(int32));
for (i = 0; i < natts; i++) for (i = 0; i < natts; i++)
{ {
atttypeid = tupdesc->attrs[i]->atttypid; /* Ignore dropped attributes */
getTypeInputInfo(atttypeid, &attinfuncid, &attelems[i]); if (!tupdesc->attrs[i]->attisdropped)
fmgr_info(attinfuncid, &attinfuncinfo[i]); {
atttypmods[i] = tupdesc->attrs[i]->atttypmod; atttypeid = tupdesc->attrs[i]->atttypid;
getTypeInputInfo(atttypeid, &attinfuncid, &attelems[i]);
fmgr_info(attinfuncid, &attinfuncinfo[i]);
atttypmods[i] = tupdesc->attrs[i]->atttypmod;
}
} }
attinmeta->tupdesc = tupdesc; attinmeta->tupdesc = tupdesc;
attinmeta->attinfuncs = attinfuncinfo; attinmeta->attinfuncs = attinfuncinfo;
@ -712,22 +716,32 @@ BuildTupleFromCStrings(AttInMetadata *attinmeta, char **values)
dvalues = (Datum *) palloc(natts * sizeof(Datum)); dvalues = (Datum *) palloc(natts * sizeof(Datum));
nulls = (char *) palloc(natts * sizeof(char)); nulls = (char *) palloc(natts * sizeof(char));
/* Call the "in" function for each non-null attribute */ /* Call the "in" function for each non-null, non-dropped attribute */
for (i = 0; i < natts; i++) for (i = 0; i < natts; i++)
{ {
if (values[i] != NULL) if (!tupdesc->attrs[i]->attisdropped)
{ {
attelem = attinmeta->attelems[i]; /* Non-dropped attributes */
atttypmod = attinmeta->atttypmods[i]; if (values[i] != NULL)
{
attelem = attinmeta->attelems[i];
atttypmod = attinmeta->atttypmods[i];
dvalues[i] = FunctionCall3(&attinmeta->attinfuncs[i], dvalues[i] = FunctionCall3(&attinmeta->attinfuncs[i],
CStringGetDatum(values[i]), CStringGetDatum(values[i]),
ObjectIdGetDatum(attelem), ObjectIdGetDatum(attelem),
Int32GetDatum(atttypmod)); Int32GetDatum(atttypmod));
nulls[i] = ' '; nulls[i] = ' ';
}
else
{
dvalues[i] = (Datum) 0;
nulls[i] = 'n';
}
} }
else else
{ {
/* Handle dropped attributes by setting to NULL */
dvalues[i] = (Datum) 0; dvalues[i] = (Datum) 0;
nulls[i] = 'n'; nulls[i] = 'n';
} }