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

Added tag handlers for custom DB field names

Browse Source
This commit is contained in:
drgomesp 2017-01-16 18:07:38 +04:00
parent 1c01606add
commit 8d6b599b54
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
callback_create_batch.go
View File

@ -33,7 +33,7 @@ func createBatchCallback(scope *Scope) {
// Filling up the columns // Filling up the columns
for _, field := range fields(scope) { for _, field := range fields(scope) {
// We don't treat non-normal fields on batch operations (relationships, etc) // We don't treat non-normal fields on batch operations (relationships, etc)
if !field.IsNormal { if !field.IsNormal || field.IsIgnored {
continue continue
} }
@ -51,7 +51,7 @@ func createBatchCallback(scope *Scope) {
for _, structField := range structFields { for _, structField := range structFields {
// When inserting, the primary key is usually auto-increment // When inserting, the primary key is usually auto-increment
if !structField.IsPrimaryKey { if !structField.IsPrimaryKey && !structField.IsIgnored {
fieldValue := reflect.Indirect(value.Index(elementIndex)).FieldByName(structField.Names[0]).Interface() fieldValue := reflect.Indirect(value.Index(elementIndex)).FieldByName(structField.Names[0]).Interface()
valuePlaceholders = append(valuePlaceholders, scope.AddToVars(fieldValue)) valuePlaceholders = append(valuePlaceholders, scope.AddToVars(fieldValue))
} }

21
model_struct.go
View File

@ -12,11 +12,19 @@ import (
"github.com/jinzhu/inflection" "github.com/jinzhu/inflection"
) )
type tagHandlerFunc func(*StructField)
// DefaultTableNameHandler default table name handler // DefaultTableNameHandler default table name handler
var DefaultTableNameHandler = func(db *DB, defaultTableName string) string { var DefaultTableNameHandler = func(db *DB, defaultTableName string) string {
return defaultTableName return defaultTableName
} }
var tagHandlers = map[string]tagHandlerFunc{}
func AddTagHandler(tagName string, handler tagHandlerFunc) {
tagHandlers[tagName] = handler
}
type safeModelStructsMap struct { type safeModelStructsMap struct {
m map[reflect.Type]*ModelStruct m map[reflect.Type]*ModelStruct
l *sync.RWMutex l *sync.RWMutex
@ -205,19 +213,14 @@ func (scope *Scope) GetModelStruct() *ModelStruct {
field.IsNormal = true field.IsNormal = true
} else if _, ok := field.TagSettings["EMBEDDED"]; ok || fieldStruct.Anonymous { } else if _, ok := field.TagSettings["EMBEDDED"]; ok || fieldStruct.Anonymous {
// is embedded struct // is embedded struct
for _, subField := range scope.New(fieldValue).GetModelStruct().StructFields { for _, subField := range scope.New(fieldValue).GetStructFields() {
subField = subField.clone() subField = subField.clone()
subField.Names = append([]string{fieldStruct.Name}, subField.Names...) subField.Names = append([]string{fieldStruct.Name}, subField.Names...)
if prefix, ok := field.TagSettings["EMBEDDED_PREFIX"]; ok { if prefix, ok := field.TagSettings["EMBEDDED_PREFIX"]; ok {
subField.DBName = prefix + subField.DBName subField.DBName = prefix + subField.DBName
} }
if subField.IsPrimaryKey { if subField.IsPrimaryKey {
if _, ok := subField.TagSettings["PRIMARY_KEY"]; ok {
modelStruct.PrimaryFields = append(modelStruct.PrimaryFields, subField) modelStruct.PrimaryFields = append(modelStruct.PrimaryFields, subField)
} else {
subField.IsPrimaryKey = false
}
} }
modelStruct.StructFields = append(modelStruct.StructFields, subField) modelStruct.StructFields = append(modelStruct.StructFields, subField)
} }
@ -545,6 +548,12 @@ func (scope *Scope) GetModelStruct() *ModelStruct {
field.DBName = ToDBName(fieldStruct.Name) field.DBName = ToDBName(fieldStruct.Name)
} }
for tagName := range field.TagSettings {
if handler, ok := tagHandlers[tagName]; ok {
handler(field)
}
}
modelStruct.StructFields = append(modelStruct.StructFields, field) modelStruct.StructFields = append(modelStruct.StructFields, field)
} }
} }