Revert 29854ee8d1 due to buildfarm failures

Reported-by: Tom Lane
Discussion: https://postgr.es/m/CAPpHfdvcnw3x7jdV3r52p4%3D5S4WUxBCzcQKB3JukQHoicv1LSQ%40mail.gmail.com

4 files changed, 0 insertions, 85 deletions

diff --git a/src/test/regress/expected/multirangetypes.out b/src/test/regress/expected/multirangetypes.out
index 7ca2d3f30a9..98ac592127b 100644
--- a/src/test/regress/expected/multirangetypes.out
+++ b/src/test/regress/expected/multirangetypes.out
@@ -322,18 +322,6 @@ select int4range(null, null)::int4multirange;
  {(,)}
 (1 row)
 
-select 'empty'::int4range::int4multirange::int4range[];
- int4range 
------------
- {}
-(1 row)
-
-select int4multirange(int4range('5', '6'), int4range('1', '2'))::int4range[];
-  int4multirange   
--------------------
- {"[1,2)","[5,6)"}
-(1 row)
-
 select 'empty'::textrange::textmultirange;
  textmultirange 
 ----------------
@@ -358,35 +346,6 @@ select textrange(null, null)::textmultirange;
  {(,)}
 (1 row)
 
-select textmultirange(textrange('a', 'b'), textrange('d', 'e'))::textrange[];
-  textmultirange   
--------------------
- {"[a,b)","[d,e)"}
-(1 row)
-
-select 'empty'::textrange::textmultirange::textrange[];
- textrange 
------------
- {}
-(1 row)
-
---
--- test unnest(multirange) function
---
-select unnest(int4multirange(int4range('5', '6'), int4range('1', '2')));
- unnest 
---------
- [1,2)
- [5,6)
-(2 rows)
-
-select unnest(textmultirange(textrange('a', 'b'), textrange('d', 'e')));
- unnest 
---------
- [a,b)
- [d,e)
-(2 rows)
-
 --
 -- create some test data and test the operators
 --
@@ -2769,25 +2728,6 @@ LINE 1: select multirange_of_text(textrange2('a','Z'));
 HINT:  No function matches the given name and argument types. You might need to add explicit type casts.
 select multirange_of_text(textrange1('a','Z')) @> 'b'::text;
 ERROR:  range lower bound must be less than or equal to range upper bound
-select multirange_of_text(textrange1('a','b'), textrange1('d','e'))::textrange1[];
- multirange_of_text 
---------------------
- {"[a,b)","[d,e)"}
-(1 row)
-
-select multirange_of_text()::textrange1[];
- multirange_of_text 
---------------------
- {}
-(1 row)
-
-select unnest(multirange_of_text(textrange1('a','b'), textrange1('d','e')));
- unnest 
---------
- [a,b)
- [d,e)
-(2 rows)
-
 select _textrange1(textrange2('a','z')) @> 'b'::text;
  ?column? 
 ----------
diff --git a/src/test/regress/expected/opr_sanity.out b/src/test/regress/expected/opr_sanity.out
index fbcd1934093..562b586d8e0 100644
--- a/src/test/regress/expected/opr_sanity.out
+++ b/src/test/regress/expected/opr_sanity.out
@@ -151,8 +151,6 @@ WHERE p1.oid != p2.oid AND
     p2.prosrc NOT LIKE E'range\\_constructor_' AND
     p1.prosrc NOT LIKE E'multirange\\_constructor_' AND
     p2.prosrc NOT LIKE E'multirange\\_constructor_' AND
-    p1.prosrc != 'multirange_to_array' AND
-    p2.prosrc != 'multirange_to_array' AND
     (p1.prorettype < p2.prorettype)
 ORDER BY 1, 2;
          prorettype          |        prorettype        
@@ -173,8 +171,6 @@ WHERE p1.oid != p2.oid AND
     p2.prosrc NOT LIKE E'range\\_constructor_' AND
     p1.prosrc NOT LIKE E'multirange\\_constructor_' AND
     p2.prosrc NOT LIKE E'multirange\\_constructor_' AND
-    p1.prosrc != 'multirange_to_array' AND
-    p2.prosrc != 'multirange_to_array' AND
     (p1.proargtypes[0] < p2.proargtypes[0])
 ORDER BY 1, 2;
          proargtypes         |       proargtypes        
@@ -197,8 +193,6 @@ WHERE p1.oid != p2.oid AND
     p2.prosrc NOT LIKE E'range\\_constructor_' AND
     p1.prosrc NOT LIKE E'multirange\\_constructor_' AND
     p2.prosrc NOT LIKE E'multirange\\_constructor_' AND
-    p1.prosrc != 'multirange_to_array' AND
-    p2.prosrc != 'multirange_to_array' AND
     (p1.proargtypes[1] < p2.proargtypes[1])
 ORDER BY 1, 2;
          proargtypes         |       proargtypes        
diff --git a/src/test/regress/sql/multirangetypes.sql b/src/test/regress/sql/multirangetypes.sql
index d636e8ca344..3cbebedcd4a 100644
--- a/src/test/regress/sql/multirangetypes.sql
+++ b/src/test/regress/sql/multirangetypes.sql
@@ -72,20 +72,10 @@ select 'empty'::int4range::int4multirange;
 select int4range(1, 3)::int4multirange;
 select int4range(1, null)::int4multirange;
 select int4range(null, null)::int4multirange;
-select 'empty'::int4range::int4multirange::int4range[];
-select int4multirange(int4range('5', '6'), int4range('1', '2'))::int4range[];
 select 'empty'::textrange::textmultirange;
 select textrange('a', 'c')::textmultirange;
 select textrange('a', null)::textmultirange;
 select textrange(null, null)::textmultirange;
-select textmultirange(textrange('a', 'b'), textrange('d', 'e'))::textrange[];
-select 'empty'::textrange::textmultirange::textrange[];
-
---
--- test unnest(multirange) function
---
-select unnest(int4multirange(int4range('5', '6'), int4range('1', '2')));
-select unnest(textmultirange(textrange('a', 'b'), textrange('d', 'e')));
 
 --
 -- create some test data and test the operators
@@ -631,9 +621,6 @@ create type textrange2 as range(subtype=text, multirange_type_name=_textrange1,
 
 select multirange_of_text(textrange2('a','Z'));  -- should fail
 select multirange_of_text(textrange1('a','Z')) @> 'b'::text;
-select multirange_of_text(textrange1('a','b'), textrange1('d','e'))::textrange1[];
-select multirange_of_text()::textrange1[];
-select unnest(multirange_of_text(textrange1('a','b'), textrange1('d','e')));
 select _textrange1(textrange2('a','z')) @> 'b'::text;
 
 drop type textrange1;
diff --git a/src/test/regress/sql/opr_sanity.sql b/src/test/regress/sql/opr_sanity.sql
index 19497625f9a..5a9c4796923 100644
--- a/src/test/regress/sql/opr_sanity.sql
+++ b/src/test/regress/sql/opr_sanity.sql
@@ -127,8 +127,6 @@ WHERE p1.oid != p2.oid AND
     p2.prosrc NOT LIKE E'range\\_constructor_' AND
     p1.prosrc NOT LIKE E'multirange\\_constructor_' AND
     p2.prosrc NOT LIKE E'multirange\\_constructor_' AND
-    p1.prosrc != 'multirange_to_array' AND
-    p2.prosrc != 'multirange_to_array' AND
     (p1.prorettype < p2.prorettype)
 ORDER BY 1, 2;
 
@@ -142,8 +140,6 @@ WHERE p1.oid != p2.oid AND
     p2.prosrc NOT LIKE E'range\\_constructor_' AND
     p1.prosrc NOT LIKE E'multirange\\_constructor_' AND
     p2.prosrc NOT LIKE E'multirange\\_constructor_' AND
-    p1.prosrc != 'multirange_to_array' AND
-    p2.prosrc != 'multirange_to_array' AND
     (p1.proargtypes[0] < p2.proargtypes[0])
 ORDER BY 1, 2;
 
@@ -157,8 +153,6 @@ WHERE p1.oid != p2.oid AND
     p2.prosrc NOT LIKE E'range\\_constructor_' AND
     p1.prosrc NOT LIKE E'multirange\\_constructor_' AND
     p2.prosrc NOT LIKE E'multirange\\_constructor_' AND
-    p1.prosrc != 'multirange_to_array' AND
-    p2.prosrc != 'multirange_to_array' AND
     (p1.proargtypes[1] < p2.proargtypes[1])
 ORDER BY 1, 2;