diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2004-06-05 01:55:05 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2004-06-05 01:55:05 +0000 |
| commit | ae93e5fd6e8a7e2321e87d23165d9d7660cde598 (patch) | |
| tree | a8e22c4835283c61e137285ba2dabfe3feead1a9 /src/backend/optimizer/path/pathkeys.c | |
| parent | 8f2ea8b7b53a02078ba0393e6892ac5356a3631e (diff) | |
| download | postgresql-ae93e5fd6e8a7e2321e87d23165d9d7660cde598.tar.gz postgresql-ae93e5fd6e8a7e2321e87d23165d9d7660cde598.zip | |
Make the world very nearly safe for composite-type columns in tables.
1. Solve the problem of not having TOAST references hiding inside composite
values by establishing the rule that toasting only goes one level deep:
a tuple can contain toasted fields, but a composite-type datum that is
to be inserted into a tuple cannot. Enforcing this in heap_formtuple
is relatively cheap and it avoids a large increase in the cost of running
the tuptoaster during final storage of a row.
2. Fix some interesting problems in expansion of inherited queries that
reference whole-row variables. We never really did this correctly before,
but it's now relatively painless to solve by expanding the parent's
whole-row Var into a RowExpr() selecting the proper columns from the
child.
If you dike out the preventive check in CheckAttributeType(),
composite-type columns now seem to actually work. However, we surely
cannot ship them like this --- without I/O for composite types, you
can't get pg_dump to dump tables containing them. So a little more
work still to do.
Diffstat (limited to 'src/backend/optimizer/path/pathkeys.c')
| -rw-r--r-- | src/backend/optimizer/path/pathkeys.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/backend/optimizer/path/pathkeys.c b/src/backend/optimizer/path/pathkeys.c index 363fe54450d..71f96c164e5 100644 --- a/src/backend/optimizer/path/pathkeys.c +++ b/src/backend/optimizer/path/pathkeys.c @@ -11,7 +11,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/path/pathkeys.c,v 1.59 2004/06/01 03:02:52 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/optimizer/path/pathkeys.c,v 1.60 2004/06/05 01:55:04 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -725,7 +725,8 @@ find_indexkey_var(Query *root, RelOptInfo *rel, AttrNumber varattno) { Var *var = (Var *) lfirst(temp); - if (var->varattno == varattno) + if (IsA(var, Var) && + var->varattno == varattno) return var; } |