diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c index 0fdff2918f..5995dea6d1 100644 --- a/src/backend/catalog/heap.c +++ b/src/backend/catalog/heap.c @@ -672,7 +672,8 @@ CheckAttributeType(const char *attname, /* * If it's a range, recurse to check its subtype. */ - CheckAttributeType(attname, get_range_subtype(atttypid), attcollation, + CheckAttributeType(attname, get_range_subtype(atttypid), + get_range_collation(atttypid), containing_rowtypes, flags); } diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c index 1e3e6d3a7e..8986a6eda2 100644 --- a/src/backend/utils/cache/lsyscache.c +++ b/src/backend/utils/cache/lsyscache.c @@ -3150,6 +3150,25 @@ get_range_subtype(Oid rangeOid) return InvalidOid; } +Oid +get_range_collation(Oid rangeOid) +{ + HeapTuple tp; + + tp = SearchSysCache1(RANGETYPE, ObjectIdGetDatum(rangeOid)); + if (HeapTupleIsValid(tp)) + { + Form_pg_range rngtup = (Form_pg_range) GETSTRUCT(tp); + Oid result; + + result = rngtup->rngcollation; + ReleaseSysCache(tp); + return result; + } + else + return InvalidOid; +} + /* ---------- PG_INDEX CACHE ---------- */ /* diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h index a216d6793d..370f62a133 100644 --- a/src/include/utils/lsyscache.h +++ b/src/include/utils/lsyscache.h @@ -179,6 +179,7 @@ extern void free_attstatsslot(AttStatsSlot *sslot); extern char *get_namespace_name(Oid nspid); extern char *get_namespace_name_or_temp(Oid nspid); extern Oid get_range_subtype(Oid rangeOid); +extern Oid get_range_collation(Oid rangeOid); extern Oid get_index_column_opclass(Oid index_oid, int attno); #define type_is_array(typid) (get_element_type(typid) != InvalidOid) diff --git a/src/test/regress/expected/rangetypes.out b/src/test/regress/expected/rangetypes.out index 5ed6ae47ec..2c41b02d3a 100644 --- a/src/test/regress/expected/rangetypes.out +++ b/src/test/regress/expected/rangetypes.out @@ -1,5 +1,8 @@ -- Tests for range data types. create type textrange as range (subtype=text, collation="C"); +-- validate that a range on a collatable type can be used as a table column +create table textrange_test (tr textrange); +drop table textrange_test; -- -- test input parser -- diff --git a/src/test/regress/sql/rangetypes.sql b/src/test/regress/sql/rangetypes.sql index 2d0ec8964e..b5e7173d7e 100644 --- a/src/test/regress/sql/rangetypes.sql +++ b/src/test/regress/sql/rangetypes.sql @@ -1,6 +1,9 @@ -- Tests for range data types. create type textrange as range (subtype=text, collation="C"); +-- validate that a range on a collatable type can be used as a table column +create table textrange_test (tr textrange); +drop table textrange_test; -- -- test input parser