[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh

go/cmd/dolt/commands/indexcmds/rebuild.go

@@ -17,6 +17,8 @@ package indexcmds
 import (
 	"context"
 
+	"github.com/dolthub/go-mysql-server/sql"
+
 	"github.com/dolthub/dolt/go/cmd/dolt/cli"
 	"github.com/dolthub/dolt/go/cmd/dolt/commands"
 	"github.com/dolthub/dolt/go/cmd/dolt/errhand"
@@ -24,7 +26,6 @@ import (
 	"github.com/dolthub/dolt/go/libraries/doltcore/table/editor"
 	"github.com/dolthub/dolt/go/libraries/doltcore/table/editor/creation"
 	"github.com/dolthub/dolt/go/libraries/utils/argparser"
-	"github.com/dolthub/go-mysql-server/sql"
 )
 
 var rebuildDocs = cli.CommandDocumentationContent{

go/libraries/doltcore/merge/merge_prolly_indexes.go

@@ -18,6 +18,8 @@ import (
 	"context"
 	"encoding/json"
 
+	"github.com/dolthub/go-mysql-server/sql"
+
 	"github.com/dolthub/dolt/go/libraries/doltcore/doltdb"
 	"github.com/dolthub/dolt/go/libraries/doltcore/doltdb/durable"
 	"github.com/dolthub/dolt/go/libraries/doltcore/schema"
@@ -26,7 +28,6 @@ import (
 	"github.com/dolthub/dolt/go/store/prolly/tree"
 	"github.com/dolthub/dolt/go/store/types"
 	"github.com/dolthub/dolt/go/store/val"
-	"github.com/dolthub/go-mysql-server/sql"
 )
 
 // mergeProllySecondaryIndexes merges the secondary indexes of the given |tbl|,

go/libraries/doltcore/merge/merge_test.go

@@ -474,7 +474,7 @@ func setupMergeTest(t *testing.T) (*doltdb.DoltDB, types.ValueReadWriter, tree.N
 	require.NoError(t, err)
 	mergeRows, err := rightMut.Map(ctx)
 	require.NoError(t, err)
-	
+
 	rootTbl, err := doltdb.NewTable(ctx, vrw, ns, sch, durable.IndexFromProllyMap(updatedRows), nil, nil)
 	require.NoError(t, err)
 	rootTbl, err = rebuildAllProllyIndexes(ctx, rootTbl)

go/libraries/doltcore/merge/mutable_secondary_index.go

@@ -17,12 +17,13 @@ package merge
 import (
 	"context"
 
+	"github.com/dolthub/go-mysql-server/sql"
+
 	"github.com/dolthub/dolt/go/libraries/doltcore/doltdb/durable"
 	"github.com/dolthub/dolt/go/libraries/doltcore/schema"
 	"github.com/dolthub/dolt/go/libraries/doltcore/sqle/index"
 	"github.com/dolthub/dolt/go/store/prolly"
 	"github.com/dolthub/dolt/go/store/val"
-	"github.com/dolthub/go-mysql-server/sql"
 )
 
 // GetMutableSecondaryIdxs returns a MutableSecondaryIdx for each secondary index in |indexes|.

go/libraries/doltcore/sqle/enginetest/dolt_queries_merge.go

@@ -4291,7 +4291,7 @@ var GeneratedColumnMergeTestScripts = []queries.ScriptTest{
 		},
 		Assertions: []queries.ScriptTestAssertion{
 			{
-				Query:            "call dolt_merge('branch1')",
+				Query:    "call dolt_merge('branch1')",
 				Expected: []sql.Row{{doltCommit, 1, 0}},
 			},
 			{
@@ -4307,7 +4307,7 @@ var GeneratedColumnMergeTestScripts = []queries.ScriptTest{
 				Expected: []sql.Row{{3}},
 			},
 			{
-				Query:            "call dolt_merge('branch2')",
+				Query:    "call dolt_merge('branch2')",
 				Expected: []sql.Row{{doltCommit, 0, 0}},
 			},
 			{
@@ -4343,7 +4343,7 @@ var GeneratedColumnMergeTestScripts = []queries.ScriptTest{
 		},
 		Assertions: []queries.ScriptTestAssertion{
 			{
-				Query:            "call dolt_merge('branch1')",
+				Query:    "call dolt_merge('branch1')",
 				Expected: []sql.Row{{doltCommit, 1, 0}},
 			},
 			{
@@ -4358,7 +4358,7 @@ var GeneratedColumnMergeTestScripts = []queries.ScriptTest{
 				Expected: []sql.Row{{1}},
 			},
 			{
-				Query:            "call dolt_merge('branch2')",
+				Query:    "call dolt_merge('branch2')",
 				Expected: []sql.Row{{doltCommit, 0, 0}},
 			},
 			{
@@ -4392,7 +4392,7 @@ var GeneratedColumnMergeTestScripts = []queries.ScriptTest{
 		},
 		Assertions: []queries.ScriptTestAssertion{
 			{
-				Query:            "call dolt_merge('branch1')",
+				Query:    "call dolt_merge('branch1')",
 				Expected: []sql.Row{{doltCommit, 0, 0}},
 			},
 			{
@@ -4431,7 +4431,7 @@ var GeneratedColumnMergeTestScripts = []queries.ScriptTest{
 		},
 		Assertions: []queries.ScriptTestAssertion{
 			{
-				Query:            "call dolt_merge('branch1')",
+				Query:    "call dolt_merge('branch1')",
 				Expected: []sql.Row{{doltCommit, 1, 0}},
 			},
 			{
@@ -4447,7 +4447,7 @@ var GeneratedColumnMergeTestScripts = []queries.ScriptTest{
 				Expected: []sql.Row{{7}},
 			},
 			{
-				Query:            "call dolt_merge('branch2')",
+				Query:    "call dolt_merge('branch2')",
 				Expected: []sql.Row{{doltCommit, 0, 0}},
 			},
 			{
@@ -4483,7 +4483,7 @@ var GeneratedColumnMergeTestScripts = []queries.ScriptTest{
 		},
 		Assertions: []queries.ScriptTestAssertion{
 			{
-				Query:            "call dolt_merge('branch1')",
+				Query:    "call dolt_merge('branch1')",
 				Expected: []sql.Row{{doltCommit, 0, 0}},
 			},
 			{

go/libraries/doltcore/sqle/enginetest/dolt_queries_schema_merge.go

@@ -2348,14 +2348,14 @@ var SchemaChangeTestsGeneratedColumns = []MergeScriptTest{
 			},
 			{
 				Query: "show create table t;",
-				Skip: true, 				// there should be an index on col3, but there isn't
+				Skip:  true, // there should be an index on col3, but there isn't
 				Expected: []sql.Row{{"t",
 					"CREATE TABLE `t` (\n" +
 						"  `pk` int NOT NULL,\n" +
 						"  `col1` int NOT NULL,\n" +
 						"  `col3` int GENERATED ALWAYS AS ((pk + 1)),\n" +
 						"  PRIMARY KEY (`pk`)\n" +
-					  "  KEY `idx1` (`col3`,`col1`)\n" +
+						"  KEY `idx1` (`col3`,`col1`)\n" +
 						") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_bin"}},
 			},
 			{