Merge branch 'master' into kyle/docs-reorg-one

Author: kyleconroy

internal/endtoend/testdata/update_inner_join/db/db.go

@@ -0,0 +1,12 @@
+CREATE TABLE x (
+  a   text,
+  b   text
+);
+
+CREATE TABLE y (
+  a   text,
+  b   text
+);
+
+-- name: UpdateXWithY :exec
+UPDATE x INNER JOIN y ON y.a = x.a SET x.b = y.b;

internal/endtoend/testdata/update_inner_join/db/models.go

@@ -0,0 +1,11 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "db",
+      "engine": "mysql",
+      "schema": "query.sql",
+      "queries": "query.sql"
+    }
+  ]
+}

internal/endtoend/testdata/update_inner_join/db/query.sql.go

@@ -466,16 +466,29 @@ func (c *cc) convertTableRefsClause(n *pcast.TableRefsClause) *ast.List {
 }
 
 func (c *cc) convertUpdateStmt(n *pcast.UpdateStmt) *ast.UpdateStmt {
-	// Relation
 	rels := c.convertTableRefsClause(n.TableRefs)
 	if len(rels.Items) != 1 {
 		panic("expected one range var")
 	}
-	rel := rels.Items[0]
-	rangeVar, ok := rel.(*ast.RangeVar)
-	if !ok {
+
+	var rangeVar *ast.RangeVar
+	switch rel := rels.Items[0].(type) {
+
+	// Special case for joins in updates
+	case *ast.JoinExpr:
+		left, ok := rel.Larg.(*ast.RangeVar)
+		if !ok {
+			panic("expected range var")
+		}
+		rangeVar = left
+
+	case *ast.RangeVar:
+		rangeVar = rel
+
+	default:
 		panic("expected range var")
 	}
+
 	// TargetList
 	list := &ast.List{}
 	for _, a := range n.List {