feat: add Join to UpdateQuery (#908)

* feat: add Join to UpdateQuery

* chore: implement LSP suggestion (could apply De Morgan's law)

Improves readability (IMHO) so thought to implement it.

internal/dbtest/query_test.go

@@ -1001,6 +1001,13 @@ func TestQuery(t *testing.T) {
 		func(db *bun.DB) schema.QueryAppender {
 			return db.NewUpdate().Model(&Model{42, ""}).OmitZero()
 		},
+		func(db *bun.DB) schema.QueryAppender {
+			return db.NewUpdate().
+				Model((*Story)(nil)).
+				Set("name = ?", "new-name").
+				Join("JOIN user ON user.id = story.user_id").
+				Where("user.id = ?", 1)
+		},
 	}
 
 	timeRE := regexp.MustCompile(`'2\d{3}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}(\.\d+)?(\+\d{2}:\d{2})?'`)

internal/dbtest/testdata/snapshots/TestQuery-mariadb-163

@@ -0,0 +1 @@
+UPDATE `stories` AS `story` SET name = 'new-name' JOIN user ON user.id = story.user_id WHERE (user.id = 1)

internal/dbtest/testdata/snapshots/TestQuery-mssql2019-163

@@ -0,0 +1 @@
+UPDATE "stories" SET name = N'new-name' JOIN user ON user.id = story.user_id WHERE (user.id = 1)

internal/dbtest/testdata/snapshots/TestQuery-mysql5-163

@@ -0,0 +1 @@
+UPDATE `stories` AS `story` SET name = 'new-name' JOIN user ON user.id = story.user_id WHERE (user.id = 1)

internal/dbtest/testdata/snapshots/TestQuery-mysql8-163

@@ -0,0 +1 @@
+UPDATE `stories` AS `story` SET name = 'new-name' JOIN user ON user.id = story.user_id WHERE (user.id = 1)

internal/dbtest/testdata/snapshots/TestQuery-pg-163

@@ -0,0 +1 @@
+UPDATE "stories" AS "story" SET name = 'new-name' JOIN user ON user.id = story.user_id WHERE (user.id = 1)

internal/dbtest/testdata/snapshots/TestQuery-pgx-163

@@ -0,0 +1 @@
+UPDATE "stories" AS "story" SET name = 'new-name' JOIN user ON user.id = story.user_id WHERE (user.id = 1)

internal/dbtest/testdata/snapshots/TestQuery-sqlite-163

@@ -0,0 +1 @@
+UPDATE "stories" AS "story" SET name = 'new-name' JOIN user ON user.id = story.user_id WHERE (user.id = 1)

query_merge.go

@@ -29,7 +29,7 @@ func NewMergeQuery(db *DB) *MergeQuery {
 			conn: db.DB,
 		},
 	}
-	if !(q.db.dialect.Name() == dialect.MSSQL || q.db.dialect.Name() == dialect.PG) {
+	if q.db.dialect.Name() != dialect.MSSQL && q.db.dialect.Name() != dialect.PG {
 		q.err = errors.New("bun: merge not supported for current dialect")
 	}
 	return q

query_update.go

@@ -20,6 +20,7 @@ type UpdateQuery struct {
 	setQuery
 	idxHintsQuery
 
+	joins    []joinQuery
 	omitZero bool
 }
 
@@ -133,6 +134,33 @@ func (q *UpdateQuery) OmitZero() *UpdateQuery {
 
 //------------------------------------------------------------------------------
 
+func (q *UpdateQuery) Join(join string, args ...interface{}) *UpdateQuery {
+	q.joins = append(q.joins, joinQuery{
+		join: schema.SafeQuery(join, args),
+	})
+	return q
+}
+
+func (q *UpdateQuery) JoinOn(cond string, args ...interface{}) *UpdateQuery {
+	return q.joinOn(cond, args, " AND ")
+}
+
+func (q *UpdateQuery) JoinOnOr(cond string, args ...interface{}) *UpdateQuery {
+	return q.joinOn(cond, args, " OR ")
+}
+
+func (q *UpdateQuery) joinOn(cond string, args []interface{}, sep string) *UpdateQuery {
+	if len(q.joins) == 0 {
+		q.err = errors.New("bun: query has no joins")
+		return q
+	}
+	j := &q.joins[len(q.joins)-1]
+	j.on = append(j.on, schema.SafeQueryWithSep(cond, args, sep))
+	return q
+}
+
+//------------------------------------------------------------------------------
+
 func (q *UpdateQuery) WherePK(cols ...string) *UpdateQuery {
 	q.addWhereCols(cols)
 	return q
@@ -230,6 +258,13 @@ func (q *UpdateQuery) AppendQuery(fmter schema.Formatter, b []byte) (_ []byte, e
 		}
 	}
 
+	for _, j := range q.joins {
+		b, err = j.AppendQuery(fmter, b)
+		if err != nil {
+			return nil, err
+		}
+	}
+
 	if q.hasFeature(feature.Output) && q.hasReturning() {
 		b = append(b, " OUTPUT "...)
 		b, err = q.appendOutput(fmter, b)