Make some update queries determinate (#593)

Fix some query tests

Author: Vinai Rachakonda

enginetest/update_queries.go

@@ -221,15 +221,15 @@ var UpdateTests = []WriteQueryTest{
 		},
 	},
 	{
-		WriteQuery:          `UPDATE one_pk INNER JOIN (SELECT * FROM two_pk) as t2 on one_pk.pk = t2.pk1 SET one_pk.c1 = t2.c1 + 1 where one_pk.pk < 1`,
+		WriteQuery:          `UPDATE one_pk INNER JOIN (SELECT * FROM two_pk order by pk1, pk2) as t2 on one_pk.pk = t2.pk1 SET one_pk.c1 = t2.c1 + 1 where one_pk.pk < 1`,
 		ExpectedWriteResult: []sql.Row{{newUpdateResult(1, 1)}},
 		SelectQuery:         "SELECT * FROM one_pk where pk < 1",
 		ExpectedSelect: []sql.Row{
 			sql.NewRow(0, 1, 1, 2, 3, 4),
 		},
 	},
 	{
-		WriteQuery:          `UPDATE one_pk INNER JOIN (SELECT * FROM two_pk) as t2 on one_pk.pk = t2.pk1 SET one_pk.c1 = one_pk.c1 + 1`,
+		WriteQuery:          `UPDATE one_pk INNER JOIN two_pk on one_pk.pk = two_pk.pk1 SET one_pk.c1 = one_pk.c1 + 1`,
 		ExpectedWriteResult: []sql.Row{{newUpdateResult(2, 2)}},
 		SelectQuery:         "SELECT * FROM one_pk;",
 		ExpectedSelect: []sql.Row{
@@ -240,7 +240,7 @@ var UpdateTests = []WriteQueryTest{
 		},
 	},
 	{
-		WriteQuery:          `UPDATE one_pk INNER JOIN (SELECT * FROM two_pk) as t2 on one_pk.pk = t2.pk1 SET one_pk.c1 = one_pk.c1 + 1, one_pk.c2 = one_pk.c2 + 1`,
+		WriteQuery:          `UPDATE one_pk INNER JOIN two_pk on one_pk.pk = two_pk.pk1 SET one_pk.c1 = one_pk.c1 + 1, one_pk.c2 = one_pk.c2 + 1 ORDER BY one_pk.pk`,
 		ExpectedWriteResult: []sql.Row{{newUpdateResult(2, 2)}},
 		SelectQuery:         "SELECT * FROM one_pk;",
 		ExpectedSelect: []sql.Row{

sql/plan/join.go

@@ -709,3 +709,18 @@ func makeNullable(cols []*sql.Column) []*sql.Column {
 	}
 	return result
 }
+
+func nodeHasJoin(node sql.Node) bool {
+	hasJoinNode := false
+	Inspect(node, func(node sql.Node) bool {
+		switch node.(type) {
+		case JoinNode:
+			hasJoinNode = true
+			return false
+		default:
+			return true
+		}
+	})
+
+	return hasJoinNode
+}

sql/plan/update_source.go

@@ -123,8 +123,8 @@ func (u *updateSourceIter) Close(ctx *sql.Context) error {
 }
 
 func (u *UpdateSource) getChildSchema() (sql.Schema, error) {
-	if j, ok := u.Child.(JoinNode); ok {
-		return j.Schema(), nil
+	if nodeHasJoin(u.Child) {
+		return u.Child.Schema(), nil
 	}
 
 	table, err := getUpdatable(u.Child)