mirror
/
gorm
mirror of https://github.com/go-gorm/gorm.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #284 from shirou/master 

fix panic problem when the struct has unexported field.
This commit is contained in:
Jinzhu 2014-11-21 10:29:55 +08:00
parent f43456fecf e313827f04
commit 84954e6779
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scope_private.go
View File

@ -5,6 +5,7 @@ import (
"database/sql/driver" "database/sql/driver"
"errors" "errors"
"fmt" "fmt"
"go/ast"
"reflect" "reflect"
"regexp" "regexp"
"strconv" "strconv"
@ -550,6 +551,9 @@ func (scope *Scope) createTable() *Scope {
fields := scope.Fields() fields := scope.Fields()
scopeType := scope.IndirectValue().Type() scopeType := scope.IndirectValue().Type()
for i := 0; i < scopeType.NumField(); i++ { for i := 0; i < scopeType.NumField(); i++ {
if !ast.IsExported(scopeType.Field(i).Name) {
continue
}
for _, field := range scope.fieldFromStruct(scopeType.Field(i), false) { for _, field := range scope.fieldFromStruct(scopeType.Field(i), false) {
field = fields[field.DBName] field = fields[field.DBName]
if field.IsNormal { if field.IsNormal {

1
structs_test.go
View File

@ -129,6 +129,7 @@ type Animal struct {
Name string `sql:"DEFAULT:'galeone'"` Name string `sql:"DEFAULT:'galeone'"`
From string //test reserved sql keyword as field name From string //test reserved sql keyword as field name
Age time.Time `sql:"DEFAULT:current_timestamp"` Age time.Time `sql:"DEFAULT:current_timestamp"`
unexported string // unexported value
CreatedAt time.Time CreatedAt time.Time
UpdatedAt time.Time UpdatedAt time.Time
} }