fix:delete inner join panic

Author: nusr

Makefile

@@ -46,3 +46,5 @@ mysqlsh:
 
 proto:
 	buf generate
+test-internal:
+	go build -o sqlc.exe .\cmd\sqlc\ && .\sqlc.exe generate -f .\internal\endtoend\testdata\delete_inner_join\sqlite\sqlc.json

internal/compiler/output_columns.go

@@ -404,9 +404,7 @@ func sourceTables(qc *QueryCatalog, node ast.Node) ([]*Table, error) {
 	var list *ast.List
 	switch n := node.(type) {
 	case *ast.DeleteStmt:
-		list = &ast.List{
-			Items: []ast.Node{n.Relation},
-		}
+		list = n.Relations
 	case *ast.InsertStmt:
 		list = &ast.List{
 			Items: []ast.Node{n.Relation},

internal/endtoend/testdata/delete_inner_join/mysql/go/db.go

@@ -0,0 +1,24 @@
+CREATE TABLE author (
+  id   INT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
+  name VARCHAR(255) NOT NULL
+);
+
+CREATE TABLE book (
+  id    INT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
+  title VARCHAR(255) NOT NULL
+);
+
+CREATE TABLE author_book
+(
+    author_id   INT UNSIGNED NOT NULL,
+    book_id     INT UNSIGNED NOT NULL,
+    CONSTRAINT `pk-author_book` PRIMARY KEY (author_id, book_id),
+    CONSTRAINT `fk-author_book-author-id` FOREIGN KEY (author_id) REFERENCES author (id),
+    CONSTRAINT `fk-author_book-book-id` FOREIGN KEY (book_id) REFERENCES book (id)
+);
+
+/* name: RemoveAllAuthorsFromTheGreatGatsby :exec */
+DELETE author_book
+FROM author_book
+INNER JOIN book ON book.id = author_book.book_id
+WHERE book.title = 'The Great Gatsby';

internal/endtoend/testdata/delete_inner_join/mysql/go/models.go

@@ -0,0 +1,12 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "engine": "mysql",
+      "path": "go",
+      "name": "querytest",
+      "schema": "query.sql",
+      "queries": "query.sql"
+    }
+  ]
+}

internal/endtoend/testdata/delete_inner_join/mysql/go/query.sql.go

@@ -0,0 +1,24 @@
+CREATE TABLE author (
+  id   INT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
+  name VARCHAR(255) NOT NULL
+);
+
+CREATE TABLE book (
+  id    INT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
+  title VARCHAR(255) NOT NULL
+);
+
+CREATE TABLE author_book
+(
+    author_id   INT UNSIGNED NOT NULL,
+    book_id     INT UNSIGNED NOT NULL,
+    CONSTRAINT `pk-author_book` PRIMARY KEY (author_id, book_id),
+    CONSTRAINT `fk-author_book-author-id` FOREIGN KEY (author_id) REFERENCES author (id),
+    CONSTRAINT `fk-author_book-book-id` FOREIGN KEY (book_id) REFERENCES book (id)
+);
+
+-- name: RemoveAllAuthorsFromTheGreatGatsby
+DELETE author_book
+FROM author_book
+INNER JOIN book ON book.id = author_book.book_id
+WHERE book.title = 'The Great Gatsby';

internal/endtoend/testdata/delete_inner_join/mysql/query.sql

@@ -0,0 +1,12 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "engine": "postgresql",
+      "name": "querytest",
+      "schema": "query.sql",
+      "queries": "query.sql"
+    }
+  ]
+}

internal/endtoend/testdata/delete_inner_join/mysql/sqlc.json

@@ -318,14 +318,11 @@ func (c *cc) convertDeleteStmt(n *pcast.DeleteStmt) *ast.DeleteStmt {
 	if len(rels.Items) != 1 {
 		panic("expected one range var")
 	}
-	rel := rels.Items[0]
-	rangeVar, ok := rel.(*ast.RangeVar)
-	if !ok {
-		panic("expected range var")
-	}
+	relations := &ast.List{}
+	convertToRangeVarList(rels, relations)
 
 	return &ast.DeleteStmt{
-		Relation:      rangeVar,
+		Relations:     relations,
 		WhereClause:   c.convert(n.Where),
 		ReturningList: &ast.List{},
 		WithClause:    c.convertWithClause(n.With),
@@ -1140,22 +1137,24 @@ func (c *cc) convertSetOprType(n *pcast.SetOprType) (op ast.SetOperation, all bo
 // into a tree. It is called for UNION, INTERSECT or EXCLUDE operation.
 //
 // Given an union with the following nodes:
-//     [Select{1}, Select{2}, Select{3}, Select{4}]
+//
+//	[Select{1}, Select{2}, Select{3}, Select{4}]
 //
 // The function will return:
-//     Select{
-//         Larg: Select{
-//             Larg: Select{
-//                 Larg: Select{1},
-//                 Rarg: Select{2},
-//                 Op: Union
-//             },
-//             Rarg: Select{3},
-//             Op: Union,
-//         },
-//         Rarg: Select{4},
-//         Op: Union,
-//     }
+//
+//	Select{
+//	    Larg: Select{
+//	        Larg: Select{
+//	            Larg: Select{1},
+//	            Rarg: Select{2},
+//	            Op: Union
+//	        },
+//	        Rarg: Select{3},
+//	        Op: Union,
+//	    },
+//	    Rarg: Select{4},
+//	    Op: Union,
+//	}
 func (c *cc) convertSetOprSelectList(n *pcast.SetOprSelectList) ast.Node {
 	selectStmts := make([]*ast.SelectStmt, len(n.Selects))
 	for i, node := range n.Selects {

internal/endtoend/testdata/delete_inner_join/postgresql/query.sql

@@ -158,8 +158,12 @@ func (c *cc) convertDelete_stmtContext(n *parser.Delete_stmtContext) ast.Node {
 			relation.Alias = &ast.Alias{Aliasname: &alias}
 		}
 
+		relations := &ast.List{}
+
+		relations.Items = append(relations.Items, relation)
+
 		delete := &ast.DeleteStmt{
-			Relation:      relation,
+			Relations:     relations,
 			ReturningList: c.convertReturning_caluseContext(n.Returning_clause()),
 			WithClause:    nil,
 		}

internal/endtoend/testdata/delete_inner_join/postgresql/sqlc.json

@@ -1,7 +1,7 @@
 package ast
 
 type DeleteStmt struct {
-	Relation      *RangeVar
+	Relations     *List
 	UsingClause   *List
 	WhereClause   Node
 	ReturningList *List

internal/engine/dolphin/convert.go

@@ -39,7 +39,6 @@ type ApplyFunc func(*Cursor) bool
 // Children are traversed in the order in which they appear in the
 // respective node's struct definition. A package's files are
 // traversed in the filenames' alphabetical order.
-//
 func Apply(root ast.Node, pre, post ApplyFunc) (result ast.Node) {
 	parent := &struct{ ast.Node }{root}
 	defer func() {
@@ -63,8 +62,8 @@ var abort = new(int) // singleton, to signal termination of Apply
 // c.Parent(), and f is the field identifier with name c.Name(),
 // the following invariants hold:
 //
-//   p.f            == c.Node()  if c.Index() <  0
-//   p.f[c.Index()] == c.Node()  if c.Index() >= 0
+//	p.f            == c.Node()  if c.Index() <  0
+//	p.f[c.Index()] == c.Node()  if c.Index() >= 0
 //
 // The methods Replace, Delete, InsertBefore, and InsertAfter
 // can be used to change the AST without disrupting Apply.
@@ -677,7 +676,7 @@ func (a *application) apply(parent ast.Node, name string, iter *iterator, n ast.
 		a.apply(n, "Definition", nil, n.Definition)
 
 	case *ast.DeleteStmt:
-		a.apply(n, "Relation", nil, n.Relation)
+		a.apply(n, "Relations", nil, n.Relations)
 		a.apply(n, "UsingClause", nil, n.UsingClause)
 		a.apply(n, "WhereClause", nil, n.WhereClause)
 		a.apply(n, "ReturningList", nil, n.ReturningList)

internal/engine/sqlite/convert.go

@@ -1054,8 +1054,8 @@ func Walk(f Visitor, node ast.Node) {
 		}
 
 	case *ast.DeleteStmt:
-		if n.Relation != nil {
-			Walk(f, n.Relation)
+		if n.Relations != nil {
+			Walk(f, n.Relations)
 		}
 		if n.UsingClause != nil {
 			Walk(f, n.UsingClause)