HiPoweredDev
/
xorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix go vet errors

This commit is contained in:
Diego Sogari 2023-04-01 13:50:32 -03:00
parent d76d6f0aa9
commit 4f8ee6f919
No known key found for this signature in database
GPG Key ID: 03A9A337B873A022
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
schemas/association.go
View File

@ -30,12 +30,12 @@ func (a *Association) MakeJoinMap() reflect.Value {
// MakeRefMap creates a map to hold the result of an association query // MakeRefMap creates a map to hold the result of an association query
func (a *Association) MakeRefMap() reflect.Value { func (a *Association) MakeRefMap() reflect.Value {
return reflect.MakeMap(reflect.MapOf(a.RefPkType, reflect.PointerTo(a.RefTable.Type))) return reflect.MakeMap(reflect.MapOf(a.RefPkType, reflect.PtrTo(a.RefTable.Type)))
} }
// ValidateOwnMap validates the type of the owner map (parent of an association) // ValidateOwnMap validates the type of the owner map (parent of an association)
func (a *Association) ValidateOwnMap(ownMap reflect.Value) error { func (a *Association) ValidateOwnMap(ownMap reflect.Value) error {
if ownMap.Type() != reflect.MapOf(a.OwnPkType, reflect.PointerTo(a.OwnTable.Type)) { if ownMap.Type() != reflect.MapOf(a.OwnPkType, reflect.PtrTo(a.OwnTable.Type)) {
return fmt.Errorf("wrong map type: %v", ownMap.Type()) return fmt.Errorf("wrong map type: %v", ownMap.Type())
} }
return nil return nil
@ -60,7 +60,7 @@ func (a *Association) condBelongsTo(ownMap reflect.Value) builder.Cond {
for iter.Next() { for iter.Next() {
structPtr := iter.Value() structPtr := iter.Value()
fk, _ := fkCol.ValueOfV(&structPtr) fk, _ := fkCol.ValueOfV(&structPtr)
if fk.Type().Kind() == reflect.Pointer { if fk.Type().Kind() == reflect.Ptr {
if fk.IsNil() { if fk.IsNil() {
continue continue
} }
@ -114,7 +114,7 @@ func (a *Association) linkBelongsTo(ownMap, refMap, pruneMap reflect.Value) {
for iter.Next() { for iter.Next() {
structPtr := iter.Value() structPtr := iter.Value()
fk, _ := fkCol.ValueOfV(&structPtr) fk, _ := fkCol.ValueOfV(&structPtr)
if fk.Type().Kind() == reflect.Pointer { if fk.Type().Kind() == reflect.Ptr {
if fk.IsNil() { if fk.IsNil() {
continue continue
} }
@ -140,7 +140,7 @@ func (a *Association) linkHasOneOrMany(ownMap, refMap, pruneMap reflect.Value) {
for iter.Next() { for iter.Next() {
refStructPtr := iter.Value() refStructPtr := iter.Value()
fk, _ := fkCol.ValueOfV(&refStructPtr) fk, _ := fkCol.ValueOfV(&refStructPtr)
if fk.Type().Kind() == reflect.Pointer { if fk.Type().Kind() == reflect.Ptr {
if fk.IsNil() { if fk.IsNil() {
continue continue
} }