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

feat:allow_priority_tag_in_composite_pk

Browse Source
This commit is contained in:
yaofeng-wang 2024-01-07 16:49:47 +08:00
parent 87decced23
commit 9107658c97
2 changed files with 60 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
schema/field.go
View File

@ -59,6 +59,7 @@ type Field struct {
DataType DataType DataType DataType
GORMDataType DataType GORMDataType DataType
PrimaryKey bool PrimaryKey bool
PrimaryKeyPriority int
AutoIncrement bool AutoIncrement bool
AutoIncrementIncrement int64 AutoIncrementIncrement int64
Creatable bool Creatable bool
@ -115,7 +116,8 @@ func (schema *Schema) ParseField(fieldStruct reflect.StructField) *Field {
Creatable: true, Creatable: true,
Updatable: true, Updatable: true,
Readable: true, Readable: true,
PrimaryKey: utils.CheckTruth(tagSetting["PRIMARYKEY"], tagSetting["PRIMARY_KEY"]), PrimaryKey: utils.CheckTruth(tagSetting["PRIMARYKEY"], tagSetting["PRIMARY_KEY"],
tagSetting["PRIMARYKEY,PRIORITY"]),
AutoIncrement: utils.CheckTruth(tagSetting["AUTOINCREMENT"]), AutoIncrement: utils.CheckTruth(tagSetting["AUTOINCREMENT"]),
HasDefaultValue: utils.CheckTruth(tagSetting["AUTOINCREMENT"]), HasDefaultValue: utils.CheckTruth(tagSetting["AUTOINCREMENT"]),
NotNull: utils.CheckTruth(tagSetting["NOT NULL"], tagSetting["NOTNULL"]), NotNull: utils.CheckTruth(tagSetting["NOT NULL"], tagSetting["NOTNULL"]),
@ -124,6 +126,17 @@ func (schema *Schema) ParseField(fieldStruct reflect.StructField) *Field {
AutoIncrementIncrement: DefaultAutoIncrementIncrement, AutoIncrementIncrement: DefaultAutoIncrementIncrement,
} }
if field.PrimaryKey {
field.PrimaryKeyPriority = 10
}
if field.TagSettings["PRIMARYKEY,PRIORITY"] != "" {
primaryKeyPriority, err := strconv.Atoi(tagSetting["PRIMARYKEY,PRIORITY"])
if err == nil {
field.PrimaryKeyPriority = primaryKeyPriority
}
}
for field.IndirectFieldType.Kind() == reflect.Ptr { for field.IndirectFieldType.Kind() == reflect.Ptr {
field.IndirectFieldType = field.IndirectFieldType.Elem() field.IndirectFieldType = field.IndirectFieldType.Elem()
} }

34
schema/field_test.go
View File

@ -332,3 +332,37 @@ func TestTypeAliasField(t *testing.T) {
checkSchemaField(t, alias, f, func(f *schema.Field) {}) checkSchemaField(t, alias, f, func(f *schema.Field) {})
} }
} }
type UserWithCompositePrimaryKey struct {
Foo uint `gorm:"primaryKey,priority:2;autoIncrement:false"`
Bar uint `gorm:"primaryKey,priority:1"`
Baz uint `gorm:"primaryKey"`
}
func TestParseFieldWithCompositePrimaryKey(t *testing.T) {
user, err := schema.Parse(&UserWithCompositePrimaryKey{}, &sync.Map{}, schema.NamingStrategy{})
if err != nil {
t.Fatalf("Failed to parse user with permission, got error %v", err)
}
fields := []*schema.Field{
{
Name: "Foo", DBName: "foo", BindNames: []string{"Foo"}, DataType: schema.Uint, PrimaryKey: true,
PrimaryKeyPriority: 2, Creatable: true, Updatable: true, Readable: true, Size: 64,
TagSettings: map[string]string{"AUTOINCREMENT": "false", "PRIMARYKEY,PRIORITY": "2"},
},
{
Name: "Bar", DBName: "bar", BindNames: []string{"Bar"}, DataType: schema.Uint, PrimaryKey: true,
PrimaryKeyPriority: 1, Creatable: true, Updatable: true, Readable: true, Size: 64,
TagSettings: map[string]string{"PRIMARYKEY,PRIORITY": "1"},
},
{Name: "Baz", DBName: "baz", BindNames: []string{"Baz"}, DataType: schema.Uint, PrimaryKey: true,
PrimaryKeyPriority: 10, Creatable: true, Updatable: true, Readable: true, Size: 64,
TagSettings: map[string]string{"PRIMARYKEY": "PRIMARYKEY"},
},
}
for _, f := range fields {
checkSchemaField(t, user, f, func(f *schema.Field) {})
}
}