Fix bug with ON DUPLICATE KEY UPDATE

stephenafamo · Mar 7, 2023 · 4e3f513 · 4e3f513
1 parent 6977b63
commit 4e3f513
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/dialect/mysql/dialect/insert.go b/dialect/mysql/dialect/insert.go
@@ -106,7 +106,7 @@ func (i InsertQuery) WriteSQL(w io.Writer, d bob.Dialect, start int) ([]any, err
 
 	// Either this or the values will get expressed
 	updateArgs, err := bob.ExpressSlice(w, d, start+len(args), i.DuplicateKeyUpdate,
-		"\nON DUPLICATE KEY UPDATE\n", "\n", "")
+		"\nON DUPLICATE KEY UPDATE\n", ",\n", "")
 	if err != nil {
 		return nil, err
 	}

diff --git a/dialect/mysql/im/qm.go b/dialect/mysql/im/qm.go
@@ -91,5 +91,6 @@ func (s *dupKeyUpdater) Set(alias string, cols ...string) *dupKeyUpdater {
 		newCols[i] = dialect.Set{Col: c, Val: expr.Quote(alias, c)}
 	}
 
+	s.sets = append(s.sets, newCols...)
 	return s
 }
diff --git a/dialect/mysql/insert_test.go b/dialect/mysql/insert_test.go
@@ -63,6 +63,7 @@ func TestInsert(t *testing.T) {
 				im.Values(mysql.Arg(9, "Sentry Distribution")),
 				im.As("new"),
 				im.OnDuplicateKeyUpdate().
+					Set("new", "did").
 					SetCol("dbname", mysql.Concat(
 						"new.dname", mysql.S(" (formerly "), "d.dname", mysql.S(")"),
 					)),
@@ -71,6 +72,7 @@ func TestInsert(t *testing.T) {
 				VALUES (?, ?), (?, ?)
 				AS new
 				ON DUPLICATE KEY UPDATE
+				` + " `did` = `new`.`did`," + `
 				` + "`dbname`" + ` = (new.dname || ' (formerly ' || d.dname || ')')`,
 			ExpectedArgs: []any{8, "Anvil Distribution", 9, "Sentry Distribution"},
 		},

diff --git a/website/docs/query-builder/mysql/examples/insert.md b/website/docs/query-builder/mysql/examples/insert.md
@@ -130,6 +130,7 @@ INSERT INTO distributors (`did`, `dname`)
 VALUES (?, ?), (?, ?)
 AS new
 ON DUPLICATE KEY UPDATE
+` + " `did` = `new`.`did`," + `
 `dbname` = (new.dname || ' (formerly ' || d.dname || ')')
 ```
 
@@ -149,6 +150,7 @@ mysql.Insert(
   im.Values(mysql.Arg(9, "Sentry Distribution")),
   im.As("new"),
   im.OnDuplicateKeyUpdate().
+    Set("new", "did").
     SetCol("dbname", mysql.Concat(
       "new.dname", mysql.S(" (formerly "), "d.dname", mysql.S(")"),
     )),