Fix for regression tests cluster, dependency, rowtypes and with

4 files changed, 6 insertions, 44 deletions

diff --git a/src/test/regress/expected/cluster_1.out b/src/test/regress/expected/cluster_1.out
index 71eca00f94..30e2a96d3f 100644
--- a/src/test/regress/expected/cluster_1.out
+++ b/src/test/regress/expected/cluster_1.out
@@ -380,9 +380,9 @@ LINE 1: insert into clstr_temp values (2, 'two'), (1, 'one');
                     ^
 cluster clstr_temp using clstr_temp_pkey;
 ERROR:  relation "clstr_temp" does not exist
-select * from clstr_temp  ORDER BY 1;
+select * from clstr_temp;
 ERROR:  relation "clstr_temp" does not exist
-LINE 1: select * from clstr_temp  ORDER BY 1;
+LINE 1: select * from clstr_temp;
                       ^
 drop table clstr_temp;
 ERROR:  table "clstr_temp" does not exist
diff --git a/src/test/regress/expected/dependency_1.out b/src/test/regress/expected/dependency_1.out
index 827f442672..f7ca7f6c0e 100644
--- a/src/test/regress/expected/dependency_1.out
+++ b/src/test/regress/expected/dependency_1.out
@@ -116,7 +116,7 @@ REASSIGN OWNED BY regression_user1 TO regression_user2;
 -- doesn't work: grant still exists
 DROP USER regression_user1;
 ERROR:  role "regression_user1" cannot be dropped because some objects depend on it
-DETAIL:  privileges for table deptest1
+DETAIL:  access to table deptest1
 DROP OWNED BY regression_user1;
 DROP USER regression_user1;
 \set VERBOSITY terse
diff --git a/src/test/regress/expected/rowtypes_1.out b/src/test/regress/expected/rowtypes_1.out
index a6e532a21c..514adfe28f 100644
--- a/src/test/regress/expected/rowtypes_1.out
+++ b/src/test/regress/expected/rowtypes_1.out
@@ -283,41 +283,3 @@ select row(1,1.1) = any (array[ row(7,7.7), row(1,1.0), row(0,0.0) ]);
  f
 (1 row)
 
---
--- Test case derived from bug #5716: check multiple uses of a rowtype result
---
-BEGIN;
-CREATE TABLE price (
-    id SERIAL PRIMARY KEY,
-    active BOOLEAN NOT NULL,
-    price NUMERIC
-);
-ERROR:  Postgres-XC does not support SERIAL yet
-DETAIL:  The feature is not currently supported
-CREATE TYPE price_input AS (
-    id INTEGER,
-    price NUMERIC
-);
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-CREATE TYPE price_key AS (
-    id INTEGER
-);
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-CREATE FUNCTION price_key_from_table(price) RETURNS price_key AS $$
-    SELECT $1.id
-$$ LANGUAGE SQL;
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-CREATE FUNCTION price_key_from_input(price_input) RETURNS price_key AS $$
-    SELECT $1.id
-$$ LANGUAGE SQL;
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-insert into price values (1,false,42), (10,false,100), (11,true,17.99);
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-UPDATE price
-    SET active = true, price = input_prices.price
-    FROM unnest(ARRAY[(10, 123.00), (11, 99.99)]::price_input[]) input_prices
-    WHERE price_key_from_table(price.*) = price_key_from_input(input_prices.*);
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-select * from price;
-ERROR:  current transaction is aborted, commands ignored until end of transaction block
-rollback;
diff --git a/src/test/regress/sql/with.sql b/src/test/regress/sql/with.sql
index c6bb359ac9..687c035e31 100644
--- a/src/test/regress/sql/with.sql
+++ b/src/test/regress/sql/with.sql
@@ -480,11 +480,11 @@ with cte(foo) as ( select 42 ) select * from ((select foo from cte)) q;
 -- signaling still works properly after fixing this bug)
 select ( with cte(foo) as ( values(f1) )
          select (select foo from cte) )
-from int4_tbl;
+from int4_tbl order by 1;
 
 select ( with cte(foo) as ( values(f1) )
           values((select foo from cte)) )
-from int4_tbl;
+from int4_tbl order by 1;
 
 --
 -- test for nested-recursive-WITH bug
@@ -499,4 +499,4 @@ WITH RECURSIVE t(j) AS (
     UNION ALL
     SELECT j+1 FROM t WHERE j < 10
 )
-SELECT * FROM t;
+SELECT * FROM t order by 1;