lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-11-22 14:40:57 +00:00
Code Issues Releases Activity

orm set relation column name #259

Browse Source
This commit is contained in:
slene 2013-11-06 22:05:10 +08:00
parent 9492e4131b
commit b644665952
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
orm/models_test.go
View File

@ -150,7 +150,7 @@ func NewTag() *Tag {
type Comment struct { type Comment struct {
Id int Id int
Post *Post `orm:"rel(fk)"` Post *Post `orm:"rel(fk);column(post)"`
Content string `orm:"type(text)"` Content string `orm:"type(text)"`
Parent *Comment `orm:"null;rel(fk)"` Parent *Comment `orm:"null;rel(fk)"`
Created time.Time `orm:"auto_now_add"` Created time.Time `orm:"auto_now_add"`

9
orm/models_utils.go
View File

@ -73,13 +73,16 @@ func getTableUnique(val reflect.Value) [][]string {
} }
func getColumnName(ft int, addrField reflect.Value, sf reflect.StructField, col string) string { func getColumnName(ft int, addrField reflect.Value, sf reflect.StructField, col string) string {
column := strings.ToLower(col) col = strings.ToLower(col)
if column == "" { column := col
if col == "" {
column = snakeString(sf.Name) column = snakeString(sf.Name)
} }
switch ft { switch ft {
case RelForeignKey, RelOneToOne: case RelForeignKey, RelOneToOne:
column = column + "_id" if len(col) == 0 {
column = column + "_id"
}
case RelManyToMany, RelReverseMany, RelReverseOne: case RelManyToMany, RelReverseMany, RelReverseOne:
column = sf.Name column = sf.Name
} }