allow any AsNamedShort to be a target column of an update

Author: deoxxa

sqlbuilder_test.go

@@ -73,8 +73,8 @@ func TestUpdateWithFromReturning(t *testing.T) {
 
 	expiry := time.Date(2023, time.July, 25, 18, 34, 15, 0, time.UTC)
 
-	q := Update().With(nextJob).Target(updatedJob).Set(UpdateColumns{
-		updatedJob.C("reserved_to"): Bind(expiry),
+	q := Update().With(nextJob).Target(updatedJob).Fields([]UpdateField{
+		{updatedJob.C("reserved_to"), Bind(expiry)},
 	}).Where(Eq(updatedJob.C("id"), nextJob.C("id"))).Returning(updatedJob.C("id"))
 
 	qs, qv, err := NewSerializer(DialectPostgres{}).F(q.AsStatement).ToSQL()

update.go

@@ -2,10 +2,24 @@ package sqlbuilder
 
 type UpdateColumns map[*BasicColumn]AsExpr
 
+func (m UpdateColumns) asFields() []UpdateField {
+	var a []UpdateField
+	for k, e := range m {
+		a = append(a, UpdateField{k, e})
+	}
+	return a
+}
+
+type UpdateField struct {
+	Name  AsNamedShort
+	Value AsExpr
+}
+
 type UpdateStatement struct {
 	with      []AsCommonTableExpression
 	target    AsTableOrSubquery
-	set       UpdateColumns
+	columns   UpdateColumns
+	fields    []UpdateField
 	from      AsTableOrSubquery
 	where     AsExpr
 	returning []AsExpr
@@ -15,15 +29,16 @@ func (s *UpdateStatement) clone() *UpdateStatement {
 	return &UpdateStatement{
 		with:      s.with,
 		target:    s.target,
-		set:       s.set,
+		columns:   s.columns,
+		fields:    s.fields,
 		from:      s.from,
 		where:     s.where,
 		returning: s.returning,
 	}
 }
 
 func Update() *UpdateStatement {
-	return &UpdateStatement{set: make(UpdateColumns)}
+	return &UpdateStatement{columns: make(UpdateColumns)}
 }
 
 func (s *UpdateStatement) With(with ...AsCommonTableExpression) *UpdateStatement {
@@ -52,27 +67,41 @@ func (s *UpdateStatement) GetTarget() AsTableOrSubquery {
 	return s.target
 }
 
-func (s *UpdateStatement) Set(set UpdateColumns) *UpdateStatement {
+func (s *UpdateStatement) Set(columns UpdateColumns) *UpdateStatement {
 	c := s.clone()
-	c.set = set
+	c.columns = columns
+	c.fields = nil
 	return c
 }
 
 func (s *UpdateStatement) AndSet(column *BasicColumn, expr AsExpr) *UpdateStatement {
 	c := s.clone()
 
 	m := make(UpdateColumns)
-	for k, e := range c.set {
+	for k, e := range c.columns {
 		m[k] = e
 	}
 
 	m[column] = expr
 
-	c.set = m
+	c.columns = m
 
 	return c
 }
 
+func (s *UpdateStatement) Fields(fields []UpdateField) *UpdateStatement {
+	c := s.clone()
+	c.columns = nil
+	c.fields = fields
+	return c
+}
+
+func (s *UpdateStatement) AndField(field UpdateField) *UpdateStatement {
+	c := s.clone()
+	c.fields = append(c.fields[:], field)
+	return c
+}
+
 func (s *UpdateStatement) From(from AsTableOrSubquery) *UpdateStatement {
 	c := s.clone()
 	c.from = from
@@ -109,10 +138,8 @@ func (q *UpdateStatement) AsStatement(s *Serializer) {
 
 	s.D("UPDATE ").F(q.target.AsTableOrSubquery).D(" SET ")
 
-	i := 0
-	for k, e := range q.set {
-		s.F(k.AsNamedShort).D(" = ").F(e.AsExpr).DC(", ", i < len(q.set)-1)
-		i++
+	for i, f := range append(q.columns.asFields(), q.fields...) {
+		s.DC(", ", i != 0).F(f.Name.AsNamedShort).D(" = ").F(f.Value.AsExpr)
 	}
 
 	if q.from != nil {