Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit25dc267

Browse files
committed
Fix CheckAttributeType's handling of collations for ranges.
Commitfc76958 changed CheckAttributeType to recurse into ranges,but made it pass down the wrong collation (always InvalidOid, sinceranges as such have no collation). This would result in guaranteedfailure when considering a range type whose subtype is collatable.Embarrassingly, we lack any regression tests that would expose sucha problem (but fortunately, somebody noticed before we shipped thisbug in any release).Fix it to pass down the range's subtype collation property instead,and add some regression test cases to exercise collatable-subtyperanges a bit more. Back-patch to all supported branches, as theprevious patch was.Report and patch by Julien Rouhaud, test cases tweaked by meDiscussion:https://postgr.es/m/CAOBaU_aBWqNweiGUFX0guzBKkcfJ8mnnyyGC_KBQmO12Mj5f_A@mail.gmail.com
1 parent6363488 commit25dc267

File tree

6 files changed

+148
-3
lines changed

6 files changed

+148
-3
lines changed

‎src/backend/catalog/heap.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,8 @@ CheckAttributeType(const char *attname,
578578
/*
579579
* If it's a range, recurse to check its subtype.
580580
*/
581-
CheckAttributeType(attname,get_range_subtype(atttypid),attcollation,
581+
CheckAttributeType(attname,get_range_subtype(atttypid),
582+
get_range_collation(atttypid),
582583
containing_rowtypes,
583584
allow_system_table_mods);
584585
}

‎src/backend/utils/cache/lsyscache.c

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3130,3 +3130,29 @@ get_range_subtype(Oid rangeOid)
31303130
else
31313131
returnInvalidOid;
31323132
}
3133+
3134+
/*
3135+
* get_range_collation
3136+
*Returns the collation of a given range type
3137+
*
3138+
* Returns InvalidOid if the type is not a range type,
3139+
* or if its subtype is not collatable.
3140+
*/
3141+
Oid
3142+
get_range_collation(OidrangeOid)
3143+
{
3144+
HeapTupletp;
3145+
3146+
tp=SearchSysCache1(RANGETYPE,ObjectIdGetDatum(rangeOid));
3147+
if (HeapTupleIsValid(tp))
3148+
{
3149+
Form_pg_rangerngtup= (Form_pg_range)GETSTRUCT(tp);
3150+
Oidresult;
3151+
3152+
result=rngtup->rngcollation;
3153+
ReleaseSysCache(tp);
3154+
returnresult;
3155+
}
3156+
else
3157+
returnInvalidOid;
3158+
}

‎src/include/utils/lsyscache.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ extern void free_attstatsslot(AttStatsSlot *sslot);
177177
externchar*get_namespace_name(Oidnspid);
178178
externchar*get_namespace_name_or_temp(Oidnspid);
179179
externOidget_range_subtype(OidrangeOid);
180+
externOidget_range_collation(OidrangeOid);
180181

181182
#definetype_is_array(typid) (get_element_type(typid) != InvalidOid)
182183
/* type_is_array_domain accepts both plain arrays and domains over arrays */

‎src/test/regress/expected/rangetypes.out

Lines changed: 88 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,8 +582,95 @@ select * from numrange_test natural join numrange_test2 order by nr;
582582
set enable_nestloop to default;
583583
set enable_hashjoin to default;
584584
set enable_mergejoin to default;
585-
DROP TABLE numrange_test;
585+
-- keep numrange_test around to help exercise dump/reload
586586
DROP TABLE numrange_test2;
587+
--
588+
-- Apply a subset of the above tests on a collatable type, too
589+
--
590+
CREATE TABLE textrange_test (tr textrange);
591+
create index textrange_test_btree on textrange_test(tr);
592+
INSERT INTO textrange_test VALUES('[,)');
593+
INSERT INTO textrange_test VALUES('["a",]');
594+
INSERT INTO textrange_test VALUES('[,"q")');
595+
INSERT INTO textrange_test VALUES(textrange('b', 'g'));
596+
INSERT INTO textrange_test VALUES('empty');
597+
INSERT INTO textrange_test VALUES(textrange('d', 'd', '[]'));
598+
SELECT tr, isempty(tr), lower(tr), upper(tr) FROM textrange_test;
599+
tr | isempty | lower | upper
600+
-------+---------+-------+-------
601+
(,) | f | |
602+
[a,) | f | a |
603+
(,q) | f | | q
604+
[b,g) | f | b | g
605+
empty | t | |
606+
[d,d] | f | d | d
607+
(6 rows)
608+
609+
SELECT tr, lower_inc(tr), lower_inf(tr), upper_inc(tr), upper_inf(tr) FROM textrange_test;
610+
tr | lower_inc | lower_inf | upper_inc | upper_inf
611+
-------+-----------+-----------+-----------+-----------
612+
(,) | f | t | f | t
613+
[a,) | t | f | f | t
614+
(,q) | f | t | f | f
615+
[b,g) | t | f | f | f
616+
empty | f | f | f | f
617+
[d,d] | t | f | t | f
618+
(6 rows)
619+
620+
SELECT * FROM textrange_test WHERE range_contains(tr, textrange('f', 'fx'));
621+
tr
622+
-------
623+
(,)
624+
[a,)
625+
(,q)
626+
[b,g)
627+
(4 rows)
628+
629+
SELECT * FROM textrange_test WHERE tr @> textrange('a', 'z');
630+
tr
631+
------
632+
(,)
633+
[a,)
634+
(2 rows)
635+
636+
SELECT * FROM textrange_test WHERE range_contained_by(textrange('0','9'), tr);
637+
tr
638+
------
639+
(,)
640+
(,q)
641+
(2 rows)
642+
643+
SELECT * FROM textrange_test WHERE 'e'::text <@ tr;
644+
tr
645+
-------
646+
(,)
647+
[a,)
648+
(,q)
649+
[b,g)
650+
(4 rows)
651+
652+
select * from textrange_test where tr = 'empty';
653+
tr
654+
-------
655+
empty
656+
(1 row)
657+
658+
select * from textrange_test where tr = '("b","g")';
659+
tr
660+
----
661+
(0 rows)
662+
663+
select * from textrange_test where tr = '["b","g")';
664+
tr
665+
-------
666+
[b,g)
667+
(1 row)
668+
669+
select * from textrange_test where tr < 'empty';
670+
tr
671+
----
672+
(0 rows)
673+
587674
-- test canonical form for int4range
588675
select int4range(1, 10, '[]');
589676
int4range

‎src/test/regress/expected/sanity_check.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ num_exp_sqrt|t
9595
num_exp_sub|t
9696
num_input_test|f
9797
num_result|f
98+
numrange_test|t
9899
onek|t
99100
onek2|t
100101
path_tbl|f
@@ -200,6 +201,7 @@ test_range_spgist|t
200201
test_tsvector|f
201202
testjsonb|f
202203
text_tbl|f
204+
textrange_test|t
203205
time_tbl|f
204206
timestamp_tbl|f
205207
timestamptz_tbl|f

‎src/test/regress/sql/rangetypes.sql

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,37 @@ set enable_nestloop to default;
148148
set enable_hashjoin to default;
149149
set enable_mergejoin to default;
150150

151-
DROPTABLE numrange_test;
151+
-- keep numrange_test around to help exercise dump/reload
152152
DROPTABLE numrange_test2;
153153

154+
--
155+
-- Apply a subset of the above tests on a collatable type, too
156+
--
157+
158+
CREATETABLEtextrange_test (tr textrange);
159+
createindextextrange_test_btreeon textrange_test(tr);
160+
161+
INSERT INTO textrange_testVALUES('[,)');
162+
INSERT INTO textrange_testVALUES('["a",]');
163+
INSERT INTO textrange_testVALUES('[,"q")');
164+
INSERT INTO textrange_testVALUES(textrange('b','g'));
165+
INSERT INTO textrange_testVALUES('empty');
166+
INSERT INTO textrange_testVALUES(textrange('d','d','[]'));
167+
168+
SELECT tr, isempty(tr),lower(tr),upper(tr)FROM textrange_test;
169+
SELECT tr, lower_inc(tr), lower_inf(tr), upper_inc(tr), upper_inf(tr)FROM textrange_test;
170+
171+
SELECT*FROM textrange_testWHERE range_contains(tr, textrange('f','fx'));
172+
SELECT*FROM textrange_testWHERE tr @> textrange('a','z');
173+
SELECT*FROM textrange_testWHERE range_contained_by(textrange('0','9'), tr);
174+
SELECT*FROM textrange_testWHERE'e'::text<@ tr;
175+
176+
select*from textrange_testwhere tr='empty';
177+
select*from textrange_testwhere tr='("b","g")';
178+
select*from textrange_testwhere tr='["b","g")';
179+
select*from textrange_testwhere tr<'empty';
180+
181+
154182
-- test canonical form for int4range
155183
select int4range(1,10,'[]');
156184
select int4range(1,10,'[)');

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp