Skip to content

Commit cef3e59

Browse files
zachmuzachmu
committed
[ga-format-pr] Run ./format_repo.sh to fix formatting
1 parent 58a4db7 commit cef3e59

File tree

293 files changed

+383
-339
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

293 files changed

+383
-339
lines changed

‎driver/rows.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ import (
1818
"database/sql/driver"
1919
"reflect"
2020

21-
"github.com/dolthub/go-mysql-server/sql/types"
2221
"github.com/dolthub/vitess/go/vt/proto/query"
2322

2423
"github.com/dolthub/go-mysql-server/sql"
24+
"github.com/dolthub/go-mysql-server/sql/types"
2525
)
2626

2727
// Rows is an iterator over an executed query's results.

‎driver/value.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ import (
2121
"strconv"
2222
"time"
2323

24-
"github.com/dolthub/go-mysql-server/sql/types"
2524
"github.com/dolthub/vitess/go/sqltypes"
2625

2726
"github.com/dolthub/go-mysql-server/sql"
2827
"github.com/dolthub/go-mysql-server/sql/expression"
28+
"github.com/dolthub/go-mysql-server/sql/types"
2929
)
3030

3131
// ErrUnsupportedType is returned when a query argument of an unsupported type is passed to a statement

‎enginetest/engine_only_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ import (
2424
"testing"
2525
"time"
2626

27-
"github.com/dolthub/go-mysql-server/server"
28-
"github.com/dolthub/go-mysql-server/sql/types"
2927
"github.com/pmezard/go-difflib/difflib"
3028
"github.com/stretchr/testify/assert"
3129
"github.com/stretchr/testify/require"
@@ -37,12 +35,14 @@ import (
3735
"github.com/dolthub/go-mysql-server/enginetest/queries"
3836
"github.com/dolthub/go-mysql-server/enginetest/scriptgen/setup"
3937
"github.com/dolthub/go-mysql-server/memory"
38+
"github.com/dolthub/go-mysql-server/server"
4039
"github.com/dolthub/go-mysql-server/sql"
4140
"github.com/dolthub/go-mysql-server/sql/analyzer"
4241
"github.com/dolthub/go-mysql-server/sql/expression"
4342
"github.com/dolthub/go-mysql-server/sql/expression/function"
4443
"github.com/dolthub/go-mysql-server/sql/parse"
4544
"github.com/dolthub/go-mysql-server/sql/plan"
45+
"github.com/dolthub/go-mysql-server/sql/types"
4646
)
4747

4848
// This file is for tests of the engine that we are very sure do not rely on a particular database implementation. They

‎enginetest/enginetests.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ import (
2222
"strings"
2323
"testing"
2424
"time"
25-
26-
"github.com/dolthub/go-mysql-server/sql/types"
27-
"github.com/dolthub/go-mysql-server/sql/variables"
25+
2826
"github.com/dolthub/vitess/go/mysql"
2927
"github.com/dolthub/vitess/go/sqltypes"
3028
"github.com/dolthub/vitess/go/vt/proto/query"
@@ -47,6 +45,8 @@ import (
4745
"github.com/dolthub/go-mysql-server/sql/parse"
4846
"github.com/dolthub/go-mysql-server/sql/plan"
4947
"github.com/dolthub/go-mysql-server/sql/transform"
48+
"github.com/dolthub/go-mysql-server/sql/types"
49+
"github.com/dolthub/go-mysql-server/sql/variables"
5050
"github.com/dolthub/go-mysql-server/test"
5151
)
5252

‎enginetest/evaluation.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"testing"
2121
"time"
2222

23-
"github.com/dolthub/go-mysql-server/sql/types"
2423
"github.com/shopspring/decimal"
2524
"github.com/stretchr/testify/assert"
2625
"github.com/stretchr/testify/require"
@@ -35,6 +34,7 @@ import (
3534
"github.com/dolthub/go-mysql-server/sql/parse"
3635
"github.com/dolthub/go-mysql-server/sql/plan"
3736
"github.com/dolthub/go-mysql-server/sql/transform"
37+
"github.com/dolthub/go-mysql-server/sql/types"
3838
)
3939

4040
// RunQuery runs the query given and asserts that it doesn't result in an error.

‎enginetest/memory_engine_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"github.com/dolthub/go-mysql-server/sql"
2828
"github.com/dolthub/go-mysql-server/sql/expression"
2929
"github.com/dolthub/go-mysql-server/sql/types"
30-
30+
3131
_ "github.com/dolthub/go-mysql-server/sql/variables"
3232
)
3333

‎enginetest/queries/charset_collation_engine.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@
1515
package queries
1616

1717
import (
18-
"github.com/dolthub/go-mysql-server/sql/types"
1918
"gopkg.in/src-d/go-errors.v1"
2019

20+
"github.com/dolthub/go-mysql-server/sql/types"
21+
2122
"github.com/dolthub/go-mysql-server/sql"
2223
)
2324

‎enginetest/queries/column_alias_queries.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@
1515
package queries
1616

1717
import (
18-
"github.com/dolthub/go-mysql-server/sql/types"
1918
"github.com/dolthub/vitess/go/sqltypes"
2019

20+
"github.com/dolthub/go-mysql-server/sql/types"
21+
2122
"github.com/dolthub/go-mysql-server/sql"
2223
)
2324

‎enginetest/queries/insert_queries.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ package queries
1717
import (
1818
"math"
1919

20-
"github.com/dolthub/go-mysql-server/sql/types"
2120
"github.com/dolthub/vitess/go/mysql"
2221

2322
"github.com/dolthub/go-mysql-server/sql"
23+
"github.com/dolthub/go-mysql-server/sql/types"
2424
)
2525

2626
var InsertQueries = []WriteQueryTest{

‎enginetest/queries/priv_auth_queries.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ import (
1818
"testing"
1919
"time"
2020

21-
"github.com/dolthub/go-mysql-server/sql/types"
2221
"gopkg.in/src-d/go-errors.v1"
2322

2423
sqle "github.com/dolthub/go-mysql-server"
2524
"github.com/dolthub/go-mysql-server/sql"
2625
"github.com/dolthub/go-mysql-server/sql/mysql_db"
2726
"github.com/dolthub/go-mysql-server/sql/plan"
27+
"github.com/dolthub/go-mysql-server/sql/types"
2828
)
2929

3030
// UserPrivilegeTest is used to define a test on the user and privilege systems. These tests always have the root

0 commit comments

Comments
 (0)