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

fix panic problem when the struct has unexported field.

This commit is contained in:
Shirou WAKAYAMA 2014-11-19 12:44:57 +09:00
parent f43456fecf
commit e313827f04
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 {

13
structs_test.go
View File

@ -125,12 +125,13 @@ func (i *Num) Scan(src interface{}) error {
} }
type Animal struct { type Animal struct {
Counter uint64 `gorm:"primary_key:yes"` Counter uint64 `gorm:"primary_key:yes"`
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"`
CreatedAt time.Time unexported string // unexported value
UpdatedAt time.Time CreatedAt time.Time
UpdatedAt time.Time
} }
type Post struct { type Post struct {