leave aliases in projection

enginetest/enginetests.go

@@ -233,14 +233,23 @@ func TestQueriesPrepared(t *testing.T, harness Harness) {
 func TestJoinQueriesPrepared(t *testing.T, harness Harness) {
 	harness.Setup(setup.MydbData, setup.MytableData, setup.Pk_tablesData, setup.OthertableData, setup.NiltableData, setup.XyData)
 	for _, tt := range queries.JoinQueryTests {
+		if tt.SkipPrepared {
+			continue
+		}
 		TestPreparedQuery(t, harness, tt.Query, tt.Expected, tt.ExpectedColumns)
 	}
 	for _, ts := range queries.JoinScriptTests {
+		if ts.SkipPrepared {
+			continue
+		}
 		TestScriptPrepared(t, harness, ts)
 	}
 
 	t.Skip()
 	for _, tt := range queries.SkippedJoinQueryTests {
+		if tt.SkipPrepared {
+			continue
+		}
 		TestPreparedQuery(t, harness, tt.Query, tt.Expected, tt.ExpectedColumns)
 	}
 }

enginetest/queries/join_queries.go

@@ -565,6 +565,21 @@ inner join pq on true order by 1,2,3,4,5,6,7,8 limit 5;`,
 			{1, "first row", 6, 6, 0, float64(6)},
 		},
 	},
+	{
+		//SkipPrepared: true,
+		Query: `SELECT pk as pk, nt.i  as i, nt2.i as i FROM one_pk
+						RIGHT JOIN niltable nt ON pk=nt.i
+						RIGHT JOIN niltable nt2 ON pk=nt2.i - 1
+						ORDER BY 3;`,
+		Expected: []sql.Row{
+			{nil, nil, 1},
+			{1, 1, 2},
+			{2, 2, 3},
+			{3, 3, 4},
+			{nil, nil, 5},
+			{nil, nil, 6},
+		},
+	},
 	{
 		Query: "select * from ab full join pq on a = p order by 1,2,3,4;",
 		Expected: []sql.Row{

enginetest/queries/queries.go

@@ -763,9 +763,9 @@ var QueryTests = []QueryTest{
 	{
 		Query: `SELECT s as i, i as i from mytable order by 1`,
 		Expected: []sql.Row{
-			{"first row", "first row"},
-			{"second row", "second row"},
-			{"third row", "third row"},
+			{"first row", 1},
+			{"second row", 2},
+			{"third row", 3},
 		},
 	},
 	{