Merge pull request #389 from kvii/update

feat: allow []exp.UpdateExpression as Set values.
doug-martin · Dec 14, 2023 · 58b19cc · 58b19cc
2 parents 594a433 + 67da73a
commit 58b19cc
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 0 deletions.
diff --git a/docs/updating.md b/docs/updating.md
@@ -324,6 +324,22 @@ Output:
 UPDATE "items" SET "address"='111 Test Addr',"name"='Test' []
 ```
 
+<a name="set-expressions"></a>
+**[Set with Expressions](https://godoc.org/github.com/doug-martin/goqu/#UpdateDataset.Set)**
+
+```go
+sql, args, _ := goqu.Update("items").Set([]exp.UpdateExpression{
+	goqu.C("name").Set("Test"),
+	goqu.C("address").Set("111 Test Addr"),
+}).ToSQL()
+fmt.Println(sql, args)
+```
+
+Output:
+```
+UPDATE "items" SET "name"='Test',"address"='111 Test Addr' []
+```
+
 <a name="from"></a>
 **[From / Multi Table](https://godoc.org/github.com/doug-martin/goqu/#UpdateDataset.From)**
 

diff --git a/exp/update.go b/exp/update.go
@@ -20,6 +20,10 @@ func set(col IdentifierExpression, val interface{}) UpdateExpression {
 }
 
 func NewUpdateExpressions(update interface{}) (updates []UpdateExpression, err error) {
+	if us, ok := update.([]UpdateExpression); ok {
+		updates = append(updates, us...)
+		return updates, nil
+	}
 	if u, ok := update.(UpdateExpression); ok {
 		updates = append(updates, u)
 		return updates, nil

diff --git a/update_dataset_example_test.go b/update_dataset_example_test.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/doug-martin/goqu/v9"
 	_ "github.com/doug-martin/goqu/v9/dialect/mysql"
+	"github.com/doug-martin/goqu/v9/exp"
 )
 
 func ExampleUpdate_withStruct() {
@@ -120,6 +121,17 @@ func ExampleUpdate_withMap() {
 	// UPDATE "items" SET "address"='111 Test Addr',"name"='Test' []
 }
 
+func ExampleUpdate_withExpressions() {
+	sql, args, _ := goqu.Update("items").Set([]exp.UpdateExpression{
+		goqu.C("name").Set("Test"),
+		goqu.C("address").Set("111 Test Addr"),
+	}).ToSQL()
+	fmt.Println(sql, args)
+
+	// Output:
+	// UPDATE "items" SET "name"='Test',"address"='111 Test Addr' []
+}
+
 func ExampleUpdate_withSkipUpdateTag() {
 	type item struct {
 		Address string `db:"address"`

diff --git a/update_dataset_test.go b/update_dataset_test.go
@@ -163,6 +163,18 @@ func (uds *updateDatasetSuite) TestSet() {
 			clauses: exp.NewUpdateClauses().
 				SetTable(goqu.C("items")),
 		},
+		updateTestCase{
+			ds: bd.Set([]exp.UpdateExpression{
+				goqu.C("name").Set("Test"),
+				goqu.C("address").Set("111 Test Addr"),
+			}),
+			clauses: exp.NewUpdateClauses().
+				SetTable(goqu.C("items")).
+				SetSetValues([]exp.UpdateExpression{
+					goqu.C("name").Set("Test"),
+					goqu.C("address").Set("111 Test Addr"),
+				}),
+		},
 	)
 }