Fix for regression tests delete, opr_sanity, typed_table and select

4 files changed, 7 insertions, 40 deletions

diff --git a/src/test/regress/expected/delete_1.out b/src/test/regress/expected/delete_1.out
index ec6d4a4350..e412aa2dc4 100644
--- a/src/test/regress/expected/delete_1.out
+++ b/src/test/regress/expected/delete_1.out
@@ -27,11 +27,9 @@ DELETE FROM delete_test dt WHERE delete_test.a > 25;
 ERROR:  relation "delete_test" does not exist
 LINE 1: DELETE FROM delete_test dt WHERE delete_test.a > 25;
                     ^
-SELECT * FROM delete_test;
+SELECT * FROM delete_test ORDER BY id;
 ERROR:  relation "delete_test" does not exist
-LINE 1: SELECT * FROM delete_test;
+LINE 1: SELECT * FROM delete_test ORDER BY id;
                       ^
-DROP TABLE delete_test ORDER BY id;
-ERROR:  syntax error at or near "ORDER"
-LINE 1: DROP TABLE delete_test ORDER BY id;
-                               ^
+DROP TABLE delete_test;
+ERROR:  table "delete_test" does not exist
diff --git a/src/test/regress/expected/opr_sanity_1.out b/src/test/regress/expected/opr_sanity_1.out
index bf70944e26..1f06399294 100644
--- a/src/test/regress/expected/opr_sanity_1.out
+++ b/src/test/regress/expected/opr_sanity_1.out
@@ -665,8 +665,9 @@ WHERE p.proisagg AND
  oid  |  proname   
 ------+------------
  2335 | array_agg
+ 3537 | string_agg
  3538 | string_agg
-(2 rows)
+(3 rows)
 
 -- If there is no finalfn then the output type must be the transtype.
 SELECT a.aggfnoid::oid, p.proname
@@ -775,31 +776,6 @@ ORDER BY 1, 2;
  min     | <       |            1
 (2 rows)
 
--- Check that there are not aggregates with the same name and different
--- numbers of arguments.  While not technically wrong, we have a project policy
--- to avoid this because it opens the door for confusion in connection with
--- ORDER BY: novices frequently put the ORDER BY in the wrong place.
--- See the fate of the single-argument form of string_agg() for history.
--- The only aggregates that should show up here are count(x) and count(*).
-SELECT p1.oid::regprocedure, p2.oid::regprocedure
-FROM pg_proc AS p1, pg_proc AS p2
-WHERE p1.oid < p2.oid AND p1.proname = p2.proname AND
-    p1.proisagg AND p2.proisagg AND
-    array_dims(p1.proargtypes) != array_dims(p2.proargtypes)
-ORDER BY 1;
-     oid      |   oid   
---------------+---------
- count("any") | count()
-(1 row)
-
--- For the same reason, aggregates with default arguments are no good.
-SELECT oid, proname
-FROM pg_proc AS p
-WHERE proisagg AND proargdefaults IS NOT NULL;
- oid | proname 
------+---------
-(0 rows)
-
 -- **************** pg_opfamily ****************
 -- Look for illegal values in pg_opfamily fields
 SELECT p1.oid
diff --git a/src/test/regress/expected/typed_table_1.out b/src/test/regress/expected/typed_table_1.out
index 0f6a208c44..b9b0557e8b 100644
--- a/src/test/regress/expected/typed_table_1.out
+++ b/src/test/regress/expected/typed_table_1.out
@@ -25,18 +25,12 @@ SELECT * FROM get_all_persons();
 ----+------
 (0 rows)
 
--- certain ALTER TABLE operations on typed tables are not allowed
 ALTER TABLE persons ADD COLUMN comment text;
 ERROR:  cannot add column to typed table
 ALTER TABLE persons DROP COLUMN name;
 ERROR:  cannot drop column from typed table
 ALTER TABLE persons RENAME COLUMN id TO num;
 ERROR:  cannot rename column of typed table
-ALTER TABLE persons ALTER COLUMN name TYPE varchar;
-ERROR:  cannot alter column type of typed table
-CREATE TABLE stuff (id int);
-ALTER TABLE persons INHERIT stuff;
-ERROR:  cannot change inheritance of typed table
 CREATE TABLE personsx OF person_type (myname WITH OPTIONS NOT NULL); -- error
 ERROR:  column "myname" does not exist
 CREATE TABLE persons2 OF person_type (
@@ -77,4 +71,3 @@ NOTICE:  drop cascades to 3 other objects
 DETAIL:  drop cascades to table persons
 drop cascades to function get_all_persons()
 drop cascades to table persons3
-DROP TABLE stuff;
diff --git a/src/test/regress/sql/select.sql b/src/test/regress/sql/select.sql
index a95329d734..8dd35d60ed 100644
--- a/src/test/regress/sql/select.sql
+++ b/src/test/regress/sql/select.sql
@@ -211,4 +211,4 @@ drop function sillysrf(int);
 -- X = X isn't a no-op, it's effectively X IS NOT NULL assuming = is strict
 -- (see bug #5084)
 select * from (values (2),(null),(1)) v(k) where k = k order by k;
-select * from (values (2),(null),(1)) v(k) where k = k;
+select * from (values (2),(null),(1)) v(k) where k = k order by k desc;