summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2012-09-18 00:31:45 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2012-09-18 00:31:45 -0400
commit66762ce5fa9f2e82003208e4deba465f438e8505 (patch)
tree9dd880c7d6f72427052c81786c842deadb5d7b6b
parent634d80ab2a61d8c29ce763018bd8790dffcb2bd6 (diff)
downloadpostgresql-66762ce5fa9f2e82003208e4deba465f438e8505.tar.gz
Fix array_typanalyze to work for domains over arrays.
Not sure how we missed this case, but we did. Per bug #7551 from Diego de Lima.
-rw-r--r--src/backend/utils/adt/array_typanalyze.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/utils/adt/array_typanalyze.c b/src/backend/utils/adt/array_typanalyze.c
index 604b86ca64..e4c94086bc 100644
--- a/src/backend/utils/adt/array_typanalyze.c
+++ b/src/backend/utils/adt/array_typanalyze.c
@@ -19,6 +19,7 @@
#include "commands/vacuum.h"
#include "utils/array.h"
#include "utils/datum.h"
+#include "utils/lsyscache.h"
#include "utils/typcache.h"
@@ -108,11 +109,10 @@ array_typanalyze(PG_FUNCTION_ARGS)
PG_RETURN_BOOL(false);
/*
- * Check attribute data type is a varlena array.
+ * Check attribute data type is a varlena array (or a domain over one).
*/
- element_typeid = stats->attrtype->typelem;
-
- if (!OidIsValid(element_typeid) || stats->attrtype->typlen != -1)
+ element_typeid = get_base_element_type(stats->attrtypid);
+ if (!OidIsValid(element_typeid))
elog(ERROR, "array_typanalyze was invoked for non-array type %u",
stats->attrtypid);