implement dolt_branch_status()

go/libraries/doltcore/sqle/dfunctions/has_ancestor.go

@@ -69,19 +69,10 @@ func (a *HasAncestor) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 		if err != nil {
 			return nil, err
 		}
-
-		cs, err := doltdb.NewCommitSpec(headStr.(string))
+		headCommit, err = resolveRefSpec(ctx, headRef, ddb, headStr.(string))
 		if err != nil {
 			return nil, err
 		}
-		optCmt, err := ddb.Resolve(ctx, cs, headRef)
-		if err != nil {
-			return nil, fmt.Errorf("error during has_ancestor check: ref not found '%s'", headStr)
-		}
-		headCommit, ok = optCmt.ToCommit()
-		if !ok {
-			return nil, doltdb.ErrGhostCommitEncountered
-		}
 	}
 
 	var ancCommit *doltdb.Commit
@@ -94,19 +85,10 @@ func (a *HasAncestor) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 		if err != nil {
 			return nil, err
 		}
-		cs, err := doltdb.NewCommitSpec(ancStr.(string))
+		ancCommit, err = resolveRefSpec(ctx, headRef, ddb, ancStr.(string))
 		if err != nil {
 			return nil, err
 		}
-		optCmt, err := ddb.Resolve(ctx, cs, headRef)
-		if err != nil {
-			return nil, fmt.Errorf("error during has_ancestor check: ref not found '%s'", ancStr)
-		}
-		ancCommit, ok = optCmt.ToCommit()
-		if !ok {
-			return nil, doltdb.ErrGhostCommitEncountered
-		}
-
 	}
 
 	headHash, err := headCommit.HashOf()

go/libraries/doltcore/sqle/dfunctions/dolt_merge_base.go → go/libraries/doltcore/sqle/dfunctions/merge_base.go

@@ -24,6 +24,7 @@ import (
 
 	"github.com/dolthub/dolt/go/libraries/doltcore/doltdb"
 	"github.com/dolthub/dolt/go/libraries/doltcore/merge"
+	"github.com/dolthub/dolt/go/libraries/doltcore/ref"
 	"github.com/dolthub/dolt/go/libraries/doltcore/sqle/dsess"
 )
 
@@ -40,6 +41,21 @@ func NewMergeBase(left, right sql.Expression) sql.Expression {
 
 // Eval implements the sql.Expression interface.
 func (d MergeBase) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
+	sess := dsess.DSessFromSess(ctx.Session)
+	dbName := ctx.GetCurrentDatabase()
+	dbData, ok := sess.GetDbData(ctx, dbName)
+	if !ok {
+		return nil, sql.ErrDatabaseNotFound.New(dbName)
+	}
+	doltDB, ok := sess.GetDoltDB(ctx, dbName)
+	if !ok {
+		return nil, sql.ErrDatabaseNotFound.New(dbName)
+	}
+	headRef, err := dbData.Rsr.CWBHeadRef(ctx)
+	if err != nil {
+		return nil, err
+	}
+
 	leftSpec, err := d.Left().Eval(ctx, row)
 	if err != nil {
 		return nil, err
@@ -48,7 +64,6 @@ func (d MergeBase) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 	if err != nil {
 		return nil, err
 	}
-
 	if leftSpec == nil || rightSpec == nil {
 		return nil, nil
 	}
@@ -57,13 +72,16 @@ func (d MergeBase) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 	if !ok {
 		return nil, errors.New("left value is not a string")
 	}
-
 	rightStr, ok := rightSpec.(string)
 	if !ok {
 		return nil, errors.New("right value is not a string")
 	}
 
-	left, right, err := resolveRefSpecs(ctx, leftStr, rightStr)
+	left, err := resolveRefSpec(ctx, headRef, doltDB, leftStr)
+	if err != nil {
+		return nil, err
+	}
+	right, err := resolveRefSpec(ctx, headRef, doltDB, rightStr)
 	if err != nil {
 		return nil, err
 	}
@@ -76,52 +94,20 @@ func (d MergeBase) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 	return mergeBase.String(), nil
 }
 
-func resolveRefSpecs(ctx *sql.Context, leftSpec, rightSpec string) (left, right *doltdb.Commit, err error) {
-	lcs, err := doltdb.NewCommitSpec(leftSpec)
-	if err != nil {
-		return nil, nil, err
-	}
-	rcs, err := doltdb.NewCommitSpec(rightSpec)
+func resolveRefSpec(ctx *sql.Context, headRef ref.DoltRef, doltDB *doltdb.DoltDB, spec string) (*doltdb.Commit, error) {
+	cs, err := doltdb.NewCommitSpec(spec)
 	if err != nil {
-		return nil, nil, err
-	}
-
-	sess := dsess.DSessFromSess(ctx.Session)
-	dbName := ctx.GetCurrentDatabase()
-
-	dbData, ok := sess.GetDbData(ctx, dbName)
-	if !ok {
-		return nil, nil, sql.ErrDatabaseNotFound.New(dbName)
-	}
-	doltDB, ok := sess.GetDoltDB(ctx, dbName)
-	if !ok {
-		return nil, nil, sql.ErrDatabaseNotFound.New(dbName)
-	}
-
-	headRef, err := dbData.Rsr.CWBHeadRef(ctx)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	optCmt, err := doltDB.Resolve(ctx, lcs, headRef)
-	if err != nil {
-		return nil, nil, err
-	}
-	left, ok = optCmt.ToCommit()
-	if !ok {
-		return nil, nil, doltdb.ErrGhostCommitEncountered
+		return nil, err
 	}
-
-	optCmt, err = doltDB.Resolve(ctx, rcs, headRef)
+	optCmt, err := doltDB.Resolve(ctx, cs, headRef)
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
-	right, ok = optCmt.ToCommit()
+	commit, ok := optCmt.ToCommit()
 	if !ok {
-		return nil, nil, doltdb.ErrGhostCommitEncountered
+		return nil, doltdb.ErrGhostCommitEncountered
 	}
-
-	return
+	return commit, err
 }
 
 // String implements the sql.Expression interface.