use entire lateral scope when indexing RangeHeapJoin

enginetest/queries/queries.go

@@ -8655,6 +8655,12 @@ from typestable`,
 			{3, "third row"},
 		},
 	},
+	{
+		Query: "select * from (select 'k' as k) sq join bigtable on t = k join xy where x between n and n;",
+		Expected: []sql.Row{
+			{"k", "k", 1, 1, 0},
+		},
+	},
 }
 
 var KeylessQueries = []QueryTest{

enginetest/queries/script_queries.go

@@ -4880,6 +4880,29 @@ CREATE TABLE tab3 (
 			},
 		},
 	},
+	{
+		Name: "subquery with range heap join",
+		SetUpScript: []string{
+			"create table a (i int primary key, start int, end int, name varchar(32));",
+			"insert into a values (1, 603000, 605001, 'test');",
+			"create table b (i int primary key);",
+			"insert into b values (600000), (605000), (608000);",
+		},
+		Assertions: []ScriptTestAssertion{
+			{
+				Query: "select a.i from (select 'test' as name) sq join a on sq.name = a.name join b on b.i between a.start and a.end;",
+				Expected: []sql.Row{
+					{1},
+				},
+			},
+			{
+				Query: "select * from (select 'test' as name, 1 as x, 2 as y, 3 as z) sq join a on sq.name = a.name join b on b.i between a.start and a.end;",
+				Expected: []sql.Row{
+					{"test", 1, 2, 3, 1, 603000, 605001, "test", 605000},
+				},
+			},
+		},
+	},
 }
 
 var SpatialScriptTests = []ScriptTest{

sql/analyzer/fix_exec_indexes.go

@@ -259,9 +259,8 @@ func (s *idxScope) visitSelf(n sql.Node) error {
 			s.expressions = append(s.expressions, fixExprToScope(e, scopes...))
 		}
 	case *plan.RangeHeap:
-		siblingScope := s.lateralScopes[len(s.lateralScopes)-1]
 		// value indexes other side of join
-		newValue := fixExprToScope(n.ValueColumnGf, siblingScope)
+		newValue := fixExprToScope(n.ValueColumnGf, s.lateralScopes...)
 		// min/are this child
 		newMin := fixExprToScope(n.MinColumnGf, s.childScopes...)
 		newMax := fixExprToScope(n.MaxColumnGf, s.childScopes...)