Fix oversights in processing of LIMIT expressions during planning.

diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c
index 92a1c9df5f8d21238bab7a71fc0bfc6517141221..e0cc15fd6c37d2e8c97dec492ece1d4e73a69143 100644 (file)
--- a/src/backend/optimizer/plan/setrefs.c
+++ b/src/backend/optimizer/plan/setrefs.c
@@ -189,7 +189,6 @@ set_plan_references(Plan *plan, List *rtable)
                case T_Sort:
                case T_Unique:
                case T_SetOp:
-               case T_Limit:
 
                        /*
                         * These plan types don't actually bother to evaluate their
@@ -202,6 +201,15 @@ set_plan_references(Plan *plan, List *rtable)
                         * the plan tree!
                         */
                        break;
+               case T_Limit:
+                       /*
+                        * Like the plan types above, Limit doesn't evaluate its
+                        * tlist or quals.  It does have live expressions for
+                        * limit/offset, however.
+                        */
+                       fix_expr_references(plan, ((Limit *) plan)->limitOffset);
+                       fix_expr_references(plan, ((Limit *) plan)->limitCount);
+                       break;
                case T_Agg:
                case T_Group:
                        set_uppernode_references(plan, (Index) 0);

diff --git a/src/backend/optimizer/plan/subselect.c b/src/backend/optimizer/plan/subselect.c
index ff38958f02eb94af58e4838f2fda101f06d2fcc5..6ec24532392a2b8e90e7a04bc8b1e0fa43bf3b6b 100644 (file)
--- a/src/backend/optimizer/plan/subselect.c
+++ b/src/backend/optimizer/plan/subselect.c
@@ -1018,6 +1018,13 @@ finalize_plan(Plan *plan, List *rtable,
                                                          &context);
                        break;
 
+               case T_Limit:
+                       finalize_primnode(((Limit *) plan)->limitOffset,
+                                                         &context);
+                       finalize_primnode(((Limit *) plan)->limitCount,
+                                                         &context);
+                       break;
+
                case T_Hash:
                        finalize_primnode((Node *) ((Hash *) plan)->hashkeys,
                                                          &context);
@@ -1029,7 +1036,6 @@ finalize_plan(Plan *plan, List *rtable,
                case T_Sort:
                case T_Unique:
                case T_SetOp:
-               case T_Limit:
                case T_Group:
                        break;