In plpgsql, don't try to convert int2vector or oidvector to expanded array.

tglsfdc · tglsfdc · commit a8fc19505209 · 2016-08-18T14:48:51.000-04:00
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: &lt;20160818174414.1529.37913@wrigleys.postgresql.org&gt;
diff --git 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
@@ -2204,14 +2204,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

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`*`
`37`	`37`	`* The OIDVECTOR and INT2VECTOR datatypes are storage-compatible with`
`38`	`38`	`* generic arrays, but they support only one-dimensional arrays with no`
`39`		`- * nulls (and no null bitmap).`
	`39`	`+ * nulls (and no null bitmap). They don't support being toasted, either.`
`40`	`40`	`*`
`41`	`41`	`* There are also some "fixed-length array" datatypes, such as NAME and`
`42`	`42`	`* POINT. These are simply a sequence of a fixed number of items each`
Original file line number	Diff line number	Diff line change
`@@ -2204,14 +2204,19 @@ build_datatype(HeapTuple typeTup, int32 typmod, Oid collation)`
`2204`	`2204`	`/* NB: this is only used to decide whether to apply expand_array */`
`2205`	`2205`	`if (typeStruct->typtype == TYPTYPE_BASE)`
`2206`	`2206`	`{`
`220 9C91 7`		`- /* this test should match what get_element_type() checks */`
	`2207`	`+ /*`
	`2208`	`+ * This test should include what get_element_type() checks. We also`
	`2209`	`+ * disallow non-toastable array types (i.e. oidvector and int2vector).`
	`2210`	`+ */`
`2208`	`2211`	`typ->typisarray = (typeStruct->typlen == -1 &&`
`2209`		`- OidIsValid(typeStruct->typelem));`
	`2212`	`+ OidIsValid(typeStruct->typelem) &&`
	`2213`	`+ typeStruct->typstorage != 'p');`
`2210`	`2214`	`}`
`2211`	`2215`	`else if (typeStruct->typtype == TYPTYPE_DOMAIN)`
`2212`	`2216`	`{`
`2213`	`2217`	`/* we can short-circuit looking up base types if it's not varlena */`
`2214`	`2218`	`typ->typisarray = (typeStruct->typlen == -1 &&`
	`2219`	`+ typeStruct->typstorage != 'p' &&`
`2215`	`2220`	`OidIsValid(get_base_element_type(typeStruct->typbasetype)));`
`2216`	`2221`	`}`
`2217`	`2222`	`else`