moar tests

test/sqllogictest/joins.slt

@@ -69,15 +69,35 @@ SELECT * FROM l JOIN r ON l.la = r.ra LIMIT 0
 ----
 la  lb  ra  rb
 
-# Test that with scalars introduced to join plans we still get the right answers.
-query ITITIT rowsort
-SELECT * FROM l as l1, l as l2, l as l3 WHERE l1.la + 1 = l2.la AND l3.la = l1.la + l2.la
+# Test that projections work through join plans with scalars.
+query ITT rowsort
+SELECT l1.la, l2.lb, l3.lb
+FROM l as l1, l as l2, l as l3
+WHERE l1.la + 1 = l2.la AND l3.la = l1.la + l2.la
 ----
-1  l1  2  l2  3  l3
+1  l2  l3
+
+# Test that join plans with scalars work in subqueries
+query IT rowsort
+SELECT l1.la, l1.lb
+FROM l as l1
+WHERE l1.la IN (
+    SELECT l2.la + 1
+    FROM l AS l2
+    WHERE l2.la IN (
+        SELECT l3.la + 1
+        FROM l as l3
+    )
+)
+----
+3  l3
 
 # Test that scalar expressions are introduced to join plans.
 query T multiline
-EXPLAIN PLAN FOR SELECT * FROM l as l1, l as l2, l as l3 WHERE l1.la + 1 = l2.la AND l3.la = l1.la + l2.la
+EXPLAIN PLAN FOR
+SELECT l1.la, l2.lb, l3.lb
+FROM l as l1, l as l2, l as l3
+WHERE l1.la + 1 = l2.la AND l3.la = l1.la + l2.la
 ----
 0 =
 | Get materialize.public.l (u1)
@@ -96,7 +116,8 @@ EXPLAIN PLAN FOR SELECT * FROM l as l1, l as l2, l as l3 WHERE l1.la + 1 = l2.la
 3 =
 | Join %0 %1 %2 (= #2 (#0 + 1)) (= #4 (#0 + #2))
 | | implementation = Differential %0 %1.(#0) %2.(#0)
-| | demand = (#0..#5)
+| | demand = (#0, #2, #3, #5)
 | Filter !(isnull((#0 + #2)))
+| Project (#0, #3, #5)
 
 EOF