re
/
gorm
forked from mirror/gorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix can't update record with customized primary key

This commit is contained in:
Jinzhu 2014-11-11 11:46:21 +08:00
parent da3e74ba6f
commit 828bf5d5fd
2 changed files with 53 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
customize_column_test.go
View File

@ -6,7 +6,7 @@ import (
) )
type CustomizeColumn struct { type CustomizeColumn struct {
Id int64 `gorm:"column:mapped_id; primary_key:yes"` ID int64 `gorm:"column:mapped_id; primary_key:yes"`
Name string `gorm:"column:mapped_name"` Name string `gorm:"column:mapped_name"`
Date time.Time `gorm:"column:mapped_time"` Date time.Time `gorm:"column:mapped_time"`
} }
@ -34,16 +34,25 @@ func TestCustomizeColumn(t *testing.T) {
} }
expected := "foo" expected := "foo"
cc := CustomizeColumn{Id: 666, Name: expected, Date: time.Now()} cc := CustomizeColumn{ID: 666, Name: expected, Date: time.Now()}
if count := DB.Save(&cc).RowsAffected; count != 1 { if count := DB.Create(&cc).RowsAffected; count != 1 {
t.Error("There should be one record be affected when create record") t.Error("There should be one record be affected when create record")
} }
var ccs []CustomizeColumn var cc1 CustomizeColumn
DB.Find(&ccs) DB.First(&cc1, 666)
if len(ccs) > 0 && ccs[0].Name != expected && ccs[0].Id != 666 { if cc1.Name != expected {
t.Errorf("Failed to query CustomizeColumn")
}
cc.Name = "bar"
DB.Save(&cc)
var cc2 CustomizeColumn
DB.First(&cc2, 666)
if cc2.Name != "bar" {
t.Errorf("Failed to query CustomizeColumn") t.Errorf("Failed to query CustomizeColumn")
} }
} }

33
scope.go
View File

@ -19,7 +19,7 @@ type Scope struct {
SqlVars []interface{} SqlVars []interface{}
db *DB db *DB
skipLeft bool skipLeft bool
primaryKey string primaryKeyField *Field
instanceId string instanceId string
fields map[string]*Field fields map[string]*Field
} }
@ -90,12 +90,8 @@ func (scope *Scope) HasError() bool {
return scope.db.Error != nil return scope.db.Error != nil
} }
// PrimaryKey get the primary key's column name func (scope *Scope) PrimaryKeyField() *Field {
func (scope *Scope) PrimaryKey() string { if scope.primaryKeyField == nil {
if scope.primaryKey != "" {
return scope.primaryKey
}
var indirectValue = scope.IndirectValue() var indirectValue = scope.IndirectValue()
clone := scope clone := scope
@ -105,12 +101,22 @@ func (scope *Scope) PrimaryKey() string {
for _, field := range clone.Fields() { for _, field := range clone.Fields() {
if field.IsPrimaryKey { if field.IsPrimaryKey {
scope.primaryKey = field.DBName scope.primaryKeyField = field
break break
} }
} }
}
return scope.primaryKey return scope.primaryKeyField
}
// PrimaryKey get the primary key's column name
func (scope *Scope) PrimaryKey() string {
if field := scope.PrimaryKeyField(); field != nil {
return field.DBName
} else {
return ""
}
} }
// PrimaryKeyZero check the primary key is blank or not // PrimaryKeyZero check the primary key is blank or not
@ -120,13 +126,12 @@ func (scope *Scope) PrimaryKeyZero() bool {
// PrimaryKeyValue get the primary key's value // PrimaryKeyValue get the primary key's value
func (scope *Scope) PrimaryKeyValue() interface{} { func (scope *Scope) PrimaryKeyValue() interface{} {
if scope.IndirectValue().Kind() == reflect.Struct { if field := scope.PrimaryKeyField(); field != nil {
if field := scope.IndirectValue().FieldByName(SnakeToUpperCamel(scope.PrimaryKey())); field.IsValid() { return field.Field.Interface()
return field.Interface() } else {
}
}
return 0 return 0
} }
}
// HasColumn to check if has column // HasColumn to check if has column
func (scope *Scope) HasColumn(column string) (hasColumn bool) { func (scope *Scope) HasColumn(column string) (hasColumn bool) {