Apply filter simplifications to Join condition

enginetest/enginetests.go

@@ -146,7 +146,8 @@ func TestSpatialQueriesPrepared(t *testing.T, harness Harness) {
 
 // TestJoinQueries tests join queries against a provided harness.
 func TestJoinQueries(t *testing.T, harness Harness) {
-	harness.Setup(setup.MydbData, setup.MytableData, setup.Pk_tablesData, setup.OthertableData, setup.NiltableData, setup.XyData, setup.FooData, setup.Comp_index_tablesData)
+	harness.Setup(setup.MydbData, setup.MytableData, setup.Pk_tablesData, setup.OthertableData, setup.NiltableData,
+		setup.XyData, setup.FooData, setup.Comp_index_tablesData, setup.EmptytableData)
 	e, err := harness.NewEngine(t)
 	require.NoError(t, err)
 
@@ -261,7 +262,8 @@ func TestQueriesPrepared(t *testing.T, harness Harness) {
 
 // TestJoinQueriesPrepared tests join queries as prepared statements against a provided harness.
 func TestJoinQueriesPrepared(t *testing.T, harness Harness) {
-	harness.Setup(setup.MydbData, setup.MytableData, setup.Pk_tablesData, setup.OthertableData, setup.NiltableData, setup.XyData, setup.FooData, setup.Comp_index_tablesData)
+	harness.Setup(setup.MydbData, setup.MytableData, setup.Pk_tablesData, setup.OthertableData, setup.NiltableData,
+		setup.XyData, setup.FooData, setup.Comp_index_tablesData, setup.EmptytableData)
 	for _, tt := range queries.JoinQueryTests {
 		if tt.Skip || tt.SkipPrepared {
 			continue

enginetest/queries/join_queries.go

@@ -801,6 +801,61 @@ on w = 0;`,
 		Query:    "select * from comp_index_t0 a join comp_index_t0 b join comp_index_t0 c on a.v2 = b.pk and b.v2 = c.pk and c.v2 = 5",
 		Expected: []sql.Row{},
 	},
+	{
+		Query: "select * from mytable join othertable on 3 >= 2 where mytable.i = 1 order by othertable.i2",
+		Expected: []sql.Row{
+			{1, "first row", "third", 1},
+			{1, "first row", "second", 2},
+			{1, "first row", "first", 3},
+		},
+	},
+	{
+		Query:    "select * from mytable join othertable on 3 < 2",
+		Expected: []sql.Row{},
+	},
+	{
+		Query: "select * from mytable left join emptytable on 3 >= 2",
+		Expected: []sql.Row{
+			{1, "first row", nil, nil},
+			{2, "second row", nil, nil},
+			{3, "third row", nil, nil},
+		},
+	},
+	{
+		Query: "select * from mytable left join othertable on 3 < 2",
+		Expected: []sql.Row{
+			{1, "first row", nil, nil},
+			{2, "second row", nil, nil},
+			{3, "third row", nil, nil},
+		},
+	},
+	{
+		Query: "select * from emptytable right join mytable on 3 >= 2",
+		Expected: []sql.Row{
+			{nil, nil, 1, "first row"},
+			{nil, nil, 2, "second row"},
+			{nil, nil, 3, "third row"},
+		},
+	},
+	{
+		Query: "select * from othertable right join mytable on 3 < 2",
+		Expected: []sql.Row{
+			{nil, nil, 1, "first row"},
+			{nil, nil, 2, "second row"},
+			{nil, nil, 3, "third row"},
+		},
+	},
+	{
+		Query: "select * from mytable full outer join othertable on 3 < 2",
+		Expected: []sql.Row{
+			{1, "first row", nil, nil},
+			{2, "second row", nil, nil},
+			{3, "third row", nil, nil},
+			{nil, nil, "first", 3},
+			{nil, nil, "second", 2},
+			{nil, nil, "third", 1},
+		},
+	},
 }
 
 var JoinScriptTests = []ScriptTest{