diff --git a/internal/endtoend/testdata/update_two_table/mysql/go/db.go b/internal/endtoend/testdata/update_two_table/mysql/go/db.go
new file mode 100644
index 0000000000..02974bda59
--- /dev/null
+++ b/internal/endtoend/testdata/update_two_table/mysql/go/db.go
@@ -0,0 +1,31 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.17.2
+
+package querytest
+
+import (
+	"context"
+	"database/sql"
+)
+
+type DBTX interface {
+	ExecContext(context.Context, string, ...interface{}) (sql.Result, error)
+	PrepareContext(context.Context, string) (*sql.Stmt, error)
+	QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error)
+	QueryRowContext(context.Context, string, ...interface{}) *sql.Row
+}
+
+func New(db DBTX) *Queries {
+	return &Queries{db: db}
+}
+
+type Queries struct {
+	db DBTX
+}
+
+func (q *Queries) WithTx(tx *sql.Tx) *Queries {
+	return &Queries{
+		db: tx,
+	}
+}
diff --git a/internal/endtoend/testdata/update_two_table/mysql/go/models.go b/internal/endtoend/testdata/update_two_table/mysql/go/models.go
new file mode 100644
index 0000000000..56be609dcb
--- /dev/null
+++ b/internal/endtoend/testdata/update_two_table/mysql/go/models.go
@@ -0,0 +1,23 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.17.2
+
+package querytest
+
+import (
+	"time"
+)
+
+type Author struct {
+	Name      string
+	DeletedAt time.Time
+	CreatedAt time.Time
+	UpdatedAt time.Time
+}
+
+type Book struct {
+	IsAmazing bool
+	DeletedAt time.Time
+	CreatedAt time.Time
+	UpdatedAt time.Time
+}
diff --git a/internal/endtoend/testdata/update_two_table/mysql/go/query.sql.go b/internal/endtoend/testdata/update_two_table/mysql/go/query.sql.go
new file mode 100644
index 0000000000..6d960f030d
--- /dev/null
+++ b/internal/endtoend/testdata/update_two_table/mysql/go/query.sql.go
@@ -0,0 +1,27 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.17.2
+// source: query.sql
+
+package querytest
+
+import (
+	"context"
+)
+
+const deleteAuthor = `-- name: DeleteAuthor :exec
+UPDATE
+  authors,
+  books
+SET
+  authors.deleted_at = now(),
+  books.deleted_at = now()
+WHERE
+  books.is_amazing = 1
+  AND authors.name = ?
+`
+
+func (q *Queries) DeleteAuthor(ctx context.Context, name string) error {
+	_, err := q.db.ExecContext(ctx, deleteAuthor, name)
+	return err
+}
diff --git a/internal/endtoend/testdata/update_two_table/mysql/query.sql b/internal/endtoend/testdata/update_two_table/mysql/query.sql
new file mode 100644
index 0000000000..1d8f9dd1e8
--- /dev/null
+++ b/internal/endtoend/testdata/update_two_table/mysql/query.sql
@@ -0,0 +1,25 @@
+-- https://github.com/kyleconroy/sqlc/issues/1590
+CREATE TABLE authors (
+  name text NOT NULL,
+  deleted_at datetime NOT NULL,
+  created_at datetime NOT NULL,
+  updated_at datetime NOT NULL
+);
+
+CREATE TABLE books (
+  is_amazing tinyint(1) NOT NULL,
+  deleted_at datetime NOT NULL,
+  created_at datetime NOT NULL,
+  updated_at datetime NOT NULL
+);
+
+-- name: DeleteAuthor :exec
+UPDATE
+  authors,
+  books
+SET
+  authors.deleted_at = now(),
+  books.deleted_at = now()
+WHERE
+  books.is_amazing = 1
+  AND authors.name = sqlc.arg(name);
\ No newline at end of file
diff --git a/internal/endtoend/testdata/update_two_table/mysql/sqlc.json b/internal/endtoend/testdata/update_two_table/mysql/sqlc.json
new file mode 100644
index 0000000000..445bbd1589
--- /dev/null
+++ b/internal/endtoend/testdata/update_two_table/mysql/sqlc.json
@@ -0,0 +1,12 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "engine": "mysql",
+      "name": "querytest",
+      "schema": "query.sql",
+      "queries": "query.sql"
+    }
+  ]
+}
diff --git a/internal/engine/dolphin/convert.go b/internal/engine/dolphin/convert.go
index 744eb538e8..e38aefe4a5 100644
--- a/internal/engine/dolphin/convert.go
+++ b/internal/engine/dolphin/convert.go
@@ -565,28 +565,7 @@ func (c *cc) convertUpdateStmt(n *pcast.UpdateStmt) *ast.UpdateStmt {
 	}
 
 	relations := &ast.List{}
-	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")
-		}
-		relations.Items = append(relations.Items, left)
-
-		right, ok := rel.Rarg.(*ast.RangeVar)
-		if !ok {
-			panic("expected range var")
-		}
-		relations.Items = append(relations.Items, right)
-
-	case *ast.RangeVar:
-		relations.Items = append(relations.Items, rel)
-
-	default:
-		panic("expected range var")
-	}
+	convertToRangeVarList(rels, relations)
 
 	// TargetList
 	list := &ast.List{}
diff --git a/internal/engine/dolphin/utils.go b/internal/engine/dolphin/utils.go
index d39d189afc..8284785c93 100644
--- a/internal/engine/dolphin/utils.go
+++ b/internal/engine/dolphin/utils.go
@@ -96,3 +96,43 @@ func isNotNull(n *pcast.ColumnDef) bool {
 	}
 	return false
 }
+
+func convertToRangeVarList(list *ast.List, result *ast.List) {
+	if len(list.Items) == 0 {
+		return
+	}
+	switch rel := list.Items[0].(type) {
+
+	// Special case for joins in updates
+	case *ast.JoinExpr:
+		left, ok := rel.Larg.(*ast.RangeVar)
+		if !ok {
+			if list, check := rel.Larg.(*ast.List); check {
+				convertToRangeVarList(list, result)
+			} else {
+				panic("expected range var")
+			}
+		}
+		if left != nil {
+			result.Items = append(result.Items, left)
+		}
+
+		right, ok := rel.Rarg.(*ast.RangeVar)
+		if !ok {
+			if list, check := rel.Rarg.(*ast.List); check {
+				convertToRangeVarList(list, result)
+			} else {
+				panic("expected range var")
+			}
+		}
+		if right != nil {
+			result.Items = append(result.Items, right)
+		}
+
+	case *ast.RangeVar:
+		result.Items = append(result.Items, rel)
+
+	default:
+		panic("expected range var")
+	}
+}