fix: add UpdateQuery.OmitZero

uptrace · Oct 5, 2021 · 2294db6 · 2294db6
1 parent 479e526
commit 2294db6
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 1 deletion.
diff --git a/internal/dbtest/query_test.go b/internal/dbtest/query_test.go
@@ -554,6 +554,9 @@ func TestQuery(t *testing.T) {
 		func(db *bun.DB) schema.QueryAppender {
 			return db.NewInsert().Model(new(SoftDelete)).On("CONFLICT DO NOTHING")
 		},
+		func(db *bun.DB) schema.QueryAppender {
+			return db.NewUpdate().Model(&Model{ID: 42}).OmitZero().WherePK()
+		},
 	}
 
 	timeRE := regexp.MustCompile(`'\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+(\+\d{2}:\d{2})?'`)

diff --git a/internal/dbtest/testdata/snapshots/TestQuery-mysql5-87 b/internal/dbtest/testdata/snapshots/TestQuery-mysql5-87
@@ -0,0 +1 @@
+UPDATE `models` AS `model` SET  WHERE (`model`.`id` = 42)
diff --git a/internal/dbtest/testdata/snapshots/TestQuery-mysql5-88 b/internal/dbtest/testdata/snapshots/TestQuery-mysql5-88
@@ -0,0 +1 @@
+UPDATE `models` AS `model` SET  WHERE (`model`.`id` = 42)
diff --git a/internal/dbtest/testdata/snapshots/TestQuery-mysql8-87 b/internal/dbtest/testdata/snapshots/TestQuery-mysql8-87
@@ -0,0 +1 @@
+UPDATE `models` AS `model` SET  WHERE (`model`.`id` = 42)
diff --git a/internal/dbtest/testdata/snapshots/TestQuery-mysql8-88 b/internal/dbtest/testdata/snapshots/TestQuery-mysql8-88
@@ -0,0 +1 @@
+UPDATE `models` AS `model` SET  WHERE (`model`.`id` = 42)
diff --git a/internal/dbtest/testdata/snapshots/TestQuery-pg-87 b/internal/dbtest/testdata/snapshots/TestQuery-pg-87
@@ -0,0 +1 @@
+UPDATE "models" AS "model" SET  WHERE ("model"."id" = 42)
diff --git a/internal/dbtest/testdata/snapshots/TestQuery-pg-88 b/internal/dbtest/testdata/snapshots/TestQuery-pg-88
@@ -0,0 +1 @@
+UPDATE "models" AS "model" SET  WHERE ("model"."id" = 42)
diff --git a/internal/dbtest/testdata/snapshots/TestQuery-pgx-87 b/internal/dbtest/testdata/snapshots/TestQuery-pgx-87
@@ -0,0 +1 @@
+UPDATE "models" AS "model" SET  WHERE ("model"."id" = 42)
diff --git a/internal/dbtest/testdata/snapshots/TestQuery-pgx-88 b/internal/dbtest/testdata/snapshots/TestQuery-pgx-88
@@ -0,0 +1 @@
+UPDATE "models" AS "model" SET  WHERE ("model"."id" = 42)
diff --git a/internal/dbtest/testdata/snapshots/TestQuery-sqlite-87 b/internal/dbtest/testdata/snapshots/TestQuery-sqlite-87
@@ -0,0 +1 @@
+UPDATE "models" AS "model" SET  WHERE ("model"."id" = 42)
diff --git a/internal/dbtest/testdata/snapshots/TestQuery-sqlite-88 b/internal/dbtest/testdata/snapshots/TestQuery-sqlite-88
@@ -0,0 +1 @@
+UPDATE "models" AS "model" SET  WHERE ("model"."id" = 42)
diff --git a/query_update.go b/query_update.go
@@ -100,6 +100,11 @@ func (q *UpdateQuery) Value(column string, expr string, args ...interface{}) *Up
 	return q
 }
 
+func (q *UpdateQuery) OmitZero() *UpdateQuery {
+	q.omitZero = true
+	return q
+}
+
 //------------------------------------------------------------------------------
 
 func (q *UpdateQuery) WherePK() *UpdateQuery {
@@ -254,7 +259,7 @@ func (q *UpdateQuery) appendSetStruct(
 	isTemplate := fmter.IsNop()
 	pos := len(b)
 	for _, f := range fields {
-		if q.omitZero && f.NullZero && f.HasZeroValue(model.strct) {
+		if q.omitZero && f.HasZeroValue(model.strct) {
 			continue
 		}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		UPDATE `models` AS `model` SET WHERE (`model`.`id` = 42)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		UPDATE "models" AS "model" SET WHERE ("model"."id" = 42)