postgres
diff --git a/‎src/backend/optimizer/prep/prepjointree.c
Lines changed: 4 additions & 1 deletion b/‎src/backend/optimizer/prep/prepjointree.c
Lines changed: 4 additions & 1 deletion
diff --git a/‎src/test/regress/expected/join.out
Lines changed: 8 additions & 0 deletions b/‎src/test/regress/expected/join.out
Lines changed: 8 additions & 0 deletions
diff --git a/‎src/test/regress/sql/join.sql
Lines changed: 3 additions & 0 deletions b/‎src/test/regress/sql/join.sql
Lines changed: 3 additions & 0 deletions
@@ -1808,10 +1808,13 @@ pull_up_constant_function(PlannerInfo *root, Node *jtnode,
 
 	/*
 	 * Convert the RTE to be RTE_RESULT type, signifying that we don't need to
-	 * scan it anymore, and zero out RTE_FUNCTION-specific fields.
+	 * scan it anymore, and zero out RTE_FUNCTION-specific fields.  Also make
+	 * sure the RTE is not marked LATERAL, since elsewhere we don't expect
+	 * RTE_RESULTs to be LATERAL.
 	 */
 	rte->rtekind = RTE_RESULT;
 	rte->functions = NIL;
+	rte->lateral = false;
 
 	/*
 	 * We can reuse the RangeTblRef node.
 
@@ -3469,6 +3469,14 @@ select unique1 from tenk1, lateral f_immutable_int4(1) x where x = unique1;
    Index Cond: (unique1 = 1)
 (2 rows)
 
+explain (costs off)
+select unique1 from tenk1, lateral f_immutable_int4(1) x where x in (select 17);
+        QUERY PLAN        
+--------------------------
+ Result
+   One-Time Filter: false
+(2 rows)
+
 explain (costs off)
 select unique1, x from tenk1 join f_immutable_int4(1) x on unique1 = x;
                   QUERY PLAN                  
 
@@ -1113,6 +1113,9 @@ select unique1 from tenk1, f_immutable_int4(1) x where x = unique1;
 explain (costs off)
 select unique1 from tenk1, lateral f_immutable_int4(1) x where x = unique1;
 
+explain (costs off)
+select unique1 from tenk1, lateral f_immutable_int4(1) x where x in (select 17);
+
 explain (costs off)
 select unique1, x from tenk1 join f_immutable_int4(1) x on unique1 = x;