Make WHERE conditions pulled up from subqueries be executed before outer

WHERE conditions, if there is no reason to do it differently.

diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 6a49603fcf6488a31a4a53c2077d60ab8bf3d677..9cdfc0ee7158b8841136b1f0fe0724bfdfa30e22 100644 (file)
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -656,7 +656,7 @@ preprocess_jointree(Query *parse, Node *jtnode)
                                if (childlen <= 1 || (childlen + myothers) <= geqo_rels / 2)
                                {
                                        newlist = nconc(newlist, subf->fromlist);
-                                       f->quals = make_and_qual(f->quals, subf->quals);
+                                       f->quals = make_and_qual(subf->quals, f->quals);
                                }
                                else
                                        newlist = lappend(newlist, child);