From ea9ee3f9bd55e8941ce6dfca3856217890e72cbb Mon Sep 17 00:00:00 2001 From: zachmu Date: Tue, 28 Jun 2022 00:34:12 +0000 Subject: [PATCH] [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh --- go/libraries/doltcore/diff/diff.go | 5 +++-- go/libraries/doltcore/sqle/dolt_diff_table_function.go | 6 +++--- go/libraries/doltcore/sqle/dsess/session.go | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/go/libraries/doltcore/diff/diff.go b/go/libraries/doltcore/diff/diff.go index 3df197d924..4250cce468 100755 --- a/go/libraries/doltcore/diff/diff.go +++ b/go/libraries/doltcore/diff/diff.go @@ -18,9 +18,10 @@ import ( "context" "time" + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/dolt/go/store/diff" "github.com/dolthub/dolt/go/store/types" - "github.com/dolthub/go-mysql-server/sql" ) // ChangeType is an enum that represents the type of change in a diff @@ -67,4 +68,4 @@ type SqlRowDiffWriter interface { } // ColorFunc is a function that can color a format string -type ColorFunc func (a ...interface{}) string \ No newline at end of file +type ColorFunc func(a ...interface{}) string diff --git a/go/libraries/doltcore/sqle/dolt_diff_table_function.go b/go/libraries/doltcore/sqle/dolt_diff_table_function.go index 6fd4b5a2b7..ef60c0ec03 100644 --- a/go/libraries/doltcore/sqle/dolt_diff_table_function.go +++ b/go/libraries/doltcore/sqle/dolt_diff_table_function.go @@ -161,9 +161,9 @@ func (dtf *DiffTableFunction) RowIter(ctx *sql.Context, _ sql.Row) (sql.RowIter, // loadDetailsForRef loads the root, hash, and timestamp for the specified ref value func (dtf *DiffTableFunction) loadDetailsForRef( - ctx *sql.Context, - ref interface{}, - ddb Database, + ctx *sql.Context, + ref interface{}, + ddb Database, ) (*doltdb.RootValue, string, *types.Timestamp, error) { hashStr, ok := ref.(string) if !ok { diff --git a/go/libraries/doltcore/sqle/dsess/session.go b/go/libraries/doltcore/sqle/dsess/session.go index 6dfcda7063..6455bea9e6 100644 --- a/go/libraries/doltcore/sqle/dsess/session.go +++ b/go/libraries/doltcore/sqle/dsess/session.go @@ -21,7 +21,6 @@ import ( "sync" "time" - "github.com/dolthub/dolt/go/store/types" "github.com/dolthub/go-mysql-server/sql" goerrors "gopkg.in/src-d/go-errors.v1" @@ -33,6 +32,7 @@ import ( "github.com/dolthub/dolt/go/libraries/doltcore/sqle/writer" "github.com/dolthub/dolt/go/libraries/doltcore/table/editor" "github.com/dolthub/dolt/go/libraries/utils/config" + "github.com/dolthub/dolt/go/store/types" ) type batchMode int8