Fix regression test following core's behavior

Some changes has been made on GUC default value and behavior. Follow
the change. No change was made on pg_hint_plan's behavior.

diff --git a/expected/pg_hint_plan.out b/expected/pg_hint_plan.out
index c462cf8..433c9d6 100644 (file)
--- a/expected/pg_hint_plan.out
+++ b/expected/pg_hint_plan.out
@@ -2999,6 +2999,7 @@ error hint:
    ->  Index Scan using t2_pkey on t2
 (4 rows)
 
+-- Cannot work
 /*+NestLoop(t1 t2)*/
 EXPLAIN (COSTS false) SELECT * FROM t1 FULL OUTER JOIN  t2 ON (t1.id = t2.id);
 LOG:  pg_hint_plan:
@@ -3011,10 +3012,10 @@ error hint:
           QUERY PLAN          
 ------------------------------
  Hash Full Join
-   Hash Cond: (t2.id = t1.id)
-   ->  Seq Scan on t2
+   Hash Cond: (t1.id = t2.id)
+   ->  Seq Scan on t1
    ->  Hash
-         ->  Seq Scan on t1
+         ->  Seq Scan on t2
 (5 rows)
 
 -- inheritance tables test

diff --git a/expected/ut-S.out b/expected/ut-S.out
index 07ffe41..27859d0 100644 (file)
--- a/expected/ut-S.out
+++ b/expected/ut-S.out
@@ -4632,14 +4632,15 @@ error hint:
 ---- No. S-3-6 query structure
 ----
 EXPLAIN (COSTS false) SELECT * FROM s1.t1, s1.t2 WHERE t1.c1 = t2.c1 AND t1.ctid = '(1,1)';
-               QUERY PLAN                
------------------------------------------
- Nested Loop
-   Join Filter: (t1.c1 = t2.c1)
-   ->  Tid Scan on t1
-         TID Cond: (ctid = '(1,1)'::tid)
+                  QUERY PLAN                   
+-----------------------------------------------
+ Hash Join
+   Hash Cond: (t2.c1 = t1.c1)
    ->  Seq Scan on t2
-(5 rows)
+   ->  Hash
+         ->  Tid Scan on t1
+               TID Cond: (ctid = '(1,1)'::tid)
+(6 rows)
 
 -- No. S-3-6-1
 /*+SeqScan(t1)*/

diff --git a/sql/pg_hint_plan.sql b/sql/pg_hint_plan.sql
index b7dc394..f8172b2 100644 (file)
--- a/sql/pg_hint_plan.sql
+++ b/sql/pg_hint_plan.sql
@@ -336,6 +336,7 @@ EXPLAIN (COSTS false) SELECT * FROM t1, t2 WHERE t1.id = t2.id AND t1.ctid = '(1
 EXPLAIN (COSTS false) SELECT * FROM t1 FULL OUTER JOIN  t2 ON (t1.id = t2.id);
 /*+MergeJoin(t1 t2)*/
 EXPLAIN (COSTS false) SELECT * FROM t1 FULL OUTER JOIN  t2 ON (t1.id = t2.id);
+-- Cannot work
 /*+NestLoop(t1 t2)*/
 EXPLAIN (COSTS false) SELECT * FROM t1 FULL OUTER JOIN  t2 ON (t1.id = t2.id);