Fix table name collision in tests in 0452b461bc

diff --git a/src/test/regress/expected/aggregates.out b/src/test/regress/expected/aggregates.out
index 67dd20f37519b83b7451367190a2881278ecc5ba..ac42b94ef1072d50a92ad30f0f6a8f32075f3b56 100644 (file)
--- a/src/test/regress/expected/aggregates.out
+++ b/src/test/regress/expected/aggregates.out
@@ -2876,26 +2876,26 @@ RESET enable_incremental_sort;
 DROP TABLE btg;
 -- The case, when scanning sort order correspond to aggregate sort order but
 -- can not be found in the group-by list
-CREATE TABLE t1 (c1 int PRIMARY KEY, c2 int);
-CREATE UNIQUE INDEX ON t1(c2);
+CREATE TABLE agg_sort_order (c1 int PRIMARY KEY, c2 int);
+CREATE UNIQUE INDEX ON agg_sort_order(c2);
 explain (costs off)
 SELECT array_agg(c1 ORDER BY c2),c2
-FROM t1 WHERE c2 < 100 GROUP BY c1 ORDER BY 2;
-                       QUERY PLAN                       
---------------------------------------------------------
+FROM agg_sort_order WHERE c2 < 100 GROUP BY c1 ORDER BY 2;
+                             QUERY PLAN                             
+--------------------------------------------------------------------
  Sort
    Sort Key: c2
    ->  GroupAggregate
          Group Key: c1
          ->  Sort
                Sort Key: c1, c2
-               ->  Bitmap Heap Scan on t1
+               ->  Bitmap Heap Scan on agg_sort_order
                      Recheck Cond: (c2 < 100)
-                     ->  Bitmap Index Scan on t1_c2_idx
+                     ->  Bitmap Index Scan on agg_sort_order_c2_idx
                            Index Cond: (c2 < 100)
 (10 rows)
 
-DROP TABLE t1 CASCADE;
+DROP TABLE agg_sort_order CASCADE;
 -- Check, that GROUP-BY reordering optimization can operate with pathkeys, built
 -- by planner itself. For example, by MergeJoin.
 SET enable_hashjoin = off;

diff --git a/src/test/regress/sql/aggregates.sql b/src/test/regress/sql/aggregates.sql
index 524bdfa67d61f587e80f83219a53a7654b9a9655..c2b3e162267b06c24e50135ca04b7fab609e8f78 100644 (file)
--- a/src/test/regress/sql/aggregates.sql
+++ b/src/test/regress/sql/aggregates.sql
@@ -1233,12 +1233,12 @@ DROP TABLE btg;
 
 -- The case, when scanning sort order correspond to aggregate sort order but
 -- can not be found in the group-by list
-CREATE TABLE t1 (c1 int PRIMARY KEY, c2 int);
-CREATE UNIQUE INDEX ON t1(c2);
+CREATE TABLE agg_sort_order (c1 int PRIMARY KEY, c2 int);
+CREATE UNIQUE INDEX ON agg_sort_order(c2);
 explain (costs off)
 SELECT array_agg(c1 ORDER BY c2),c2
-FROM t1 WHERE c2 < 100 GROUP BY c1 ORDER BY 2;
-DROP TABLE t1 CASCADE;
+FROM agg_sort_order WHERE c2 < 100 GROUP BY c1 ORDER BY 2;
+DROP TABLE agg_sort_order CASCADE;
 
 -- Check, that GROUP-BY reordering optimization can operate with pathkeys, built
 -- by planner itself. For example, by MergeJoin.