Remove no-longer-relevant test case.

tglsfdc · tglsfdc · commit cf0020080a3d · 2021-04-12T18:58:20.000-04:00
collate.icu.utf8.sql was exercising the recording of a collation dependency for an enum comparison expression, but such an expression should never have had any collation dependency in the first place. After I fixed that in commit c402b02, the test started failing. We don't need to test that scenario anymore, so just remove the now-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.us Discussion: https://postgr.es/m/HK0PR01MB22744393C474D503E16C8509F4709@HK0PR01MB2274.apcprd01.prod.exchangelabs.com
diff --git a/src/test/regress/expected/collate.icu.utf8.out b/src/test/regress/expected/collate.icu.utf8.out
@@ -1960,7 +1960,6 @@ CREATE COLLATION custom (
 );
 CREATE TYPE myrange AS range (subtype = text);
 CREATE TYPE myrange_en_fr_ga AS range(subtype = t_en_fr_ga);
-CREATE TYPE mood AS ENUM ('sad', 'ok', 'happy');
 CREATE TABLE collate_test (
     id integer,
     val text COLLATE "fr-x-icu",
@@ -1971,8 +1970,7 @@ CREATE TABLE collate_test (
     d_en_fr_ga d_en_fr_ga,
     d_en_fr_ga_arr d_en_fr_ga[],
     myrange myrange,
-    myrange_en_fr_ga myrange_en_fr_ga,
-    mood mood
+    myrange_en_fr_ga myrange_en_fr_ga
 );
 CREATE INDEX icuidx00_val ON collate_test(val);
 -- shouldn't get duplicated dependencies
@@ -2009,7 +2007,6 @@ CREATE INDEX icuidx12_custom ON collate_test(id) WHERE ('foo', 'bar')::d_custom
 CREATE INDEX icuidx13_custom ON collate_test(id) WHERE ('foo' COLLATE custom, 'bar')::d_custom = ('foo', 'bar')::d_custom;
 CREATE INDEX icuidx14_myrange ON collate_test(myrange);
 CREATE INDEX icuidx15_myrange_en_fr_ga ON collate_test USING gist (myrange_en_fr_ga);
-CREATE INDEX icuidx16_mood ON collate_test(id) WHERE mood > 'ok' COLLATE "fr-x-icu";
 CREATE TABLE collate_part(id integer, val text COLLATE "en-x-icu") PARTITION BY range(id);
 CREATE TABLE collate_part_0 PARTITION OF collate_part FOR VALUES FROM (0) TO (1);
 CREATE TABLE collate_part_1 PARTITION OF collate_part FOR VALUES FROM (1) TO (1000000);
@@ -2085,9 +2082,8 @@ ORDER BY 1, 2, 3;
  icuidx15_myrange_en_fr_ga         | "en-x-icu" | up to date
  icuidx15_myrange_en_fr_ga         | "fr-x-icu" | up to date
  icuidx15_myrange_en_fr_ga         | "ga-x-icu" | up to date
- icuidx16_mood                     | "fr-x-icu" | up to date
  icuidx17_part                     | "en-x-icu" | up to date
-(58 rows)
+(57 rows)
 
 -- Validate that REINDEX will update the stored version.
 UPDATE pg_depend SET refobjversion = 'not a version'
diff --git a/src/test/regress/sql/collate.icu.utf8.sql b/src/test/regress/sql/collate.icu.utf8.sql
@@ -758,8 +758,6 @@ CREATE COLLATION custom (
 CREATE TYPE myrange AS range (subtype = text);
 CREATE TYPE myrange_en_fr_ga AS range(subtype = t_en_fr_ga);
 
-CREATE TYPE mood AS ENUM ('sad', 'ok', 'happy');
-
 CREATE TABLE collate_test (
     id integer,
     val text COLLATE "fr-x-icu",
@@ -770,8 +768,7 @@ CREATE TABLE collate_test (
     d_en_fr_ga d_en_fr_ga,
     d_en_fr_ga_arr d_en_fr_ga[],
     myrange myrange,
-    myrange_en_fr_ga myrange_en_fr_ga,
-    mood mood
+    myrange_en_fr_ga myrange_en_fr_ga
 );
 
 CREATE INDEX icuidx00_val ON collate_test(val);
@@ -809,7 +806,6 @@ CREATE INDEX icuidx12_custom ON collate_test(id) WHERE ('foo', 'bar')::d_custom
 CREATE INDEX icuidx13_custom ON collate_test(id) WHERE ('foo' COLLATE custom, 'bar')::d_custom = ('foo', 'bar')::d_custom;
 CREATE INDEX icuidx14_myrange ON collate_test(myrange);
 CREATE INDEX icuidx15_myrange_en_fr_ga ON collate_test USING gist (myrange_en_fr_ga);
-CREATE INDEX icuidx16_mood ON collate_test(id) WHERE mood > 'ok' COLLATE "fr-x-icu";
 
 CREATE TABLE collate_part(id integer, val text COLLATE "en-x-icu") PARTITION BY range(id);
 CREATE TABLE collate_part_0 PARTITION OF collate_part FOR VALUES FROM (0) TO (1);
