Remove unnecessary OpCreateValue mode

Author: jinzhu

clause/association.go

@@ -4,11 +4,10 @@ package clause
 type AssociationOpType int
 
 const (
-	OpUnlink       AssociationOpType = iota // Unlink association
-	OpDelete                                // Delete association records
-	OpUpdate                                // Update association records
-	OpCreate                                // Create association records with assignments
-	OpCreateValues                          // Create association records with model object
+	OpUnlink AssociationOpType = iota // Unlink association
+	OpDelete                          // Delete association records
+	OpUpdate                          // Update association records
+	OpCreate                          // Create association records with assignments
 )
 
 // Association represents an association operation
@@ -17,7 +16,6 @@ type Association struct {
 	Type        AssociationOpType // Operation type
 	Conditions  []Expression      // Filter conditions
 	Set         []Assignment      // Assignment operations (for Update and Create)
-	Model       interface{}       // Model object (for Create object)
 	Values      []interface{}     // Values for Create operation
 }
 

generics.go

@@ -731,8 +731,6 @@ func (s setCreateOrUpdateG[T]) executeAssociationOperation(ctx context.Context,
 	switch op.Type {
 	case clause.OpCreate:
 		return s.handleAssociationCreate(ctx, base, op)
-	case clause.OpCreateValues:
-		return s.handleAssociationCreateValues(ctx, base, op)
 	case clause.OpUnlink, clause.OpDelete, clause.OpUpdate:
 		return s.handleAssociation(ctx, base, op)
 	default:
@@ -741,16 +739,16 @@ func (s setCreateOrUpdateG[T]) executeAssociationOperation(ctx context.Context,
 }
 
 func (s setCreateOrUpdateG[T]) handleAssociationCreate(ctx context.Context, base *DB, op clause.Association) error {
-	return s.handleAssociationForOwners(base, ctx, func(owner T, assoc *Association) error {
-		data := make(map[string]interface{}, len(op.Set))
-		for _, a := range op.Set {
-			data[a.Column.Name] = a.Value
-		}
-		return assoc.Append(data)
-	}, op.Association)
-}
+	if len(op.Set) > 0 {
+		return s.handleAssociationForOwners(base, ctx, func(owner T, assoc *Association) error {
+			data := make(map[string]interface{}, len(op.Set))
+			for _, a := range op.Set {
+				data[a.Column.Name] = a.Value
+			}
+			return assoc.Append(data)
+		}, op.Association)
+	}
 
-func (s setCreateOrUpdateG[T]) handleAssociationCreateValues(ctx context.Context, base *DB, op clause.Association) error {
 	return s.handleAssociationForOwners(base, ctx, func(owner T, assoc *Association) error {
 		return assoc.Append(op.Values...)
 	}, op.Association)

tests/association_generics_test.go

@@ -277,23 +277,23 @@ func TestClauseAssociationSetUpdateWithOpUnlink(t *testing.T) {
 	}
 }
 
-// Test Set + Update with Association OpCreateValues operation using real database
+// Test Set + Update with Association OpCreate operation using real database
 func TestClauseAssociationSetUpdateWithOpCreateValues(t *testing.T) {
 	ctx := context.Background()
 
 	// Create a user first using real database
-	user := User{Name: "TestClauseAssociationSetUpdateWithOpCreateValues", Age: 25}
+	user := User{Name: "TestClauseAssociationSetUpdateWithOpCreate", Age: 25}
 	if err := DB.Create(&user).Error; err != nil {
 		t.Fatalf("failed to create user: %v", err)
 	}
 
 	// Create a pet object
 	newPet := Pet{Name: "created-pet"}
 
-	// Test Set + Update with Association OpCreateValues
+	// Test Set + Update with Association OpCreate
 	assocOp := clause.Association{
 		Association: "Pets",
-		Type:        clause.OpCreateValues,
+		Type:        clause.OpCreate,
 		Values:      []interface{}{&newPet},
 	}
 
@@ -343,7 +343,7 @@ func TestClauseAssociationSetCreateWithManyToMany(t *testing.T) {
 	// Test Set + Update with many-to-many association
 	assocOp := clause.Association{
 		Association: "Languages",
-		Type:        clause.OpCreateValues,
+		Type:        clause.OpCreate,
 		Values:      []interface{}{langs[0], langs[1]},
 	}
 
@@ -402,7 +402,7 @@ func TestClauseAssociationSetCreateWithBelongsTo(t *testing.T) {
 	}
 }
 
-// BelongsTo: create and assign company via OpCreateValues
+// BelongsTo: create and assign company via OpCreate
 func TestClauseAssociationSetUpdateBelongsToCreateValues(t *testing.T) {
 	ctx := context.Background()
 
@@ -411,7 +411,7 @@ func TestClauseAssociationSetUpdateBelongsToCreateValues(t *testing.T) {
 		t.Fatalf("failed to create user: %v", err)
 	}
 
-	assocOp := clause.Association{Association: "Company", Type: clause.OpCreateValues, Values: []interface{}{Company{Name: "Belongs-To-Co"}}}
+	assocOp := clause.Association{Association: "Company", Type: clause.OpCreate, Values: []interface{}{Company{Name: "Belongs-To-Co"}}}
 	if rows, err := gorm.G[User](DB).Where("id = ?", user.ID).Set(assocOp).Update(ctx); err != nil {
 		t.Fatalf("Set Update belongs-to create values failed: %v", err)
 	} else if rows != 0 {
@@ -538,7 +538,7 @@ func TestClauseAssociationSetUpdatePolymorphicTools(t *testing.T) {
 		t.Fatalf("create user: %v", err)
 	}
 
-	createOp := clause.Association{Association: "Tools", Type: clause.OpCreateValues, Values: []interface{}{Tools{Name: "wrench"}}}
+	createOp := clause.Association{Association: "Tools", Type: clause.OpCreate, Values: []interface{}{Tools{Name: "wrench"}}}
 	if rows, err := gorm.G[User](DB).Where("id = ?", user.ID).Set(createOp).Update(ctx); err != nil {
 		t.Fatalf("create tools: %v", err)
 	} else if rows != 0 {
@@ -909,7 +909,7 @@ func TestClauseAssociationSetUpdateAndDeleteManyOwnersMany2Many(t *testing.T) {
 	AssertAssociationCount(t, u2, "Languages", 1, "after delete")
 }
 
-// Test Set + Update with has-one (NamedPet) using OpCreateValues
+// Test Set + Update with has-one (NamedPet) using OpCreate
 func TestClauseAssociationSetUpdateHasOneCreateValues(t *testing.T) {
 	ctx := context.Background()
 
@@ -920,7 +920,7 @@ func TestClauseAssociationSetUpdateHasOneCreateValues(t *testing.T) {
 
 	assocOp := clause.Association{
 		Association: "NamedPet",
-		Type:        clause.OpCreateValues,
+		Type:        clause.OpCreate,
 		Values:      []interface{}{Pet{Name: "named-pet"}},
 	}
 

tests/generics_test.go

@@ -1013,7 +1013,6 @@ func TestGenericsAssociation(t *testing.T) {
 		{clause.OpDelete, "OpDelete"},
 		{clause.OpUpdate, "OpUpdate"},
 		{clause.OpCreate, "OpCreate"},
-		{clause.OpCreateValues, "OpCreateValues"},
 	}
 
 	for _, op := range operations {