Merge 75ec40de67154d1354e8237c50467cbe0f33a154 into b3d62fafc3d98be04630e76a858e0e3e819bec6a

model_struct.go

@@ -40,6 +40,7 @@ type StructField struct {
 	Tag             reflect.StructTag
 	Struct          reflect.StructField
 	IsForeignKey    bool
+	IsAutoIncrement bool
 	Relationship    *Relationship
 }
 
@@ -148,6 +149,10 @@ func (scope *Scope) GetModelStruct() *ModelStruct {
 					field.HasDefaultValue = true
 				}
 
+				if _, ok := sqlSettings["AUTO_INCREMENT"]; ok {
+					field.IsAutoIncrement = true
+				}
+
 				if value, ok := gormSettings["COLUMN"]; ok {
 					field.DBName = value
 				} else {

scope.go

@@ -112,12 +112,11 @@ func (scope *Scope) HasError() bool {
 
 func (scope *Scope) PrimaryField() *Field {
 	if primaryFields := scope.GetModelStruct().PrimaryFields; len(primaryFields) > 0 {
-		if len(primaryFields) > 1 {
-			if field, ok := scope.Fields()["id"]; ok {
-				return field
+		for i := 0; i < len(primaryFields); i++ {
+			if primaryFields[i].IsAutoIncrement {
+				return scope.Fields()[primaryFields[i].DBName]
 			}
 		}
-		return scope.Fields()[primaryFields[0].DBName]
 	}
 	return nil
 }