mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-05-04 03:11:52 -05:00
Code Issues Packages Projects Releases 159 Wiki Activity

libraries/doltcore/sqle/dfunctions: err and ok out of getBranchCommit signature

Browse Source
This commit is contained in:
Lars Lehtonen
2021-03-13 14:20:06 -08:00
parent 82e7d3d4f5
commit 38c8173783
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/libraries/doltcore/sqle/dfunctions/dolt_merge.go
+1 -1
View File
@@ -114,7 +114,7 @@ func (d DoltMergeFunc) Eval(ctx *sql.Context, row sql.Row) (interface{}, error)
return nil, err
}
cm, cmh, err := getBranchCommit(ctx, ok, branchName, err, ddb)
cm, cmh, err := getBranchCommit(ctx, branchName, ddb)
if err != nil {
return nil, err
}
go/libraries/doltcore/sqle/dfunctions/merge.go
+2 -6
View File
@@ -88,7 +88,7 @@ func (cf *MergeFunc) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
return nil, err
}
cm, cmh, err := getBranchCommit(ctx, ok, branchName, err, ddb)
cm, cmh, err := getBranchCommit(ctx, branchName, ddb)
if err != nil {
return nil, err
}
@@ -153,11 +153,7 @@ func checkForUncommittedChanges(root *doltdb.RootValue, parentRoot *doltdb.RootV
return nil
}
func getBranchCommit(ctx *sql.Context, ok bool, val interface{}, err error, ddb *doltdb.DoltDB) (*doltdb.Commit, hash.Hash, error) {
if err != nil {
return nil, hash.Hash{}, err
}
func getBranchCommit(ctx *sql.Context, val interface{}, ddb *doltdb.DoltDB) (*doltdb.Commit, hash.Hash, error) {
paramStr, ok := val.(string)
if !ok {