mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-20 10:09:03 -06:00
Code Issues Packages Projects Releases 135 Wiki Activity

working better

Browse Source
This commit is contained in:
James Cor
2022-09-13 10:22:00 -07:00
parent 90054e6ac9
commit 3252fcdac2
1 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
go/libraries/doltcore/sqle/dfunctions/dolt_conflicts_resolve.go
View File

@@ -108,26 +108,21 @@ func ResolveConflicts(ctx *sql.Context, dSess *dsess.DoltSession, root *doltdb.R
var k, v types.Value
if ours {
row = cnfMap["our"]
k, err = row.NomsMapKey(ourSch).Value(ctx)
if err != nil {
return err
}
v, err = row.NomsMapValue(ourSch).Value(ctx)
if err != nil {
return err
}
} else {
row := cnfMap["their"]
k, err = row.NomsMapKey(theirSch).Value(ctx)
if err != nil {
return err
}
v, err = row.NomsMapValue(theirSch).Value(ctx)
if err != nil {
return err
}
row = cnfMap["their"]
}
if row != nil {
k, err = row.NomsMapKey(sch).Value(ctx)
if err != nil {
return err
}
v, err = row.NomsMapValue(sch).Value(ctx)
if err != nil {
return err
}
pkTuples = append(pkTuples, k, v)
}
pkTuples = append(pkTuples, k, v)
}
newMap, err := types.NewMap(ctx, vrw, pkTuples...)
@@ -135,14 +130,16 @@ func ResolveConflicts(ctx *sql.Context, dSess *dsess.DoltSession, root *doltdb.R
return err
}
updatedTable, err := tbl.UpdateNomsRows(ctx, newMap)
newTbl, err := tbl.UpdateNomsRows(ctx, newMap)
if err != nil {
return err
}
_, _, newTbl, err := updatedTable.ResolveConflicts(ctx, pkTuples)
newTbl, err = newTbl.ClearConflicts(ctx)
if err != nil {
return err
}
newRoot, err = newRoot.PutTable(ctx, tblName, newTbl)
if err != nil {
return err