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

Commitcf00200

Browse files
committed
Remove no-longer-relevant test case.
collate.icu.utf8.sql was exercising the recording of a collationdependency for an enum comparison expression, but such an expressionshould never have had any collation dependency in the first place.After I fixed that in commitc402b02, the test started failing.We don't need to test that scenario anymore, so just remove thenow-useless test steps.(This test case is new in HEAD, so no need to back-patch.)Discussion:https://postgr.es/m/3044030.1618261159@sss.pgh.pa.usDiscussion:https://postgr.es/m/HK0PR01MB22744393C474D503E16C8509F4709@HK0PR01MB2274.apcprd01.prod.exchangelabs.com
1 parentc402b02 commitcf00200

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

‎src/test/regress/expected/collate.icu.utf8.out

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1960,7 +1960,6 @@ CREATE COLLATION custom (
19601960
);
19611961
CREATE TYPE myrange AS range (subtype = text);
19621962
CREATE TYPE myrange_en_fr_ga AS range(subtype = t_en_fr_ga);
1963-
CREATE TYPE mood AS ENUM ('sad', 'ok', 'happy');
19641963
CREATE TABLE collate_test (
19651964
id integer,
19661965
val text COLLATE "fr-x-icu",
@@ -1971,8 +1970,7 @@ CREATE TABLE collate_test (
19711970
d_en_fr_ga d_en_fr_ga,
19721971
d_en_fr_ga_arr d_en_fr_ga[],
19731972
myrange myrange,
1974-
myrange_en_fr_ga myrange_en_fr_ga,
1975-
mood mood
1973+
myrange_en_fr_ga myrange_en_fr_ga
19761974
);
19771975
CREATE INDEX icuidx00_val ON collate_test(val);
19781976
-- shouldn't get duplicated dependencies
@@ -2009,7 +2007,6 @@ CREATE INDEX icuidx12_custom ON collate_test(id) WHERE ('foo', 'bar')::d_custom
20092007
CREATE INDEX icuidx13_custom ON collate_test(id) WHERE ('foo' COLLATE custom, 'bar')::d_custom = ('foo', 'bar')::d_custom;
20102008
CREATE INDEX icuidx14_myrange ON collate_test(myrange);
20112009
CREATE INDEX icuidx15_myrange_en_fr_ga ON collate_test USING gist (myrange_en_fr_ga);
2012-
CREATE INDEX icuidx16_mood ON collate_test(id) WHERE mood > 'ok' COLLATE "fr-x-icu";
20132010
CREATE TABLE collate_part(id integer, val text COLLATE "en-x-icu") PARTITION BY range(id);
20142011
CREATE TABLE collate_part_0 PARTITION OF collate_part FOR VALUES FROM (0) TO (1);
20152012
CREATE TABLE collate_part_1 PARTITION OF collate_part FOR VALUES FROM (1) TO (1000000);
@@ -2085,9 +2082,8 @@ ORDER BY 1, 2, 3;
20852082
icuidx15_myrange_en_fr_ga | "en-x-icu" | up to date
20862083
icuidx15_myrange_en_fr_ga | "fr-x-icu" | up to date
20872084
icuidx15_myrange_en_fr_ga | "ga-x-icu" | up to date
2088-
icuidx16_mood | "fr-x-icu" | up to date
20892085
icuidx17_part | "en-x-icu" | up to date
2090-
(58 rows)
2086+
(57 rows)
20912087

20922088
-- Validate that REINDEX will update the stored version.
20932089
UPDATE pg_depend SET refobjversion = 'not a version'

‎src/test/regress/sql/collate.icu.utf8.sql

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -758,8 +758,6 @@ CREATE COLLATION custom (
758758
CREATETYPEmyrangeAS range (subtype=text);
759759
CREATETYPEmyrange_en_fr_gaAS range(subtype= t_en_fr_ga);
760760

761-
CREATETYPEmoodAS ENUM ('sad','ok','happy');
762-
763761
CREATETABLEcollate_test (
764762
idinteger,
765763
valtext COLLATE"fr-x-icu",
@@ -770,8 +768,7 @@ CREATE TABLE collate_test (
770768
d_en_fr_ga d_en_fr_ga,
771769
d_en_fr_ga_arr d_en_fr_ga[],
772770
myrange myrange,
773-
myrange_en_fr_ga myrange_en_fr_ga,
774-
mood mood
771+
myrange_en_fr_ga myrange_en_fr_ga
775772
);
776773

777774
CREATEINDEXicuidx00_valON collate_test(val);
@@ -809,7 +806,6 @@ CREATE INDEX icuidx12_custom ON collate_test(id) WHERE ('foo', 'bar')::d_custom
809806
CREATEINDEXicuidx13_customON collate_test(id)WHERE ('foo' COLLATE custom,'bar')::d_custom= ('foo','bar')::d_custom;
810807
CREATEINDEXicuidx14_myrangeON collate_test(myrange);
811808
CREATEINDEXicuidx15_myrange_en_fr_gaON collate_test USING gist (myrange_en_fr_ga);
812-
CREATEINDEXicuidx16_moodON collate_test(id)WHERE mood>'ok' COLLATE"fr-x-icu";
813809

814810
CREATETABLEcollate_part(idinteger, valtext COLLATE"en-x-icu") PARTITION BY range(id);
815811
CREATETABLEcollate_part_0 PARTITION OF collate_part FORVALUESFROM (0) TO (1);

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp