diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2016-08-18 14:48:51 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2016-08-18 14:48:51 -0400 |
| commit | c81c71d8846fa1667e67b45559ce4c72a8e076d9 (patch) | |
| tree | a8a78134e5f1e2fde5bd22d9e82cb5828d0dfaf8 | |
| parent | 191d45793df71d69b83cfa3c8c2747f7597ba1b7 (diff) | |
| download | postgresql-c81c71d8846fa1667e67b45559ce4c72a8e076d9.tar.gz postgresql-c81c71d8846fa1667e67b45559ce4c72a8e076d9.zip | |
In plpgsql, don't try to convert int2vector or oidvector to expanded array.
These types are storage-compatible with real arrays, but they don't support
toasting, so of course they can't support expansion either.
Per bug #14289 from Michael Overmeyer. Back-patch to 9.5 where expanded
arrays were introduced.
Report: <20160818174414.1529.37913@wrigleys.postgresql.org>
| -rw-r--r-- | src/include/utils/array.h | 2 | ||||
| -rw-r--r-- | src/pl/plpgsql/src/pl_comp.c | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/include/utils/array.h b/src/include/utils/array.h index b62b08c4824..6164f119ba7 100644 --- a/src/include/utils/array.h +++ b/src/include/utils/array.h @@ -36,7 +36,7 @@ * * The OIDVECTOR and INT2VECTOR datatypes are storage-compatible with * generic arrays, but they support only one-dimensional arrays with no - * nulls (and no null bitmap). + * nulls (and no null bitmap). They don't support being toasted, either. * * There are also some "fixed-length array" datatypes, such as NAME and * POINT. These are simply a sequence of a fixed number of items each diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c index b628c2811be..38aa030303a 100644 --- a/src/pl/plpgsql/src/pl_comp.c +++ b/src/pl/plpgsql/src/pl_comp.c @@ -2192,14 +2192,19 @@ build_datatype(HeapTuple typeTup, int32 typmod, Oid collation) /* NB: this is only used to decide whether to apply expand_array */ if (typeStruct->typtype == TYPTYPE_BASE) { - /* this test should match what get_element_type() checks */ + /* + * This test should include what get_element_type() checks. We also + * disallow non-toastable array types (i.e. oidvector and int2vector). + */ typ->typisarray = (typeStruct->typlen == -1 && - OidIsValid(typeStruct->typelem)); + OidIsValid(typeStruct->typelem) && + typeStruct->typstorage != 'p'); } else if (typeStruct->typtype == TYPTYPE_DOMAIN) { /* we can short-circuit looking up base types if it's not varlena */ typ->typisarray = (typeStruct->typlen == -1 && + typeStruct->typstorage != 'p' && OidIsValid(get_base_element_type(typeStruct->typbasetype))); } else |