tablet/gorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

schema.go: use field.AutoIncrement instead of field.TagSettings["AUTOINCREMENT"], add test to check autoincrement:false

Browse Source 
create_test.go: remove unused code: drop table CompositeKeyProduct
This commit is contained in:
truongns 2023-03-09 12:49:03 +09:00
parent 414f34b00d
commit ddd0a11c3f
3 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
schema/schema.go
View File

@ -221,16 +221,16 @@ func ParseWithSpecialTableName(dest interface{}, cacheStore *sync.Map, namer Nam
} }
} }
if schema.PrioritizedPrimaryField == nil && len(schema.PrimaryFields) == 1 { if schema.PrioritizedPrimaryField == nil {
schema.PrioritizedPrimaryField = schema.PrimaryFields[0] if len(schema.PrimaryFields) == 1 {
} schema.PrioritizedPrimaryField = schema.PrimaryFields[0]
} else if len(schema.PrimaryFields) > 1 {
// If there are multiple primary keys, the AUTOINCREMENT field is prioritized // If there are multiple primary keys, the AUTOINCREMENT field is prioritized
if schema.PrioritizedPrimaryField == nil && len(schema.PrimaryFields) > 1 { for _, field := range schema.PrimaryFields {
for _, field := range schema.PrimaryFields { if field.AutoIncrement {
if _, ok := field.TagSettings["AUTOINCREMENT"]; ok { schema.PrioritizedPrimaryField = field
schema.PrioritizedPrimaryField = field break
break }
} }
} }
} }

15
schema/schema_test.go
View File

@ -301,6 +301,12 @@ func TestCompositePrimaryKeyWithAutoIncrement(t *testing.T) {
Code string Code string
Name string Name string
} }
type ProductNonAutoIncrement struct {
ProductID uint `gorm:"primaryKey;autoIncrement:false"`
LanguageCode uint `gorm:"primaryKey"`
Code string
Name string
}
product, err := schema.Parse(&Product{}, &sync.Map{}, schema.NamingStrategy{}) product, err := schema.Parse(&Product{}, &sync.Map{}, schema.NamingStrategy{})
if err != nil { if err != nil {
@ -318,4 +324,13 @@ func TestCompositePrimaryKeyWithAutoIncrement(t *testing.T) {
f.Updatable = true f.Updatable = true
f.Readable = true f.Readable = true
}) })
productNonAutoIncrement, err := schema.Parse(&ProductNonAutoIncrement{}, &sync.Map{}, schema.NamingStrategy{})
if err != nil {
t.Fatalf("failed to parse productNonAutoIncrement struct with composite primary key, got error %v", err)
}
if productNonAutoIncrement.PrioritizedPrimaryField != nil {
t.Fatalf("PrioritizedPrimaryField of non autoincrement composite key should be nil")
}
} }

3
tests/create_test.go
View File

@ -556,8 +556,7 @@ func TestCreateWithAutoIncrementCompositeKey(t *testing.T) {
Name string Name string
} }
err := DB.Migrator().DropTable(&CompositeKeyProduct{}) if err := DB.AutoMigrate(&CompositeKeyProduct{}); err != nil {
if err = DB.AutoMigrate(&CompositeKeyProduct{}); err != nil {
t.Fatalf("failed to migrate, got error %v", err) t.Fatalf("failed to migrate, got error %v", err)
} }