fix: dup filed in inconsistent schema and database

This commit is contained in:
a631807682 2022-05-27 15:42:55 +08:00
parent a6b8eb4ba4
commit 5163bb9107
No known key found for this signature in database
GPG Key ID: 137D1D75522168AB
2 changed files with 28 additions and 5 deletions

View File

@ -193,17 +193,23 @@ func Scan(rows Rows, db *DB, mode ScanMode) {
// Not Pluck // Not Pluck
if sch != nil { if sch != nil {
schFiledCount := len(sch.Fields)
for idx, column := range columns { for idx, column := range columns {
if field := sch.LookUpField(column); field != nil && field.Readable { if field := sch.LookUpField(column); field != nil && field.Readable {
if curIndex, ok := selectedColumnsMap[column]; ok { if curIndex, ok := selectedColumnsMap[column]; ok {
fields[idx] = field // handle duplicate fields fields[idx] = field // handle duplicate fields
for fieldIndex, selectField := range sch.Fields[curIndex+1:] { offset := curIndex + 1
// handle sch inconsistent with database
// like Raw(`...`).Scan
if schFiledCount > offset {
for fieldIndex, selectField := range sch.Fields[offset:] {
if selectField.DBName == column && selectField.Readable { if selectField.DBName == column && selectField.Readable {
selectedColumnsMap[column] = curIndex + fieldIndex + 1 selectedColumnsMap[column] = curIndex + fieldIndex + 1
fields[idx] = selectField fields[idx] = selectField
break break
} }
} }
}
} else { } else {
fields[idx] = field fields[idx] = field
selectedColumnsMap[column] = idx selectedColumnsMap[column] = idx

View File

@ -221,4 +221,21 @@ func TestScanToEmbedded(t *testing.T) {
t.Errorf("Failed to run join query, got error: %v", err) t.Errorf("Failed to run join query, got error: %v", err)
} }
AssertEqual(t, person1, personDupField) AssertEqual(t, person1, personDupField)
user := User{
Name: "TestScanToEmbedded_1",
Manager: &User{Name: "TestScanToEmbedded_1_m1",
Manager: &User{Name: "TestScanToEmbedded_1_m1_m1"},
},
}
DB.Create(&user)
type UserScan struct {
ID uint
Name string
ManagerID *uint
}
var user2 UserScan
err := DB.Raw("SELECT * FROM users INNER JOIN users Manager ON users.manager_id = Manager.id WHERE users.id = ?", user.ID).Scan(&user2).Error
AssertEqual(t, err, nil)
} }