diff --git a/UPSTREAM.md b/UPSTREAM.md
index 54925abd2e..6447c55d55 100644
--- a/UPSTREAM.md
+++ b/UPSTREAM.md
@@ -178,6 +178,7 @@ touches the same area may be assuming the behaviour we replaced.
 | **Paging** | `dialect/sql/sqlpage` -- keyset cursors -- is ours. | `7714d7267` |
 | **Create read-back** | `sqlgraph.CreateSpec` carries `Returning`, `ScanValues` and `Assign`, and a create reads back the row it stored: by the INSERT, with `RETURNING`, where the dialect has it, and by a query after it on MySQL or with a conflict clause. `sql/returning` gives a create builder `Stored`, which asks for it, in a `CreateBulk` as well: a batch reads every row back, matched to its node by the Id the caller gave, or by its place when the database made the Ids up. Upstream's INSERT answers with the Id and nothing else. | #9, #11 |
 | **Mutation expressions** | A generated mutation assigns a field a SQL expression (`SetFieldExpr`, `FieldExpr`, `ExprFields`; `SetField` hands one over), which an update writes and `Fields`/`Field` report to hooks. A validated, immutable, id or edge field refuses one, as does a create. `sqlgraph` writes a `sql.Querier` in a `FieldSpec` as SQL, even for a JSON column, which upstream would encode. Upstream's only route for an expression is `Modify`, which the mutation never sees. | #1 |
+| **Set after clear** | A mutation's `SetX` drops a previous clear of an optional field, so `ClearX().SetX(v)` writes `v` once. Upstream emits `x = NULL, x = ?`, which PostgreSQL refuses. The same fix was offered upstream; drop this row once upstream has it. | #13 |
 | **Time: zone** | Every `time.Time` is UTC at both edges. `bindArgs` moves an argument to UTC; `Rows.Scan` moves a scanned value to UTC; `field.Time`'s `Default`/`UpdateDefault` answer in UTC. | `7d10ad284`, `c6003ab94`, `1d1a9d88b` |
 | **Time: precision** | Time columns keep six fractional-second digits by default; `field.Time().Precision(n)` says otherwise. | `cede1c296` |
 | **Time: MySql column** | A time field is a `datetime`, not a `timestamp` -- no session `time_zone` conversion, no 2038. | `5d232985b` |
diff --git a/entc/gen/template/mutation.tmpl b/entc/gen/template/mutation.tmpl
index 45de45883c..dec5a866d0 100644
--- a/entc/gen/template/mutation.tmpl
+++ b/entc/gen/template/mutation.tmpl
@@ -84,6 +84,10 @@ func (m *Mutation) Predicates() []predicate.{{ $.Name }} {
 		{{- if $f.SupportsMutationAppend }}
 			m.append{{ $f.BuilderField }} = nil
 		{{- end }}
+		{{- /* Setting overrides a previous call to Clear, as Clear overrides a previous call to Set. */}}
+		{{- if $f.Optional }}
+			delete(m.clearedFields, {{ $const }})
+		{{- end }}
 		{{- if $f.SupportsMutationExpr }}
 			delete(m.exprs, {{ $const }})
 		{{- end }}
diff --git a/entc/integration/cascadelete/ent/post/mutation.go b/entc/integration/cascadelete/ent/post/mutation.go
index 42617b1df1..745734b5e0 100644
--- a/entc/integration/cascadelete/ent/post/mutation.go
+++ b/entc/integration/cascadelete/ent/post/mutation.go
@@ -68,6 +68,7 @@ func (m *Mutation) ResetText() {
 // SetAuthorId sets the "author_id" field.
 func (m *Mutation) SetAuthorId(i int) {
 	m.author = &i
+	delete(m.clearedFields, FieldAuthorId)
 }
 
 // AuthorId returns the value of the "author_id" field in the mutation.
diff --git a/entc/integration/config/ent/user/mutation.go b/entc/integration/config/ent/user/mutation.go
index dca61b848f..8527dca0ef 100644
--- a/entc/integration/config/ent/user/mutation.go
+++ b/entc/integration/config/ent/user/mutation.go
@@ -43,6 +43,7 @@ func (m *Mutation) Predicates() []predicate.User {
 // SetName sets the "name" field.
 func (m *Mutation) SetName(s string) {
 	m.name = &s
+	delete(m.clearedFields, FieldName)
 	delete(m.exprs, FieldName)
 }
 
@@ -78,6 +79,7 @@ func (m *Mutation) ResetName() {
 // SetLabel sets the "label" field.
 func (m *Mutation) SetLabel(s string) {
 	m.label = &s
+	delete(m.clearedFields, FieldLabel)
 	delete(m.exprs, FieldLabel)
 }
 
diff --git a/entc/integration/customid/ent/car/mutation.go b/entc/integration/customid/ent/car/mutation.go
index a1feb1f3fd..c790012af2 100644
--- a/entc/integration/customid/ent/car/mutation.go
+++ b/entc/integration/customid/ent/car/mutation.go
@@ -49,6 +49,7 @@ func (m *Mutation) Predicates() []predicate.Car {
 func (m *Mutation) SetBeforeId(f float64) {
 	m.before_id = &f
 	m.addbefore_id = nil
+	delete(m.clearedFields, FieldBeforeId)
 }
 
 // BeforeId returns the value of the "before_id" field in the mutation.
@@ -102,6 +103,7 @@ func (m *Mutation) ResetBeforeId() {
 func (m *Mutation) SetAfterId(f float64) {
 	m.after_id = &f
 	m.addafter_id = nil
+	delete(m.clearedFields, FieldAfterId)
 }
 
 // AfterId returns the value of the "after_id" field in the mutation.
diff --git a/entc/integration/customid/ent/doc/mutation.go b/entc/integration/customid/ent/doc/mutation.go
index 50fe26c2d4..1196bf471e 100644
--- a/entc/integration/customid/ent/doc/mutation.go
+++ b/entc/integration/customid/ent/doc/mutation.go
@@ -51,6 +51,7 @@ func (m *Mutation) Predicates() []predicate.Doc {
 // SetText sets the "text" field.
 func (m *Mutation) SetText(s string) {
 	m.text = &s
+	delete(m.clearedFields, FieldText)
 	delete(m.exprs, FieldText)
 }
 
diff --git a/entc/integration/customid/ent/note/mutation.go b/entc/integration/customid/ent/note/mutation.go
index ad3766011f..36b3686631 100644
--- a/entc/integration/customid/ent/note/mutation.go
+++ b/entc/integration/customid/ent/note/mutation.go
@@ -48,6 +48,7 @@ func (m *Mutation) Predicates() []predicate.Note {
 // SetText sets the "text" field.
 func (m *Mutation) SetText(s string) {
 	m.text = &s
+	delete(m.clearedFields, FieldText)
 	delete(m.exprs, FieldText)
 }
 
diff --git a/entc/integration/edgefield/ent/car/mutation.go b/entc/integration/edgefield/ent/car/mutation.go
index d9e2778f61..e2b4d9dae8 100644
--- a/entc/integration/edgefield/ent/car/mutation.go
+++ b/entc/integration/edgefield/ent/car/mutation.go
@@ -45,6 +45,7 @@ func (m *Mutation) Predicates() []predicate.Car {
 // SetNumber sets the "number" field.
 func (m *Mutation) SetNumber(s string) {
 	m.number = &s
+	delete(m.clearedFields, FieldNumber)
 	delete(m.exprs, FieldNumber)
 }
 
diff --git a/entc/integration/edgefield/ent/card/mutation.go b/entc/integration/edgefield/ent/card/mutation.go
index aec89621d1..fbc828590e 100644
--- a/entc/integration/edgefield/ent/card/mutation.go
+++ b/entc/integration/edgefield/ent/card/mutation.go
@@ -44,6 +44,7 @@ func (m *Mutation) Predicates() []predicate.Card {
 // SetNumber sets the "number" field.
 func (m *Mutation) SetNumber(s string) {
 	m.number = &s
+	delete(m.clearedFields, FieldNumber)
 	delete(m.exprs, FieldNumber)
 }
 
@@ -79,6 +80,7 @@ func (m *Mutation) ResetNumber() {
 // SetOwnerId sets the "owner_id" field.
 func (m *Mutation) SetOwnerId(i int) {
 	m.owner = &i
+	delete(m.clearedFields, FieldOwnerId)
 }
 
 // OwnerId returns the value of the "owner_id" field in the mutation.
diff --git a/entc/integration/edgefield/ent/metadata/mutation.go b/entc/integration/edgefield/ent/metadata/mutation.go
index a203dacf2b..4c55139810 100644
--- a/entc/integration/edgefield/ent/metadata/mutation.go
+++ b/entc/integration/edgefield/ent/metadata/mutation.go
@@ -91,6 +91,7 @@ func (m *Mutation) ResetAge() {
 // SetParentId sets the "parent_id" field.
 func (m *Mutation) SetParentId(i int) {
 	m.parent = &i
+	delete(m.clearedFields, FieldParentId)
 }
 
 // ParentId returns the value of the "parent_id" field in the mutation.
diff --git a/entc/integration/edgefield/ent/node/mutation.go b/entc/integration/edgefield/ent/node/mutation.go
index 0c6fba883e..b8ffdcba72 100644
--- a/entc/integration/edgefield/ent/node/mutation.go
+++ b/entc/integration/edgefield/ent/node/mutation.go
@@ -88,6 +88,7 @@ func (m *Mutation) ResetValue() {
 // SetPrevId sets the "prev_id" field.
 func (m *Mutation) SetPrevId(i int) {
 	m.prev = &i
+	delete(m.clearedFields, FieldPrevId)
 }
 
 // PrevId returns the value of the "prev_id" field in the mutation.
diff --git a/entc/integration/edgefield/ent/pet/mutation.go b/entc/integration/edgefield/ent/pet/mutation.go
index 0b6f4951a3..b0630a2976 100644
--- a/entc/integration/edgefield/ent/pet/mutation.go
+++ b/entc/integration/edgefield/ent/pet/mutation.go
@@ -42,6 +42,7 @@ func (m *Mutation) Predicates() []predicate.Pet {
 // SetOwnerId sets the "owner_id" field.
 func (m *Mutation) SetOwnerId(i int) {
 	m.owner = &i
+	delete(m.clearedFields, FieldOwnerId)
 }
 
 // OwnerId returns the value of the "owner_id" field in the mutation.
diff --git a/entc/integration/edgefield/ent/post/mutation.go b/entc/integration/edgefield/ent/post/mutation.go
index 7562bde899..8f29b0985e 100644
--- a/entc/integration/edgefield/ent/post/mutation.go
+++ b/entc/integration/edgefield/ent/post/mutation.go
@@ -65,6 +65,7 @@ func (m *Mutation) ResetText() {
 // SetAuthorId sets the "author_id" field.
 func (m *Mutation) SetAuthorId(i int) {
 	m.author = &i
+	delete(m.clearedFields, FieldAuthorId)
 }
 
 // AuthorId returns the value of the "author_id" field in the mutation.
diff --git a/entc/integration/edgefield/ent/user/mutation.go b/entc/integration/edgefield/ent/user/mutation.go
index 3fcc5049b6..359b910d9f 100644
--- a/entc/integration/edgefield/ent/user/mutation.go
+++ b/entc/integration/edgefield/ent/user/mutation.go
@@ -60,6 +60,7 @@ func (m *Mutation) Predicates() []predicate.User {
 // SetParentId sets the "parent_id" field.
 func (m *Mutation) SetParentId(i int) {
 	m.parent = &i
+	delete(m.clearedFields, FieldParentId)
 }
 
 // ParentId returns the value of the "parent_id" field in the mutation.
@@ -92,6 +93,7 @@ func (m *Mutation) ResetParentId() {
 // SetSpouseId sets the "spouse_id" field.
 func (m *Mutation) SetSpouseId(i int) {
 	m.spouse = &i
+	delete(m.clearedFields, FieldSpouseId)
 }
 
 // SpouseId returns the value of the "spouse_id" field in the mutation.
diff --git a/entc/integration/edgeschema/ent/relationship/mutation.go b/entc/integration/edgeschema/ent/relationship/mutation.go
index de237d4f50..09f983016d 100644
--- a/entc/integration/edgeschema/ent/relationship/mutation.go
+++ b/entc/integration/edgeschema/ent/relationship/mutation.go
@@ -129,6 +129,7 @@ func (m *Mutation) ResetRelativesId() {
 // SetInfoId sets the "info_id" field.
 func (m *Mutation) SetInfoId(i int) {
 	m.info = &i
+	delete(m.clearedFields, FieldInfoId)
 }
 
 // InfoId returns the value of the "info_id" field in the mutation.
diff --git a/entc/integration/ent/card/mutation.go b/entc/integration/ent/card/mutation.go
index 7ea605f371..dbd6623490 100644
--- a/entc/integration/ent/card/mutation.go
+++ b/entc/integration/ent/card/mutation.go
@@ -153,6 +153,7 @@ func (m *Mutation) ResetNumber() {
 // SetName sets the "name" field.
 func (m *Mutation) SetName(s string) {
 	m.name = &s
+	delete(m.clearedFields, FieldName)
 }
 
 // Name returns the value of the "name" field in the mutation.
diff --git a/entc/integration/ent/comment/mutation.go b/entc/integration/ent/comment/mutation.go
index 58bd36f800..b73667f5f3 100644
--- a/entc/integration/ent/comment/mutation.go
+++ b/entc/integration/ent/comment/mutation.go
@@ -134,6 +134,7 @@ func (m *Mutation) ResetUniqueFloat() {
 func (m *Mutation) SetNillableInt(i int) {
 	m.nillable_int = &i
 	m.addnillable_int = nil
+	delete(m.clearedFields, FieldNillableInt)
 	delete(m.exprs, FieldNillableInt)
 }
 
@@ -189,6 +190,7 @@ func (m *Mutation) ResetNillableInt() {
 // SetTable sets the "table" field.
 func (m *Mutation) SetTable(s string) {
 	m.table = &s
+	delete(m.clearedFields, FieldTable)
 	delete(m.exprs, FieldTable)
 }
 
@@ -224,6 +226,7 @@ func (m *Mutation) ResetTable() {
 // SetDir sets the "dir" field.
 func (m *Mutation) SetDir(s schemadir.Dir) {
 	m.dir = &s
+	delete(m.clearedFields, FieldDir)
 	delete(m.exprs, FieldDir)
 }
 
@@ -259,6 +262,7 @@ func (m *Mutation) ResetDir() {
 // SetClient sets the "client" field.
 func (m *Mutation) SetClient(s string) {
 	m.client = &s
+	delete(m.clearedFields, FieldClient)
 	delete(m.exprs, FieldClient)
 }
 
diff --git a/entc/integration/ent/exvaluescan/mutation.go b/entc/integration/ent/exvaluescan/mutation.go
index 538d6e056b..8565720eb4 100644
--- a/entc/integration/ent/exvaluescan/mutation.go
+++ b/entc/integration/ent/exvaluescan/mutation.go
@@ -93,6 +93,7 @@ func (m *Mutation) ResetBinaryBytes() {
 // SetBinaryOptional sets the "binary_optional" field.
 func (m *Mutation) SetBinaryOptional(u *url.URL) {
 	m.binary_optional = &u
+	delete(m.clearedFields, FieldBinaryOptional)
 	delete(m.exprs, FieldBinaryOptional)
 }
 
@@ -149,6 +150,7 @@ func (m *Mutation) ResetText() {
 // SetTextOptional sets the "text_optional" field.
 func (m *Mutation) SetTextOptional(b *big.Int) {
 	m.text_optional = &b
+	delete(m.clearedFields, FieldTextOptional)
 	delete(m.exprs, FieldTextOptional)
 }
 
@@ -226,6 +228,7 @@ func (m *Mutation) ResetCustom() {
 // SetCustomOptional sets the "custom_optional" field.
 func (m *Mutation) SetCustomOptional(s string) {
 	m.custom_optional = &s
+	delete(m.clearedFields, FieldCustomOptional)
 	delete(m.exprs, FieldCustomOptional)
 }
 
diff --git a/entc/integration/ent/fieldtype/mutation.go b/entc/integration/ent/fieldtype/mutation.go
index 53f6830046..bd5412fddf 100644
--- a/entc/integration/ent/fieldtype/mutation.go
+++ b/entc/integration/ent/fieldtype/mutation.go
@@ -350,6 +350,7 @@ func (m *Mutation) ResetInt64() {
 func (m *Mutation) SetOptionalInt(i int) {
 	m.optional_int = &i
 	m.addoptional_int = nil
+	delete(m.clearedFields, FieldOptionalInt)
 	delete(m.exprs, FieldOptionalInt)
 }
 
@@ -406,6 +407,7 @@ func (m *Mutation) ResetOptionalInt() {
 func (m *Mutation) SetOptionalInt8(i int8) {
 	m.optional_int8 = &i
 	m.addoptional_int8 = nil
+	delete(m.clearedFields, FieldOptionalInt8)
 	delete(m.exprs, FieldOptionalInt8)
 }
 
@@ -462,6 +464,7 @@ func (m *Mutation) ResetOptionalInt8() {
 func (m *Mutation) SetOptionalInt16(i int16) {
 	m.optional_int16 = &i
 	m.addoptional_int16 = nil
+	delete(m.clearedFields, FieldOptionalInt16)
 	delete(m.exprs, FieldOptionalInt16)
 }
 
@@ -518,6 +521,7 @@ func (m *Mutation) ResetOptionalInt16() {
 func (m *Mutation) SetOptionalInt32(i int32) {
 	m.optional_int32 = &i
 	m.addoptional_int32 = nil
+	delete(m.clearedFields, FieldOptionalInt32)
 	delete(m.exprs, FieldOptionalInt32)
 }
 
@@ -574,6 +578,7 @@ func (m *Mutation) ResetOptionalInt32() {
 func (m *Mutation) SetOptionalInt64(i int64) {
 	m.optional_int64 = &i
 	m.addoptional_int64 = nil
+	delete(m.clearedFields, FieldOptionalInt64)
 	delete(m.exprs, FieldOptionalInt64)
 }
 
@@ -630,6 +635,7 @@ func (m *Mutation) ResetOptionalInt64() {
 func (m *Mutation) SetNillableInt(i int) {
 	m.nillable_int = &i
 	m.addnillable_int = nil
+	delete(m.clearedFields, FieldNillableInt)
 	delete(m.exprs, FieldNillableInt)
 }
 
@@ -686,6 +692,7 @@ func (m *Mutation) ResetNillableInt() {
 func (m *Mutation) SetNillableInt8(i int8) {
 	m.nillable_int8 = &i
 	m.addnillable_int8 = nil
+	delete(m.clearedFields, FieldNillableInt8)
 	delete(m.exprs, FieldNillableInt8)
 }
 
@@ -742,6 +749,7 @@ func (m *Mutation) ResetNillableInt8() {
 func (m *Mutation) SetNillableInt16(i int16) {
 	m.nillable_int16 = &i
 	m.addnillable_int16 = nil
+	delete(m.clearedFields, FieldNillableInt16)
 	delete(m.exprs, FieldNillableInt16)
 }
 
@@ -798,6 +806,7 @@ func (m *Mutation) ResetNillableInt16() {
 func (m *Mutation) SetNillableInt32(i int32) {
 	m.nillable_int32 = &i
 	m.addnillable_int32 = nil
+	delete(m.clearedFields, FieldNillableInt32)
 	delete(m.exprs, FieldNillableInt32)
 }
 
@@ -854,6 +863,7 @@ func (m *Mutation) ResetNillableInt32() {
 func (m *Mutation) SetNillableInt64(i int64) {
 	m.nillable_int64 = &i
 	m.addnillable_int64 = nil
+	delete(m.clearedFields, FieldNillableInt64)
 	delete(m.exprs, FieldNillableInt64)
 }
 
@@ -910,6 +920,7 @@ func (m *Mutation) ResetNillableInt64() {
 func (m *Mutation) SetValidateOptionalInt32(i int32) {
 	m.validate_optional_int32 = &i
 	m.addvalidate_optional_int32 = nil
+	delete(m.clearedFields, FieldValidateOptionalInt32)
 }
 
 // ValidateOptionalInt32 returns the value of the "validate_optional_int32" field in the mutation.
@@ -963,6 +974,7 @@ func (m *Mutation) ResetValidateOptionalInt32() {
 func (m *Mutation) SetOptionalUint(u uint) {
 	m.optional_uint = &u
 	m.addoptional_uint = nil
+	delete(m.clearedFields, FieldOptionalUint)
 	delete(m.exprs, FieldOptionalUint)
 }
 
@@ -1019,6 +1031,7 @@ func (m *Mutation) ResetOptionalUint() {
 func (m *Mutation) SetOptionalUint8(u uint8) {
 	m.optional_uint8 = &u
 	m.addoptional_uint8 = nil
+	delete(m.clearedFields, FieldOptionalUint8)
 	delete(m.exprs, FieldOptionalUint8)
 }
 
@@ -1075,6 +1088,7 @@ func (m *Mutation) ResetOptionalUint8() {
 func (m *Mutation) SetOptionalUint16(u uint16) {
 	m.optional_uint16 = &u
 	m.addoptional_uint16 = nil
+	delete(m.clearedFields, FieldOptionalUint16)
 	delete(m.exprs, FieldOptionalUint16)
 }
 
@@ -1131,6 +1145,7 @@ func (m *Mutation) ResetOptionalUint16() {
 func (m *Mutation) SetOptionalUint32(u uint32) {
 	m.optional_uint32 = &u
 	m.addoptional_uint32 = nil
+	delete(m.clearedFields, FieldOptionalUint32)
 	delete(m.exprs, FieldOptionalUint32)
 }
 
@@ -1187,6 +1202,7 @@ func (m *Mutation) ResetOptionalUint32() {
 func (m *Mutation) SetOptionalUint64(u uint64) {
 	m.optional_uint64 = &u
 	m.addoptional_uint64 = nil
+	delete(m.clearedFields, FieldOptionalUint64)
 	delete(m.exprs, FieldOptionalUint64)
 }
 
@@ -1242,6 +1258,7 @@ func (m *Mutation) ResetOptionalUint64() {
 // SetState sets the "state" field.
 func (m *Mutation) SetState(f State) {
 	m.state = &f
+	delete(m.clearedFields, FieldState)
 }
 
 // State returns the value of the "state" field in the mutation.
@@ -1275,6 +1292,7 @@ func (m *Mutation) ResetState() {
 func (m *Mutation) SetOptionalFloat(f float64) {
 	m.optional_float = &f
 	m.addoptional_float = nil
+	delete(m.clearedFields, FieldOptionalFloat)
 	delete(m.exprs, FieldOptionalFloat)
 }
 
@@ -1331,6 +1349,7 @@ func (m *Mutation) ResetOptionalFloat() {
 func (m *Mutation) SetOptionalFloat32(f float32) {
 	m.optional_float32 = &f
 	m.addoptional_float32 = nil
+	delete(m.clearedFields, FieldOptionalFloat32)
 	delete(m.exprs, FieldOptionalFloat32)
 }
 
@@ -1386,6 +1405,7 @@ func (m *Mutation) ResetOptionalFloat32() {
 // SetText sets the "text" field.
 func (m *Mutation) SetText(s string) {
 	m.text = &s
+	delete(m.clearedFields, FieldText)
 	delete(m.exprs, FieldText)
 }
 
@@ -1421,6 +1441,7 @@ func (m *Mutation) ResetText() {
 // SetDatetime sets the "datetime" field.
 func (m *Mutation) SetDatetime(t time.Time) {
 	m.datetime = &t
+	delete(m.clearedFields, FieldDatetime)
 	delete(m.exprs, FieldDatetime)
 }
 
@@ -1457,6 +1478,7 @@ func (m *Mutation) ResetDatetime() {
 func (m *Mutation) SetDecimal(f float64) {
 	m.decimal = &f
 	m.adddecimal = nil
+	delete(m.clearedFields, FieldDecimal)
 	delete(m.exprs, FieldDecimal)
 }
 
@@ -1512,6 +1534,7 @@ func (m *Mutation) ResetDecimal() {
 // SetLinkOther sets the "link_other" field.
 func (m *Mutation) SetLinkOther(s *schema.Link) {
 	m.link_other = &s
+	delete(m.clearedFields, FieldLinkOther)
 	delete(m.exprs, FieldLinkOther)
 }
 
@@ -1547,6 +1570,7 @@ func (m *Mutation) ResetLinkOther() {
 // SetLinkOtherFunc sets the "link_other_func" field.
 func (m *Mutation) SetLinkOtherFunc(s *schema.Link) {
 	m.link_other_func = &s
+	delete(m.clearedFields, FieldLinkOtherFunc)
 	delete(m.exprs, FieldLinkOtherFunc)
 }
 
@@ -1582,6 +1606,7 @@ func (m *Mutation) ResetLinkOtherFunc() {
 // SetMac sets the "mac" field.
 func (m *Mutation) SetMac(s schema.Mac) {
 	m.mac = &s
+	delete(m.clearedFields, FieldMac)
 }
 
 // Mac returns the value of the "mac" field in the mutation.
@@ -1614,6 +1639,7 @@ func (m *Mutation) ResetMac() {
 // SetStringArray sets the "string_array" field.
 func (m *Mutation) SetStringArray(s schema.Strings) {
 	m.string_array = &s
+	delete(m.clearedFields, FieldStringArray)
 	delete(m.exprs, FieldStringArray)
 }
 
@@ -1649,6 +1675,7 @@ func (m *Mutation) ResetStringArray() {
 // SetPassword sets the "password" field.
 func (m *Mutation) SetPassword(s string) {
 	m.password = &s
+	delete(m.clearedFields, FieldPassword)
 	delete(m.exprs, FieldPassword)
 }
 
@@ -1684,6 +1711,7 @@ func (m *Mutation) ResetPassword() {
 // SetStringScanner sets the "string_scanner" field.
 func (m *Mutation) SetStringScanner(ss schema.StringScanner) {
 	m.string_scanner = &ss
+	delete(m.clearedFields, FieldStringScanner)
 	delete(m.exprs, FieldStringScanner)
 }
 
@@ -1720,6 +1748,7 @@ func (m *Mutation) ResetStringScanner() {
 func (m *Mutation) SetDuration(t time.Duration) {
 	m.duration = &t
 	m.addduration = nil
+	delete(m.clearedFields, FieldDuration)
 	delete(m.exprs, FieldDuration)
 }
 
@@ -1796,6 +1825,7 @@ func (m *Mutation) ResetDir() {
 // SetNdir sets the "ndir" field.
 func (m *Mutation) SetNdir(h http.Dir) {
 	m.ndir = &h
+	delete(m.clearedFields, FieldNdir)
 }
 
 // Ndir returns the value of the "ndir" field in the mutation.
@@ -1828,6 +1858,7 @@ func (m *Mutation) ResetNdir() {
 // SetStr sets the "str" field.
 func (m *Mutation) SetStr(ss sql.NullString) {
 	m.str = &ss
+	delete(m.clearedFields, FieldStr)
 	delete(m.exprs, FieldStr)
 }
 
@@ -1863,6 +1894,7 @@ func (m *Mutation) ResetStr() {
 // SetNullStr sets the "null_str" field.
 func (m *Mutation) SetNullStr(ss *sql.NullString) {
 	m.null_str = &ss
+	delete(m.clearedFields, FieldNullStr)
 	delete(m.exprs, FieldNullStr)
 }
 
@@ -1898,6 +1930,7 @@ func (m *Mutation) ResetNullStr() {
 // SetLink sets the "link" field.
 func (m *Mutation) SetLink(s schema.Link) {
 	m.link = &s
+	delete(m.clearedFields, FieldLink)
 }
 
 // Link returns the value of the "link" field in the mutation.
@@ -1930,6 +1963,7 @@ func (m *Mutation) ResetLink() {
 // SetNullLink sets the "null_link" field.
 func (m *Mutation) SetNullLink(s *schema.Link) {
 	m.null_link = &s
+	delete(m.clearedFields, FieldNullLink)
 	delete(m.exprs, FieldNullLink)
 }
 
@@ -1965,6 +1999,7 @@ func (m *Mutation) ResetNullLink() {
 // SetActive sets the "active" field.
 func (m *Mutation) SetActive(s schema.Status) {
 	m.active = &s
+	delete(m.clearedFields, FieldActive)
 	delete(m.exprs, FieldActive)
 }
 
@@ -2000,6 +2035,7 @@ func (m *Mutation) ResetActive() {
 // SetNullActive sets the "null_active" field.
 func (m *Mutation) SetNullActive(s schema.Status) {
 	m.null_active = &s
+	delete(m.clearedFields, FieldNullActive)
 	delete(m.exprs, FieldNullActive)
 }
 
@@ -2035,6 +2071,7 @@ func (m *Mutation) ResetNullActive() {
 // SetDeleted sets the "deleted" field.
 func (m *Mutation) SetDeleted(sb *sql.NullBool) {
 	m.deleted = &sb
+	delete(m.clearedFields, FieldDeleted)
 	delete(m.exprs, FieldDeleted)
 }
 
@@ -2070,6 +2107,7 @@ func (m *Mutation) ResetDeleted() {
 // SetDeletedAt sets the "deleted_at" field.
 func (m *Mutation) SetDeletedAt(st *sql.NullTime) {
 	m.deleted_at = &st
+	delete(m.clearedFields, FieldDeletedAt)
 	delete(m.exprs, FieldDeletedAt)
 }
 
@@ -2105,6 +2143,7 @@ func (m *Mutation) ResetDeletedAt() {
 // SetRawData sets the "raw_data" field.
 func (m *Mutation) SetRawData(b []byte) {
 	m.raw_data = &b
+	delete(m.clearedFields, FieldRawData)
 }
 
 // RawData returns the value of the "raw_data" field in the mutation.
@@ -2137,6 +2176,7 @@ func (m *Mutation) ResetRawData() {
 // SetSensitive sets the "sensitive" field.
 func (m *Mutation) SetSensitive(b []byte) {
 	m.sensitive = &b
+	delete(m.clearedFields, FieldSensitive)
 	delete(m.exprs, FieldSensitive)
 }
 
@@ -2172,6 +2212,7 @@ func (m *Mutation) ResetSensitive() {
 // SetIp sets the "ip" field.
 func (m *Mutation) SetIp(n net.IP) {
 	m.ip = &n
+	delete(m.clearedFields, FieldIp)
 }
 
 // Ip returns the value of the "ip" field in the mutation.
@@ -2204,6 +2245,7 @@ func (m *Mutation) ResetIp() {
 // SetNullInt64 sets the "null_int64" field.
 func (m *Mutation) SetNullInt64(si *sql.NullInt64) {
 	m.null_int64 = &si
+	delete(m.clearedFields, FieldNullInt64)
 	delete(m.exprs, FieldNullInt64)
 }
 
@@ -2240,6 +2282,7 @@ func (m *Mutation) ResetNullInt64() {
 func (m *Mutation) SetSchemaInt(s schema.Int) {
 	m.schema_int = &s
 	m.addschema_int = nil
+	delete(m.clearedFields, FieldSchemaInt)
 	delete(m.exprs, FieldSchemaInt)
 }
 
@@ -2296,6 +2339,7 @@ func (m *Mutation) ResetSchemaInt() {
 func (m *Mutation) SetSchemaInt8(s schema.Int8) {
 	m.schema_int8 = &s
 	m.addschema_int8 = nil
+	delete(m.clearedFields, FieldSchemaInt8)
 	delete(m.exprs, FieldSchemaInt8)
 }
 
@@ -2352,6 +2396,7 @@ func (m *Mutation) ResetSchemaInt8() {
 func (m *Mutation) SetSchemaInt64(s schema.Int64) {
 	m.schema_int64 = &s
 	m.addschema_int64 = nil
+	delete(m.clearedFields, FieldSchemaInt64)
 	delete(m.exprs, FieldSchemaInt64)
 }
 
@@ -2408,6 +2453,7 @@ func (m *Mutation) ResetSchemaInt64() {
 func (m *Mutation) SetSchemaFloat(s schema.Float64) {
 	m.schema_float = &s
 	m.addschema_float = nil
+	delete(m.clearedFields, FieldSchemaFloat)
 	delete(m.exprs, FieldSchemaFloat)
 }
 
@@ -2464,6 +2510,7 @@ func (m *Mutation) ResetSchemaFloat() {
 func (m *Mutation) SetSchemaFloat32(s schema.Float32) {
 	m.schema_float32 = &s
 	m.addschema_float32 = nil
+	delete(m.clearedFields, FieldSchemaFloat32)
 	delete(m.exprs, FieldSchemaFloat32)
 }
 
@@ -2519,6 +2566,7 @@ func (m *Mutation) ResetSchemaFloat32() {
 // SetNullFloat sets the "null_float" field.
 func (m *Mutation) SetNullFloat(sf *sql.NullFloat64) {
 	m.null_float = &sf
+	delete(m.clearedFields, FieldNullFloat)
 	delete(m.exprs, FieldNullFloat)
 }
 
@@ -2573,6 +2621,7 @@ func (m *Mutation) ResetRole() {
 // SetPriority sets the "priority" field.
 func (m *Mutation) SetPriority(r role.Priority) {
 	m.priority = &r
+	delete(m.clearedFields, FieldPriority)
 }
 
 // Priority returns the value of the "priority" field in the mutation.
@@ -2605,6 +2654,7 @@ func (m *Mutation) ResetPriority() {
 // SetOptionalUuid sets the "optional_uuid" field.
 func (m *Mutation) SetOptionalUuid(u uuid.UUID) {
 	m.optional_uuid = &u
+	delete(m.clearedFields, FieldOptionalUuid)
 	delete(m.exprs, FieldOptionalUuid)
 }
 
@@ -2640,6 +2690,7 @@ func (m *Mutation) ResetOptionalUuid() {
 // SetNillableUuid sets the "nillable_uuid" field.
 func (m *Mutation) SetNillableUuid(u uuid.UUID) {
 	m.nillable_uuid = &u
+	delete(m.clearedFields, FieldNillableUuid)
 	delete(m.exprs, FieldNillableUuid)
 }
 
@@ -2676,6 +2727,7 @@ func (m *Mutation) ResetNillableUuid() {
 func (m *Mutation) SetStrings(s []string) {
 	m.strings = &s
 	m.appendstrings = nil
+	delete(m.clearedFields, FieldStrings)
 	delete(m.exprs, FieldStrings)
 }
 
@@ -2747,6 +2799,7 @@ func (m *Mutation) ResetPair() {
 // SetNilPair sets the "nil_pair" field.
 func (m *Mutation) SetNilPair(s *schema.Pair) {
 	m.nil_pair = &s
+	delete(m.clearedFields, FieldNilPair)
 	delete(m.exprs, FieldNilPair)
 }
 
@@ -2825,6 +2878,7 @@ func (m *Mutation) ResetTriple() {
 func (m *Mutation) SetBigInt(si schema.BigInt) {
 	m.big_int = &si
 	m.addbig_int = nil
+	delete(m.clearedFields, FieldBigInt)
 	delete(m.exprs, FieldBigInt)
 }
 
@@ -2880,6 +2934,7 @@ func (m *Mutation) ResetBigInt() {
 // SetPasswordOther sets the "password_other" field.
 func (m *Mutation) SetPasswordOther(s schema.Password) {
 	m.password_other = &s
+	delete(m.clearedFields, FieldPasswordOther)
 	delete(m.exprs, FieldPasswordOther)
 }
 
diff --git a/entc/integration/ent/file/mutation.go b/entc/integration/ent/file/mutation.go
index c7e04a67eb..cd4a8362a5 100644
--- a/entc/integration/ent/file/mutation.go
+++ b/entc/integration/ent/file/mutation.go
@@ -61,6 +61,7 @@ func (m *Mutation) Predicates() []predicate.File {
 func (m *Mutation) SetSetId(i int) {
 	m.set_id = &i
 	m.addset_id = nil
+	delete(m.clearedFields, FieldSetId)
 }
 
 // SetId returns the value of the "set_id" field in the mutation.
@@ -173,6 +174,7 @@ func (m *Mutation) ResetName() {
 // SetUser sets the "user" field.
 func (m *Mutation) SetUser(s string) {
 	m.user = &s
+	delete(m.clearedFields, FieldUser)
 	delete(m.exprs, FieldUser)
 }
 
@@ -208,6 +210,7 @@ func (m *Mutation) ResetUser() {
 // SetGroup sets the "group" field.
 func (m *Mutation) SetGroup(s string) {
 	m.group = &s
+	delete(m.clearedFields, FieldGroup)
 	delete(m.exprs, FieldGroup)
 }
 
@@ -243,6 +246,7 @@ func (m *Mutation) ResetGroup() {
 // SetOpField sets the "op" field.
 func (m *Mutation) SetOpField(b bool) {
 	m._op = &b
+	delete(m.clearedFields, FieldOp)
 	delete(m.exprs, FieldOp)
 }
 
@@ -279,6 +283,7 @@ func (m *Mutation) ResetOp() {
 func (m *Mutation) SetFieldId(i int) {
 	m.field_id = &i
 	m.addfield_id = nil
+	delete(m.clearedFields, FieldFieldId)
 	delete(m.exprs, FieldFieldId)
 }
 
@@ -334,6 +339,7 @@ func (m *Mutation) ResetFieldId() {
 // SetCreateTime sets the "create_time" field.
 func (m *Mutation) SetCreateTime(t time.Time) {
 	m.create_time = &t
+	delete(m.clearedFields, FieldCreateTime)
 	delete(m.exprs, FieldCreateTime)
 }
 
diff --git a/entc/integration/ent/group/mutation.go b/entc/integration/ent/group/mutation.go
index 412a68e54c..a3c9b79a4e 100644
--- a/entc/integration/ent/group/mutation.go
+++ b/entc/integration/ent/group/mutation.go
@@ -101,6 +101,7 @@ func (m *Mutation) ResetExpire() {
 // SetType sets the "type" field.
 func (m *Mutation) SetType(s string) {
 	m._type = &s
+	delete(m.clearedFields, FieldType)
 }
 
 // GetType returns the value of the "type" field in the mutation.
@@ -134,6 +135,7 @@ func (m *Mutation) ResetType() {
 func (m *Mutation) SetMaxUsers(i int) {
 	m.max_users = &i
 	m.addmax_users = nil
+	delete(m.clearedFields, FieldMaxUsers)
 }
 
 // MaxUsers returns the value of the "max_users" field in the mutation.
diff --git a/entc/integration/ent/item/mutation.go b/entc/integration/ent/item/mutation.go
index a9cfd959e4..2ff89c70bb 100644
--- a/entc/integration/ent/item/mutation.go
+++ b/entc/integration/ent/item/mutation.go
@@ -41,6 +41,7 @@ func (m *Mutation) Predicates() []predicate.Item {
 // SetText sets the "text" field.
 func (m *Mutation) SetText(s string) {
 	m.text = &s
+	delete(m.clearedFields, FieldText)
 }
 
 // Text returns the value of the "text" field in the mutation.
diff --git a/entc/integration/ent/node/mutation.go b/entc/integration/ent/node/mutation.go
index 242a955e4c..6a2bbd2e46 100644
--- a/entc/integration/ent/node/mutation.go
+++ b/entc/integration/ent/node/mutation.go
@@ -50,6 +50,7 @@ func (m *Mutation) Predicates() []predicate.Node {
 func (m *Mutation) SetValue(i int) {
 	m.value = &i
 	m.addvalue = nil
+	delete(m.clearedFields, FieldValue)
 	delete(m.exprs, FieldValue)
 }
 
@@ -105,6 +106,7 @@ func (m *Mutation) ResetValue() {
 // SetUpdatedAt sets the "updated_at" field.
 func (m *Mutation) SetUpdatedAt(t time.Time) {
 	m.updated_at = &t
+	delete(m.clearedFields, FieldUpdatedAt)
 	delete(m.exprs, FieldUpdatedAt)
 }
 
diff --git a/entc/integration/ent/pet/mutation.go b/entc/integration/ent/pet/mutation.go
index 7760ec7935..ad7d3ad025 100644
--- a/entc/integration/ent/pet/mutation.go
+++ b/entc/integration/ent/pet/mutation.go
@@ -116,6 +116,7 @@ func (m *Mutation) ResetName() {
 // SetUuid sets the "uuid" field.
 func (m *Mutation) SetUuid(u uuid.UUID) {
 	m.uuid = &u
+	delete(m.clearedFields, FieldUuid)
 	delete(m.exprs, FieldUuid)
 }
 
@@ -151,6 +152,7 @@ func (m *Mutation) ResetUuid() {
 // SetNickname sets the "nickname" field.
 func (m *Mutation) SetNickname(s string) {
 	m.nickname = &s
+	delete(m.clearedFields, FieldNickname)
 	delete(m.exprs, FieldNickname)
 }
 
@@ -207,6 +209,7 @@ func (m *Mutation) ResetTrained() {
 // SetOptionalTime sets the "optional_time" field.
 func (m *Mutation) SetOptionalTime(t time.Time) {
 	m.optional_time = &t
+	delete(m.clearedFields, FieldOptionalTime)
 	delete(m.exprs, FieldOptionalTime)
 }
 
diff --git a/entc/integration/ent/task/mutation.go b/entc/integration/ent/task/mutation.go
index a664a03db0..0aa2dd5d69 100644
--- a/entc/integration/ent/task/mutation.go
+++ b/entc/integration/ent/task/mutation.go
@@ -93,6 +93,7 @@ func (m *Mutation) ResetPriority() {
 // SetPriorities sets the "priorities" field.
 func (m *Mutation) SetPriorities(value map[string]task.Priority) {
 	m.priorities = &value
+	delete(m.clearedFields, FieldPriorities)
 	delete(m.exprs, FieldPriorities)
 }
 
@@ -147,6 +148,7 @@ func (m *Mutation) ResetCreatedAt() {
 // SetName sets the "name" field.
 func (m *Mutation) SetName(s string) {
 	m.name = &s
+	delete(m.clearedFields, FieldName)
 	delete(m.exprs, FieldName)
 }
 
@@ -182,6 +184,7 @@ func (m *Mutation) ResetName() {
 // SetOwner sets the "owner" field.
 func (m *Mutation) SetOwner(s string) {
 	m.owner = &s
+	delete(m.clearedFields, FieldOwner)
 	delete(m.exprs, FieldOwner)
 }
 
@@ -218,6 +221,7 @@ func (m *Mutation) ResetOwner() {
 func (m *Mutation) SetOrder(i int) {
 	m._order = &i
 	m.add_order = nil
+	delete(m.clearedFields, FieldOrder)
 	delete(m.exprs, FieldOrder)
 }
 
@@ -274,6 +278,7 @@ func (m *Mutation) ResetOrder() {
 func (m *Mutation) SetOrderOption(i int) {
 	m.order_option = &i
 	m.addorder_option = nil
+	delete(m.clearedFields, FieldOrderOption)
 	delete(m.exprs, FieldOrderOption)
 }
 
diff --git a/entc/integration/ent/user/mutation.go b/entc/integration/ent/user/mutation.go
index 97b8e2319e..2d730e1aff 100644
--- a/entc/integration/ent/user/mutation.go
+++ b/entc/integration/ent/user/mutation.go
@@ -86,6 +86,7 @@ func (m *Mutation) Predicates() []predicate.User {
 func (m *Mutation) SetOptionalInt(i int) {
 	m.optional_int = &i
 	m.addoptional_int = nil
+	delete(m.clearedFields, FieldOptionalInt)
 }
 
 // OptionalInt returns the value of the "optional_int" field in the mutation.
@@ -221,6 +222,7 @@ func (m *Mutation) ResetLast() {
 // SetNickname sets the "nickname" field.
 func (m *Mutation) SetNickname(s string) {
 	m.nickname = &s
+	delete(m.clearedFields, FieldNickname)
 	delete(m.exprs, FieldNickname)
 }
 
@@ -256,6 +258,7 @@ func (m *Mutation) ResetNickname() {
 // SetAddress sets the "address" field.
 func (m *Mutation) SetAddress(s string) {
 	m.address = &s
+	delete(m.clearedFields, FieldAddress)
 	delete(m.exprs, FieldAddress)
 }
 
@@ -291,6 +294,7 @@ func (m *Mutation) ResetAddress() {
 // SetPhone sets the "phone" field.
 func (m *Mutation) SetPhone(s string) {
 	m.phone = &s
+	delete(m.clearedFields, FieldPhone)
 	delete(m.exprs, FieldPhone)
 }
 
@@ -326,6 +330,7 @@ func (m *Mutation) ResetPhone() {
 // SetPassword sets the "password" field.
 func (m *Mutation) SetPassword(s string) {
 	m.password = &s
+	delete(m.clearedFields, FieldPassword)
 	delete(m.exprs, FieldPassword)
 }
 
@@ -399,6 +404,7 @@ func (m *Mutation) ResetEmployment() {
 // SetSsoCert sets the "SsoCert" field.
 func (m *Mutation) SetSsoCert(s string) {
 	m._SsoCert = &s
+	delete(m.clearedFields, FieldSsoCert)
 	delete(m.exprs, FieldSsoCert)
 }
 
@@ -435,6 +441,7 @@ func (m *Mutation) ResetSsoCert() {
 func (m *Mutation) SetFilesCount(i int) {
 	m.files_count = &i
 	m.addfiles_count = nil
+	delete(m.clearedFields, FieldFilesCount)
 	delete(m.exprs, FieldFilesCount)
 }
 
diff --git a/entc/integration/expr/ent/item/mutation.go b/entc/integration/expr/ent/item/mutation.go
index ab2ce63f87..903c107da3 100644
--- a/entc/integration/expr/ent/item/mutation.go
+++ b/entc/integration/expr/ent/item/mutation.go
@@ -108,6 +108,7 @@ func (m *Mutation) ResetLabel() {
 // SetNote sets the "note" field.
 func (m *Mutation) SetNote(s string) {
 	m.note = &s
+	delete(m.clearedFields, FieldNote)
 	delete(m.exprs, FieldNote)
 }
 
@@ -144,6 +145,7 @@ func (m *Mutation) ResetNote() {
 func (m *Mutation) SetTags(s []string) {
 	m.tags = &s
 	m.appendtags = nil
+	delete(m.clearedFields, FieldTags)
 	delete(m.exprs, FieldTags)
 }
 
diff --git a/entc/integration/hooks/ent/card/mutation.go b/entc/integration/hooks/ent/card/mutation.go
index 9f5fa62a25..98d4439053 100644
--- a/entc/integration/hooks/ent/card/mutation.go
+++ b/entc/integration/hooks/ent/card/mutation.go
@@ -68,6 +68,7 @@ func (m *Mutation) ResetNumber() {
 // SetName sets the "name" field.
 func (m *Mutation) SetName(s string) {
 	m.name = &s
+	delete(m.clearedFields, FieldName)
 	delete(m.exprs, FieldName)
 }
 
@@ -145,6 +146,7 @@ func (m *Mutation) ResetInHook() {
 // SetExpiredAt sets the "expired_at" field.
 func (m *Mutation) SetExpiredAt(t time.Time) {
 	m.expired_at = &t
+	delete(m.clearedFields, FieldExpiredAt)
 	delete(m.exprs, FieldExpiredAt)
 }
 
diff --git a/entc/integration/hooks/ent/pet/mutation.go b/entc/integration/hooks/ent/pet/mutation.go
index 53f6bef54e..3d488960d8 100644
--- a/entc/integration/hooks/ent/pet/mutation.go
+++ b/entc/integration/hooks/ent/pet/mutation.go
@@ -46,6 +46,7 @@ func (m *Mutation) Predicates() []predicate.Pet {
 // SetDeleteTime sets the "delete_time" field.
 func (m *Mutation) SetDeleteTime(t time.Time) {
 	m.delete_time = &t
+	delete(m.clearedFields, FieldDeleteTime)
 	delete(m.exprs, FieldDeleteTime)
 }
 
@@ -81,6 +82,7 @@ func (m *Mutation) ResetDeleteTime() {
 // SetName sets the "name" field.
 func (m *Mutation) SetName(s string) {
 	m.name = &s
+	delete(m.clearedFields, FieldName)
 	delete(m.exprs, FieldName)
 }
 
diff --git a/entc/integration/hooks/ent/user/mutation.go b/entc/integration/hooks/ent/user/mutation.go
index 3c5f00f388..d0cce84f07 100644
--- a/entc/integration/hooks/ent/user/mutation.go
+++ b/entc/integration/hooks/ent/user/mutation.go
@@ -122,6 +122,7 @@ func (m *Mutation) ResetName() {
 func (m *Mutation) SetWorth(u uint) {
 	m.worth = &u
 	m.addworth = nil
+	delete(m.clearedFields, FieldWorth)
 	delete(m.exprs, FieldWorth)
 }
 
@@ -177,6 +178,7 @@ func (m *Mutation) ResetWorth() {
 // SetPassword sets the "password" field.
 func (m *Mutation) SetPassword(s string) {
 	m.password = &s
+	delete(m.clearedFields, FieldPassword)
 	delete(m.exprs, FieldPassword)
 }
 
diff --git a/entc/integration/integration_test.go b/entc/integration/integration_test.go
index b862eb39f7..43e9fbd1f8 100644
--- a/entc/integration/integration_test.go
+++ b/entc/integration/integration_test.go
@@ -1435,6 +1435,17 @@ func ClearFields(t *testing.T, client *ent.Client) {
 	t.Log("revert previous set")
 	img = img.Update().SetUser("a8m").ClearUser().SaveX(ctx)
 	require.Nil(t, img.User)
+
+	// The later call wins, as it does the other way around. Both would
+	// otherwise be emitted, which PostgreSQL refuses as two assignments to
+	// one column, and a hook would see the field both set and cleared.
+	t.Log("set after clear")
+	u := img.Update().ClearUser().SetUser("a8m")
+	require.False(t, u.Mutation().UserCleared())
+	img = u.SaveX(ctx)
+	require.Equal(t, "a8m", *img.User)
+	img = client.File.Query().OnlyX(ctx)
+	require.Equal(t, "a8m", *img.User)
 }
 
 func ClearEdges(t *testing.T, client *ent.Client) {
diff --git a/entc/integration/json/ent/user/mutation.go b/entc/integration/json/ent/user/mutation.go
index a9d685bfb3..f2eec7f2fc 100644
--- a/entc/integration/json/ent/user/mutation.go
+++ b/entc/integration/json/ent/user/mutation.go
@@ -67,6 +67,7 @@ func (m *Mutation) Predicates() []predicate.User {
 // SetT sets the "t" field.
 func (m *Mutation) SetT(s *schema.T) {
 	m.t = &s
+	delete(m.clearedFields, FieldT)
 	delete(m.exprs, FieldT)
 }
 
@@ -102,6 +103,7 @@ func (m *Mutation) ResetT() {
 // SetUrl sets the "url" field.
 func (m *Mutation) SetUrl(u *url.URL) {
 	m.url = &u
+	delete(m.clearedFields, FieldUrl)
 	delete(m.exprs, FieldUrl)
 }
 
@@ -138,6 +140,7 @@ func (m *Mutation) ResetUrl() {
 func (m *Mutation) SetUrls(u []*url.URL) {
 	m._Urls = &u
 	m.append_Urls = nil
+	delete(m.clearedFields, FieldUrls)
 	delete(m.exprs, FieldUrls)
 }
 
@@ -189,6 +192,7 @@ func (m *Mutation) ResetUrls() {
 func (m *Mutation) SetRaw(j jsontext.Value) {
 	m.raw = &j
 	m.appendraw = nil
+	delete(m.clearedFields, FieldRaw)
 	delete(m.exprs, FieldRaw)
 }
 
@@ -276,6 +280,7 @@ func (m *Mutation) ResetDirs() {
 func (m *Mutation) SetInts(i []int) {
 	m.ints = &i
 	m.appendints = nil
+	delete(m.clearedFields, FieldInts)
 	delete(m.exprs, FieldInts)
 }
 
@@ -327,6 +332,7 @@ func (m *Mutation) ResetInts() {
 func (m *Mutation) SetFloats(f []float64) {
 	m.floats = &f
 	m.appendfloats = nil
+	delete(m.clearedFields, FieldFloats)
 	delete(m.exprs, FieldFloats)
 }
 
@@ -378,6 +384,7 @@ func (m *Mutation) ResetFloats() {
 func (m *Mutation) SetStrings(s []string) {
 	m.strings = &s
 	m.appendstrings = nil
+	delete(m.clearedFields, FieldStrings)
 	delete(m.exprs, FieldStrings)
 }
 
@@ -429,6 +436,7 @@ func (m *Mutation) ResetStrings() {
 func (m *Mutation) SetIntsValidate(i []int) {
 	m.ints_validate = &i
 	m.appendints_validate = nil
+	delete(m.clearedFields, FieldIntsValidate)
 }
 
 // IntsValidate returns the value of the "ints_validate" field in the mutation.
@@ -477,6 +485,7 @@ func (m *Mutation) ResetIntsValidate() {
 func (m *Mutation) SetFloatsValidate(f []float64) {
 	m.floats_validate = &f
 	m.appendfloats_validate = nil
+	delete(m.clearedFields, FieldFloatsValidate)
 }
 
 // FloatsValidate returns the value of the "floats_validate" field in the mutation.
@@ -525,6 +534,7 @@ func (m *Mutation) ResetFloatsValidate() {
 func (m *Mutation) SetStringsValidate(s []string) {
 	m.strings_validate = &s
 	m.appendstrings_validate = nil
+	delete(m.clearedFields, FieldStringsValidate)
 }
 
 // StringsValidate returns the value of the "strings_validate" field in the mutation.
@@ -572,6 +582,7 @@ func (m *Mutation) ResetStringsValidate() {
 // SetAddr sets the "addr" field.
 func (m *Mutation) SetAddr(s schema.Addr) {
 	m.addr = &s
+	delete(m.clearedFields, FieldAddr)
 	delete(m.exprs, FieldAddr)
 }
 
@@ -607,6 +618,7 @@ func (m *Mutation) ResetAddr() {
 // SetUnknown sets the "unknown" field.
 func (m *Mutation) SetUnknown(a any) {
 	m.unknown = &a
+	delete(m.clearedFields, FieldUnknown)
 	delete(m.exprs, FieldUnknown)
 }
 
diff --git a/entc/integration/migrate/entv1/conversion/mutation.go b/entc/integration/migrate/entv1/conversion/mutation.go
index bb5817abc6..b8014dc2e1 100644
--- a/entc/integration/migrate/entv1/conversion/mutation.go
+++ b/entc/integration/migrate/entv1/conversion/mutation.go
@@ -58,6 +58,7 @@ func (m *Mutation) Predicates() []predicate.Conversion {
 // SetName sets the "name" field.
 func (m *Mutation) SetName(s string) {
 	m.name = &s
+	delete(m.clearedFields, FieldName)
 	delete(m.exprs, FieldName)
 }
 
@@ -94,6 +95,7 @@ func (m *Mutation) ResetName() {
 func (m *Mutation) SetInt8ToString(i int8) {
 	m.int8_to_string = &i
 	m.addint8_to_string = nil
+	delete(m.clearedFields, FieldInt8ToString)
 	delete(m.exprs, FieldInt8ToString)
 }
 
@@ -150,6 +152,7 @@ func (m *Mutation) ResetInt8ToString() {
 func (m *Mutation) SetUint8ToString(u uint8) {
 	m.uint8_to_string = &u
 	m.adduint8_to_string = nil
+	delete(m.clearedFields, FieldUint8ToString)
 	delete(m.exprs, FieldUint8ToString)
 }
 
@@ -206,6 +209,7 @@ func (m *Mutation) ResetUint8ToString() {
 func (m *Mutation) SetInt16ToString(i int16) {
 	m.int16_to_string = &i
 	m.addint16_to_string = nil
+	delete(m.clearedFields, FieldInt16ToString)
 	delete(m.exprs, FieldInt16ToString)
 }
 
@@ -262,6 +266,7 @@ func (m *Mutation) ResetInt16ToString() {
 func (m *Mutation) SetUint16ToString(u uint16) {
 	m.uint16_to_string = &u
 	m.adduint16_to_string = nil
+	delete(m.clearedFields, FieldUint16ToString)
 	delete(m.exprs, FieldUint16ToString)
 }
 
@@ -318,6 +323,7 @@ func (m *Mutation) ResetUint16ToString() {
 func (m *Mutation) SetInt32ToString(i int32) {
 	m.int32_to_string = &i
 	m.addint32_to_string = nil
+	delete(m.clearedFields, FieldInt32ToString)
 	delete(m.exprs, FieldInt32ToString)
 }
 
@@ -374,6 +380,7 @@ func (m *Mutation) ResetInt32ToString() {
 func (m *Mutation) SetUint32ToString(u uint32) {
 	m.uint32_to_string = &u
 	m.adduint32_to_string = nil
+	delete(m.clearedFields, FieldUint32ToString)
 	delete(m.exprs, FieldUint32ToString)
 }
 
@@ -430,6 +437,7 @@ func (m *Mutation) ResetUint32ToString() {
 func (m *Mutation) SetInt64ToString(i int64) {
 	m.int64_to_string = &i
 	m.addint64_to_string = nil
+	delete(m.clearedFields, FieldInt64ToString)
 	delete(m.exprs, FieldInt64ToString)
 }
 
@@ -486,6 +494,7 @@ func (m *Mutation) ResetInt64ToString() {
 func (m *Mutation) SetUint64ToString(u uint64) {
 	m.uint64_to_string = &u
 	m.adduint64_to_string = nil
+	delete(m.clearedFields, FieldUint64ToString)
 	delete(m.exprs, FieldUint64ToString)
 }
 
diff --git a/entc/integration/migrate/entv1/customtype/mutation.go b/entc/integration/migrate/entv1/customtype/mutation.go
index 90070ad5da..9e91a04ec6 100644
--- a/entc/integration/migrate/entv1/customtype/mutation.go
+++ b/entc/integration/migrate/entv1/customtype/mutation.go
@@ -42,6 +42,7 @@ func (m *Mutation) Predicates() []predicate.CustomType {
 // SetCustom sets the "custom" field.
 func (m *Mutation) SetCustom(s string) {
 	m.custom = &s
+	delete(m.clearedFields, FieldCustom)
 	delete(m.exprs, FieldCustom)
 }
 
diff --git a/entc/integration/migrate/entv1/user/mutation.go b/entc/integration/migrate/entv1/user/mutation.go
index ed8a322ca6..fe90a7ce71 100644
--- a/entc/integration/migrate/entv1/user/mutation.go
+++ b/entc/integration/migrate/entv1/user/mutation.go
@@ -123,6 +123,7 @@ func (m *Mutation) ResetName() {
 // SetDescription sets the "description" field.
 func (m *Mutation) SetDescription(s string) {
 	m.description = &s
+	delete(m.clearedFields, FieldDescription)
 	delete(m.exprs, FieldDescription)
 }
 
@@ -179,6 +180,7 @@ func (m *Mutation) ResetNickname() {
 // SetAddress sets the "address" field.
 func (m *Mutation) SetAddress(s string) {
 	m.address = &s
+	delete(m.clearedFields, FieldAddress)
 	delete(m.exprs, FieldAddress)
 }
 
@@ -214,6 +216,7 @@ func (m *Mutation) ResetAddress() {
 // SetRenamed sets the "renamed" field.
 func (m *Mutation) SetRenamed(s string) {
 	m.renamed = &s
+	delete(m.clearedFields, FieldRenamed)
 	delete(m.exprs, FieldRenamed)
 }
 
@@ -270,6 +273,7 @@ func (m *Mutation) ResetOldToken() {
 // SetBlob sets the "blob" field.
 func (m *Mutation) SetBlob(b []byte) {
 	m.blob = &b
+	delete(m.clearedFields, FieldBlob)
 }
 
 // Blob returns the value of the "blob" field in the mutation.
@@ -302,6 +306,7 @@ func (m *Mutation) ResetBlob() {
 // SetState sets the "state" field.
 func (m *Mutation) SetState(u State) {
 	m.state = &u
+	delete(m.clearedFields, FieldState)
 }
 
 // State returns the value of the "state" field in the mutation.
@@ -334,6 +339,7 @@ func (m *Mutation) ResetState() {
 // SetStatus sets the "status" field.
 func (m *Mutation) SetStatus(s string) {
 	m.status = &s
+	delete(m.clearedFields, FieldStatus)
 	delete(m.exprs, FieldStatus)
 }
 
@@ -369,6 +375,7 @@ func (m *Mutation) ResetStatus() {
 // SetWorkplace sets the "workplace" field.
 func (m *Mutation) SetWorkplace(s string) {
 	m.workplace = &s
+	delete(m.clearedFields, FieldWorkplace)
 }
 
 // Workplace returns the value of the "workplace" field in the mutation.
@@ -401,6 +408,7 @@ func (m *Mutation) ResetWorkplace() {
 // SetDropOptional sets the "drop_optional" field.
 func (m *Mutation) SetDropOptional(s string) {
 	m.drop_optional = &s
+	delete(m.clearedFields, FieldDropOptional)
 	delete(m.exprs, FieldDropOptional)
 }
 
diff --git a/entc/integration/migrate/entv2/car/mutation.go b/entc/integration/migrate/entv2/car/mutation.go
index fb0c6d77e1..5ed43a3c7c 100644
--- a/entc/integration/migrate/entv2/car/mutation.go
+++ b/entc/integration/migrate/entv2/car/mutation.go
@@ -44,6 +44,7 @@ func (m *Mutation) Predicates() []predicate.Car {
 // SetName sets the "name" field.
 func (m *Mutation) SetName(s string) {
 	m.name = &s
+	delete(m.clearedFields, FieldName)
 	delete(m.exprs, FieldName)
 }
 
diff --git a/entc/integration/migrate/entv2/conversion/mutation.go b/entc/integration/migrate/entv2/conversion/mutation.go
index 02e94c2726..1607ba8610 100644
--- a/entc/integration/migrate/entv2/conversion/mutation.go
+++ b/entc/integration/migrate/entv2/conversion/mutation.go
@@ -50,6 +50,7 @@ func (m *Mutation) Predicates() []predicate.Conversion {
 // SetName sets the "name" field.
 func (m *Mutation) SetName(s string) {
 	m.name = &s
+	delete(m.clearedFields, FieldName)
 	delete(m.exprs, FieldName)
 }
 
@@ -85,6 +86,7 @@ func (m *Mutation) ResetName() {
 // SetInt8ToString sets the "int8_to_string" field.
 func (m *Mutation) SetInt8ToString(s string) {
 	m.int8_to_string = &s
+	delete(m.clearedFields, FieldInt8ToString)
 	delete(m.exprs, FieldInt8ToString)
 }
 
@@ -120,6 +122,7 @@ func (m *Mutation) ResetInt8ToString() {
 // SetUint8ToString sets the "uint8_to_string" field.
 func (m *Mutation) SetUint8ToString(s string) {
 	m.uint8_to_string = &s
+	delete(m.clearedFields, FieldUint8ToString)
 	delete(m.exprs, FieldUint8ToString)
 }
 
@@ -155,6 +158,7 @@ func (m *Mutation) ResetUint8ToString() {
 // SetInt16ToString sets the "int16_to_string" field.
 func (m *Mutation) SetInt16ToString(s string) {
 	m.int16_to_string = &s
+	delete(m.clearedFields, FieldInt16ToString)
 	delete(m.exprs, FieldInt16ToString)
 }
 
@@ -190,6 +194,7 @@ func (m *Mutation) ResetInt16ToString() {
 // SetUint16ToString sets the "uint16_to_string" field.
 func (m *Mutation) SetUint16ToString(s string) {
 	m.uint16_to_string = &s
+	delete(m.clearedFields, FieldUint16ToString)
 	delete(m.exprs, FieldUint16ToString)
 }
 
@@ -225,6 +230,7 @@ func (m *Mutation) ResetUint16ToString() {
 // SetInt32ToString sets the "int32_to_string" field.
 func (m *Mutation) SetInt32ToString(s string) {
 	m.int32_to_string = &s
+	delete(m.clearedFields, FieldInt32ToString)
 	delete(m.exprs, FieldInt32ToString)
 }
 
@@ -260,6 +266,7 @@ func (m *Mutation) ResetInt32ToString() {
 // SetUint32ToString sets the "uint32_to_string" field.
 func (m *Mutation) SetUint32ToString(s string) {
 	m.uint32_to_string = &s
+	delete(m.clearedFields, FieldUint32ToString)
 	delete(m.exprs, FieldUint32ToString)
 }
 
@@ -295,6 +302,7 @@ func (m *Mutation) ResetUint32ToString() {
 // SetInt64ToString sets the "int64_to_string" field.
 func (m *Mutation) SetInt64ToString(s string) {
 	m.int64_to_string = &s
+	delete(m.clearedFields, FieldInt64ToString)
 	delete(m.exprs, FieldInt64ToString)
 }
 
@@ -330,6 +338,7 @@ func (m *Mutation) ResetInt64ToString() {
 // SetUint64ToString sets the "uint64_to_string" field.
 func (m *Mutation) SetUint64ToString(s string) {
 	m.uint64_to_string = &s
+	delete(m.clearedFields, FieldUint64ToString)
 	delete(m.exprs, FieldUint64ToString)
 }
 
diff --git a/entc/integration/migrate/entv2/customtype/mutation.go b/entc/integration/migrate/entv2/customtype/mutation.go
index 1db5cedb24..d0a9d9194d 100644
--- a/entc/integration/migrate/entv2/customtype/mutation.go
+++ b/entc/integration/migrate/entv2/customtype/mutation.go
@@ -45,6 +45,7 @@ func (m *Mutation) Predicates() []predicate.CustomType {
 // SetCustom sets the "custom" field.
 func (m *Mutation) SetCustom(s string) {
 	m.custom = &s
+	delete(m.clearedFields, FieldCustom)
 	delete(m.exprs, FieldCustom)
 }
 
@@ -80,6 +81,7 @@ func (m *Mutation) ResetCustom() {
 // SetTz0 sets the "tz0" field.
 func (m *Mutation) SetTz0(t time.Time) {
 	m.tz0 = &t
+	delete(m.clearedFields, FieldTz0)
 	delete(m.exprs, FieldTz0)
 }
 
@@ -115,6 +117,7 @@ func (m *Mutation) ResetTz0() {
 // SetTz3 sets the "tz3" field.
 func (m *Mutation) SetTz3(t time.Time) {
 	m.tz3 = &t
+	delete(m.clearedFields, FieldTz3)
 	delete(m.exprs, FieldTz3)
 }
 
diff --git a/entc/integration/migrate/entv2/media/mutation.go b/entc/integration/migrate/entv2/media/mutation.go
index 21c5400037..fa17b201ba 100644
--- a/entc/integration/migrate/entv2/media/mutation.go
+++ b/entc/integration/migrate/entv2/media/mutation.go
@@ -44,6 +44,7 @@ func (m *Mutation) Predicates() []predicate.Media {
 // SetSource sets the "source" field.
 func (m *Mutation) SetSource(s string) {
 	m.source = &s
+	delete(m.clearedFields, FieldSource)
 	delete(m.exprs, FieldSource)
 }
 
@@ -79,6 +80,7 @@ func (m *Mutation) ResetSource() {
 // SetSourceUri sets the "source_uri" field.
 func (m *Mutation) SetSourceUri(s string) {
 	m.source_uri = &s
+	delete(m.clearedFields, FieldSourceUri)
 	delete(m.exprs, FieldSourceUri)
 }
 
@@ -114,6 +116,7 @@ func (m *Mutation) ResetSourceUri() {
 // SetText sets the "text" field.
 func (m *Mutation) SetText(s string) {
 	m.text = &s
+	delete(m.clearedFields, FieldText)
 	delete(m.exprs, FieldText)
 }
 
diff --git a/entc/integration/migrate/entv2/pet/mutation.go b/entc/integration/migrate/entv2/pet/mutation.go
index 4e9d7d578f..442448f95a 100644
--- a/entc/integration/migrate/entv2/pet/mutation.go
+++ b/entc/integration/migrate/entv2/pet/mutation.go
@@ -44,6 +44,7 @@ func (m *Mutation) Predicates() []predicate.Pet {
 // SetName sets the "name" field.
 func (m *Mutation) SetName(s string) {
 	m.name = &s
+	delete(m.clearedFields, FieldName)
 	delete(m.exprs, FieldName)
 }
 
diff --git a/entc/integration/migrate/entv2/user/mutation.go b/entc/integration/migrate/entv2/user/mutation.go
index ab09e46fa6..433203224b 100644
--- a/entc/integration/migrate/entv2/user/mutation.go
+++ b/entc/integration/migrate/entv2/user/mutation.go
@@ -196,6 +196,7 @@ func (m *Mutation) ResetName() {
 // SetDescription sets the "description" field.
 func (m *Mutation) SetDescription(s string) {
 	m.description = &s
+	delete(m.clearedFields, FieldDescription)
 	delete(m.exprs, FieldDescription)
 }
 
@@ -271,6 +272,7 @@ func (m *Mutation) ResetPhone() {
 // SetBuffer sets the "buffer" field.
 func (m *Mutation) SetBuffer(b []byte) {
 	m.buffer = &b
+	delete(m.clearedFields, FieldBuffer)
 	delete(m.exprs, FieldBuffer)
 }
 
@@ -327,6 +329,7 @@ func (m *Mutation) ResetTitle() {
 // SetNewName sets the "new_name" field.
 func (m *Mutation) SetNewName(s string) {
 	m.new_name = &s
+	delete(m.clearedFields, FieldNewName)
 	delete(m.exprs, FieldNewName)
 }
 
@@ -383,6 +386,7 @@ func (m *Mutation) ResetNewToken() {
 // SetBlob sets the "blob" field.
 func (m *Mutation) SetBlob(b []byte) {
 	m.blob = &b
+	delete(m.clearedFields, FieldBlob)
 }
 
 // Blob returns the value of the "blob" field in the mutation.
@@ -415,6 +419,7 @@ func (m *Mutation) ResetBlob() {
 // SetState sets the "state" field.
 func (m *Mutation) SetState(u State) {
 	m.state = &u
+	delete(m.clearedFields, FieldState)
 }
 
 // State returns the value of the "state" field in the mutation.
@@ -447,6 +452,7 @@ func (m *Mutation) ResetState() {
 // SetStatus sets the "status" field.
 func (m *Mutation) SetStatus(u Status) {
 	m.status = &u
+	delete(m.clearedFields, FieldStatus)
 }
 
 // Status returns the value of the "status" field in the mutation.
@@ -479,6 +485,7 @@ func (m *Mutation) ResetStatus() {
 // SetWorkplace sets the "workplace" field.
 func (m *Mutation) SetWorkplace(s string) {
 	m.workplace = &s
+	delete(m.clearedFields, FieldWorkplace)
 	delete(m.exprs, FieldWorkplace)
 }
 
@@ -515,6 +522,7 @@ func (m *Mutation) ResetWorkplace() {
 func (m *Mutation) SetRoles(s []string) {
 	m.roles = &s
 	m.appendroles = nil
+	delete(m.clearedFields, FieldRoles)
 	delete(m.exprs, FieldRoles)
 }
 
@@ -565,6 +573,7 @@ func (m *Mutation) ResetRoles() {
 // SetDefaultExpr sets the "default_expr" field.
 func (m *Mutation) SetDefaultExpr(s string) {
 	m.default_expr = &s
+	delete(m.clearedFields, FieldDefaultExpr)
 	delete(m.exprs, FieldDefaultExpr)
 }
 
@@ -600,6 +609,7 @@ func (m *Mutation) ResetDefaultExpr() {
 // SetDefaultExprs sets the "default_exprs" field.
 func (m *Mutation) SetDefaultExprs(s string) {
 	m.default_exprs = &s
+	delete(m.clearedFields, FieldDefaultExprs)
 	delete(m.exprs, FieldDefaultExprs)
 }
 
diff --git a/entc/integration/migrate/versioned/user/mutation.go b/entc/integration/migrate/versioned/user/mutation.go
index b66c310026..9a19a5574a 100644
--- a/entc/integration/migrate/versioned/user/mutation.go
+++ b/entc/integration/migrate/versioned/user/mutation.go
@@ -105,6 +105,7 @@ func (m *Mutation) ResetName() {
 // SetAddress sets the "address" field.
 func (m *Mutation) SetAddress(s string) {
 	m.address = &s
+	delete(m.clearedFields, FieldAddress)
 	delete(m.exprs, FieldAddress)
 }
 
diff --git a/entc/integration/multischema/ent/pet/mutation.go b/entc/integration/multischema/ent/pet/mutation.go
index 8773dc2f97..6bb267d2b2 100644
--- a/entc/integration/multischema/ent/pet/mutation.go
+++ b/entc/integration/multischema/ent/pet/mutation.go
@@ -65,6 +65,7 @@ func (m *Mutation) ResetName() {
 // SetOwnerId sets the "owner_id" field.
 func (m *Mutation) SetOwnerId(i int) {
 	m.owner = &i
+	delete(m.clearedFields, FieldOwnerId)
 }
 
 // OwnerId returns the value of the "owner_id" field in the mutation.
diff --git a/entc/integration/multischema/versioned/pet/mutation.go b/entc/integration/multischema/versioned/pet/mutation.go
index cac9e9fb9a..6468f35c65 100644
--- a/entc/integration/multischema/versioned/pet/mutation.go
+++ b/entc/integration/multischema/versioned/pet/mutation.go
@@ -65,6 +65,7 @@ func (m *Mutation) ResetName() {
 // SetOwnerId sets the "owner_id" field.
 func (m *Mutation) SetOwnerId(i int) {
 	m.owner = &i
+	delete(m.clearedFields, FieldOwnerId)
 }
 
 // OwnerId returns the value of the "owner_id" field in the mutation.
diff --git a/entc/integration/notnull/ent/blob/mutation.go b/entc/integration/notnull/ent/blob/mutation.go
index 55600784a6..23ab6014e0 100644
--- a/entc/integration/notnull/ent/blob/mutation.go
+++ b/entc/integration/notnull/ent/blob/mutation.go
@@ -64,6 +64,7 @@ func (m *Mutation) ResetData() {
 // SetNote sets the "note" field.
 func (m *Mutation) SetNote(b []byte) {
 	m.note = &b
+	delete(m.clearedFields, FieldNote)
 	delete(m.exprs, FieldNote)
 }
 
diff --git a/entc/integration/privacy/ent/task/mutation.go b/entc/integration/privacy/ent/task/mutation.go
index 68216c25c0..3a66222133 100644
--- a/entc/integration/privacy/ent/task/mutation.go
+++ b/entc/integration/privacy/ent/task/mutation.go
@@ -70,6 +70,7 @@ func (m *Mutation) ResetTitle() {
 // SetDescription sets the "description" field.
 func (m *Mutation) SetDescription(s string) {
 	m.description = &s
+	delete(m.clearedFields, FieldDescription)
 	delete(m.exprs, FieldDescription)
 }
 
@@ -124,6 +125,7 @@ func (m *Mutation) ResetStatus() {
 // SetUuid sets the "uuid" field.
 func (m *Mutation) SetUuid(u uuid.UUID) {
 	m.uuid = &u
+	delete(m.clearedFields, FieldUuid)
 	delete(m.exprs, FieldUuid)
 }
 
diff --git a/entc/integration/privacy/ent/user/mutation.go b/entc/integration/privacy/ent/user/mutation.go
index 0636bd4592..f9874de2c9 100644
--- a/entc/integration/privacy/ent/user/mutation.go
+++ b/entc/integration/privacy/ent/user/mutation.go
@@ -70,6 +70,7 @@ func (m *Mutation) ResetName() {
 func (m *Mutation) SetAge(u uint) {
 	m.age = &u
 	m.addage = nil
+	delete(m.clearedFields, FieldAge)
 	delete(m.exprs, FieldAge)
 }
 
diff --git a/entc/integration/returning/ent/item/mutation.go b/entc/integration/returning/ent/item/mutation.go
index 41ca7765cc..c4c3dace16 100644
--- a/entc/integration/returning/ent/item/mutation.go
+++ b/entc/integration/returning/ent/item/mutation.go
@@ -64,6 +64,7 @@ func (m *Mutation) ResetName() {
 // SetMotto sets the "motto" field.
 func (m *Mutation) SetMotto(s string) {
 	m.motto = &s
+	delete(m.clearedFields, FieldMotto)
 	delete(m.exprs, FieldMotto)
 }
 
diff --git a/entc/integration/returning/ent/thing/mutation.go b/entc/integration/returning/ent/thing/mutation.go
index b4a701c21a..1c14352688 100644
--- a/entc/integration/returning/ent/thing/mutation.go
+++ b/entc/integration/returning/ent/thing/mutation.go
@@ -90,6 +90,7 @@ func (m *Mutation) ResetAt() {
 // SetMotto sets the "motto" field.
 func (m *Mutation) SetMotto(s string) {
 	m.motto = &s
+	delete(m.clearedFields, FieldMotto)
 	delete(m.exprs, FieldMotto)
 }
 
@@ -126,6 +127,7 @@ func (m *Mutation) ResetMotto() {
 func (m *Mutation) SetDoc(j jsontext.Value) {
 	m.doc = &j
 	m.appenddoc = nil
+	delete(m.clearedFields, FieldDoc)
 	delete(m.exprs, FieldDoc)
 }
 
diff --git a/entc/integration/stduuid/ent/user/mutation.go b/entc/integration/stduuid/ent/user/mutation.go
index f5dcc1232e..e86f7ee6a3 100644
--- a/entc/integration/stduuid/ent/user/mutation.go
+++ b/entc/integration/stduuid/ent/user/mutation.go
@@ -67,6 +67,7 @@ func (m *Mutation) ResetName() {
 // SetRef sets the "ref" field.
 func (m *Mutation) SetRef(u uuid.UUID) {
 	m.ref = &u
+	delete(m.clearedFields, FieldRef)
 	delete(m.exprs, FieldRef)
 }
 
diff --git a/entc/integration/template/ent/pet/mutation.go b/entc/integration/template/ent/pet/mutation.go
index 49be6ce0d2..25e48c83e9 100644
--- a/entc/integration/template/ent/pet/mutation.go
+++ b/entc/integration/template/ent/pet/mutation.go
@@ -88,6 +88,7 @@ func (m *Mutation) ResetAge() {
 // SetLicensedAt sets the "licensed_at" field.
 func (m *Mutation) SetLicensedAt(t time.Time) {
 	m.licensed_at = &t
+	delete(m.clearedFields, FieldLicensedAt)
 	delete(m.exprs, FieldLicensedAt)
 }
 
diff --git a/examples/encryptfield/ent/user/mutation.go b/examples/encryptfield/ent/user/mutation.go
index 1cd7ac6d6c..9ad55e39df 100644
--- a/examples/encryptfield/ent/user/mutation.go
+++ b/examples/encryptfield/ent/user/mutation.go
@@ -43,6 +43,7 @@ func (m *Mutation) Predicates() []predicate.User {
 // SetName sets the "name" field.
 func (m *Mutation) SetName(s string) {
 	m.name = &s
+	delete(m.clearedFields, FieldName)
 	delete(m.exprs, FieldName)
 }
 
diff --git a/examples/entcpkg/ent/user/mutation.go b/examples/entcpkg/ent/user/mutation.go
index 67ebfffc23..f58742410e 100644
--- a/examples/entcpkg/ent/user/mutation.go
+++ b/examples/entcpkg/ent/user/mutation.go
@@ -44,6 +44,7 @@ func (m *Mutation) Predicates() []predicate.User {
 // SetName sets the "name" field.
 func (m *Mutation) SetName(s string) {
 	m.name = &s
+	delete(m.clearedFields, FieldName)
 	delete(m.exprs, FieldName)
 }
 
@@ -80,6 +81,7 @@ func (m *Mutation) ResetName() {
 func (m *Mutation) SetAge(i int) {
 	m.age = &i
 	m.addage = nil
+	delete(m.clearedFields, FieldAge)
 	delete(m.exprs, FieldAge)
 }
 
diff --git a/examples/fs/ent/file/mutation.go b/examples/fs/ent/file/mutation.go
index e14cb9eba1..8ec07df9f5 100644
--- a/examples/fs/ent/file/mutation.go
+++ b/examples/fs/ent/file/mutation.go
@@ -90,6 +90,7 @@ func (m *Mutation) ResetDeleted() {
 // SetParentId sets the "parent_id" field.
 func (m *Mutation) SetParentId(i int) {
 	m.parent = &i
+	delete(m.clearedFields, FieldParentId)
 }
 
 // ParentId returns the value of the "parent_id" field in the mutation.
diff --git a/examples/migration/ent/card/mutation.go b/examples/migration/ent/card/mutation.go
index a6c313124a..64f3f11b63 100644
--- a/examples/migration/ent/card/mutation.go
+++ b/examples/migration/ent/card/mutation.go
@@ -114,6 +114,7 @@ func (m *Mutation) ResetCvvHash() {
 // SetExpiresAt sets the "expires_at" field.
 func (m *Mutation) SetExpiresAt(t time.Time) {
 	m.expires_at = &t
+	delete(m.clearedFields, FieldExpiresAt)
 	delete(m.exprs, FieldExpiresAt)
 }
 
diff --git a/examples/migration/ent/session/mutation.go b/examples/migration/ent/session/mutation.go
index e3be2c59b3..ee39b3a526 100644
--- a/examples/migration/ent/session/mutation.go
+++ b/examples/migration/ent/session/mutation.go
@@ -92,6 +92,7 @@ func (m *Mutation) ResetIssuedAt() {
 // SetExpiresAt sets the "expires_at" field.
 func (m *Mutation) SetExpiresAt(t time.Time) {
 	m.expires_at = &t
+	delete(m.clearedFields, FieldExpiresAt)
 	delete(m.exprs, FieldExpiresAt)
 }
 
@@ -127,6 +128,7 @@ func (m *Mutation) ResetExpiresAt() {
 // SetToken sets the "token" field.
 func (m *Mutation) SetToken(s string) {
 	m.token = &s
+	delete(m.clearedFields, FieldToken)
 	delete(m.exprs, FieldToken)
 }
 
@@ -162,6 +164,7 @@ func (m *Mutation) ResetToken() {
 // SetMethod sets the "method" field.
 func (m *Mutation) SetMethod(value map[string]interface{}) {
 	m.method = &value
+	delete(m.clearedFields, FieldMethod)
 	delete(m.exprs, FieldMethod)
 }
 
@@ -197,6 +200,7 @@ func (m *Mutation) ResetMethod() {
 // SetDeviceId sets the "device_id" field.
 func (m *Mutation) SetDeviceId(u uuid.UUID) {
 	m.device = &u
+	delete(m.clearedFields, FieldDeviceId)
 }
 
 // DeviceId returns the value of the "device_id" field in the mutation.
diff --git a/examples/migration/ent/sessiondevice/mutation.go b/examples/migration/ent/sessiondevice/mutation.go
index 486d0dba7b..82cdb18caa 100644
--- a/examples/migration/ent/sessiondevice/mutation.go
+++ b/examples/migration/ent/sessiondevice/mutation.go
@@ -129,6 +129,7 @@ func (m *Mutation) ResetCreatedAt() {
 // SetUpdatedAt sets the "updated_at" field.
 func (m *Mutation) SetUpdatedAt(t time.Time) {
 	m.updated_at = &t
+	delete(m.clearedFields, FieldUpdatedAt)
 	delete(m.exprs, FieldUpdatedAt)
 }
 
diff --git a/examples/migration/ent/user/mutation.go b/examples/migration/ent/user/mutation.go
index efc621fe17..2cd353de42 100644
--- a/examples/migration/ent/user/mutation.go
+++ b/examples/migration/ent/user/mutation.go
@@ -134,6 +134,7 @@ func (m *Mutation) ResetLastName() {
 func (m *Mutation) SetTags(s []string) {
 	m.tags = &s
 	m.appendtags = nil
+	delete(m.clearedFields, FieldTags)
 	delete(m.exprs, FieldTags)
 }
 
diff --git a/examples/o2mrecur/ent/node/mutation.go b/examples/o2mrecur/ent/node/mutation.go
index 65e0f74826..c39dc38bf0 100644
--- a/examples/o2mrecur/ent/node/mutation.go
+++ b/examples/o2mrecur/ent/node/mutation.go
@@ -89,6 +89,7 @@ func (m *Mutation) ResetValue() {
 // SetParentId sets the "parent_id" field.
 func (m *Mutation) SetParentId(i int) {
 	m.parent = &i
+	delete(m.clearedFields, FieldParentId)
 }
 
 // ParentId returns the value of the "parent_id" field in the mutation.
diff --git a/examples/o2orecur/ent/node/mutation.go b/examples/o2orecur/ent/node/mutation.go
index ac353ccdd7..fbfeb3884c 100644
--- a/examples/o2orecur/ent/node/mutation.go
+++ b/examples/o2orecur/ent/node/mutation.go
@@ -88,6 +88,7 @@ func (m *Mutation) ResetValue() {
 // SetPrevId sets the "prev_id" field.
 func (m *Mutation) SetPrevId(i int) {
 	m.prev = &i
+	delete(m.clearedFields, FieldPrevId)
 }
 
 // PrevId returns the value of the "prev_id" field in the mutation.
diff --git a/examples/privacytenant/ent/user/mutation.go b/examples/privacytenant/ent/user/mutation.go
index 589fbdd818..c973419bb2 100644
--- a/examples/privacytenant/ent/user/mutation.go
+++ b/examples/privacytenant/ent/user/mutation.go
@@ -90,6 +90,7 @@ func (m *Mutation) ResetName() {
 func (m *Mutation) SetFoods(s []string) {
 	m.foods = &s
 	m.appendfoods = nil
+	delete(m.clearedFields, FieldFoods)
 	delete(m.exprs, FieldFoods)
 }