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

golinting

This commit is contained in:
Andrew Martin 2015-02-17 10:15:34 +11:00
parent b3b87d9c45
commit 52775992ec
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
scope.go
View File

@ -41,7 +41,7 @@ func (db *DB) NewScope(value interface{}) *Scope {
func (scope *Scope) NeedPtr() *Scope { func (scope *Scope) NeedPtr() *Scope {
reflectKind := reflect.ValueOf(scope.Value).Kind() reflectKind := reflect.ValueOf(scope.Value).Kind()
if !((reflectKind == reflect.Invalid) || (reflectKind == reflect.Ptr)) { if !((reflectKind == reflect.Invalid) || (reflectKind == reflect.Ptr)) {
err := errors.New(fmt.Sprintf("%v %v\n", fileWithLineNum(), "using unaddressable value")) err := fmt.Errorf("%v %v\n", fileWithLineNum(), "using unaddressable value")
scope.Err(err) scope.Err(err)
fmt.Printf(err.Error()) fmt.Printf(err.Error())
} }
@ -125,9 +125,8 @@ func (scope *Scope) PrimaryKeyField() *Field {
func (scope *Scope) PrimaryKey() string { func (scope *Scope) PrimaryKey() string {
if field := scope.PrimaryKeyField(); field != nil { if field := scope.PrimaryKeyField(); field != nil {
return field.DBName return field.DBName
} else {
return ""
} }
return ""
} }
// PrimaryKeyZero check the primary key is blank or not // PrimaryKeyZero check the primary key is blank or not
@ -139,9 +138,8 @@ func (scope *Scope) PrimaryKeyZero() bool {
func (scope *Scope) PrimaryKeyValue() interface{} { func (scope *Scope) PrimaryKeyValue() interface{} {
if field := scope.PrimaryKeyField(); field != nil { if field := scope.PrimaryKeyField(); field != nil {
return field.Field.Interface() return field.Field.Interface()
} else {
return 0
} }
return 0
} }
// HasColumn to check if has column // HasColumn to check if has column
@ -207,7 +205,7 @@ func (scope *Scope) CallMethod(name string) {
case func(s *DB) error: case func(s *DB) error:
scope.Err(f(scope.db.New())) scope.Err(f(scope.db.New()))
default: default:
scope.Err(errors.New(fmt.Sprintf("unsupported function %v", name))) scope.Err(fmt.Errorf("unsupported function %v", name))
} }
} }
} }
@ -274,13 +272,14 @@ func (scope *Scope) TableName() string {
func (scope *Scope) QuotedTableName() string { func (scope *Scope) QuotedTableName() string {
if scope.Search != nil && len(scope.Search.TableName) > 0 { if scope.Search != nil && len(scope.Search.TableName) > 0 {
return scope.Search.TableName return scope.Search.TableName
} else {
keys := strings.Split(scope.TableName(), ".")
for i, v := range keys {
keys[i] = scope.Quote(v)
}
return strings.Join(keys, ".")
} }
keys := strings.Split(scope.TableName(), ".")
for i, v := range keys {
keys[i] = scope.Quote(v)
}
return strings.Join(keys, ".")
} }
// CombinedConditionSql get combined condition sql // CombinedConditionSql get combined condition sql