Merge branch 'nicktobey/json' of github.com:dolthub/dolt into nicktobey/json

go/go.sum

@@ -183,8 +183,8 @@ github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U=
 github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0=
 github.com/dolthub/go-icu-regex v0.0.0-20230524105445-af7e7991c97e h1:kPsT4a47cw1+y/N5SSCkma7FhAPw7KeGmD6c9PBZW9Y=
 github.com/dolthub/go-icu-regex v0.0.0-20230524105445-af7e7991c97e/go.mod h1:KPUcpx070QOfJK1gNe0zx4pA5sicIK1GMikIGLKC168=
-github.com/dolthub/go-mysql-server v0.17.1-0.20240102195312-24799a08207a h1:pq66btcRL11peaxeiWn8emtbCIKXbrtqC6QIul6HWUU=
-github.com/dolthub/go-mysql-server v0.17.1-0.20240102195312-24799a08207a/go.mod h1:sMn7PQPkwZ2ZNic9146aoNRFR87js4V/q414UIta+ks=
+github.com/dolthub/go-mysql-server v0.17.1-0.20240102004327-8814e66a2544 h1:VhMewBcV6VAIkE88Muo/gmAKrtD12NjBweDoNRSIj3Q=
+github.com/dolthub/go-mysql-server v0.17.1-0.20240102004327-8814e66a2544/go.mod h1:sMn7PQPkwZ2ZNic9146aoNRFR87js4V/q414UIta+ks=
 github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488 h1:0HHu0GWJH0N6a6keStrHhUAK5/o9LVfkh44pvsV4514=
 github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488/go.mod h1:ehexgi1mPxRTk0Mok/pADALuHbvATulTh6gzr7NzZto=
 github.com/dolthub/jsonpath v0.0.2-0.20230525180605-8dc13778fd72 h1:NfWmngMi1CYUWU4Ix8wM+USEhjc+mhPlT9JUR/anvbQ=

go/libraries/doltcore/merge/fulltext_table.go

@@ -16,7 +16,6 @@ package merge
 
 import (
 	"fmt"
-	"github.com/dolthub/dolt/go/store/prolly/tree"
 	"io"
 
 	"github.com/dolthub/go-mysql-server/memory"
@@ -28,6 +27,7 @@ import (
 	"github.com/dolthub/dolt/go/libraries/doltcore/schema"
 	"github.com/dolthub/dolt/go/libraries/doltcore/sqle/sqlutil"
 	"github.com/dolthub/dolt/go/store/pool"
+	"github.com/dolthub/dolt/go/store/prolly/tree"
 	"github.com/dolthub/dolt/go/store/val"
 )
 

go/libraries/doltcore/merge/merge_prolly_rows.go

@@ -20,6 +20,15 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io"
+
+	"github.com/dolthub/go-mysql-server/sql"
+	"github.com/dolthub/go-mysql-server/sql/expression"
+	"github.com/dolthub/go-mysql-server/sql/transform"
+	"github.com/dolthub/go-mysql-server/sql/types"
+	"golang.org/x/exp/maps"
+	errorkinds "gopkg.in/src-d/go-errors.v1"
+
 	"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"
@@ -30,13 +39,6 @@ import (
 	"github.com/dolthub/dolt/go/store/prolly"
 	"github.com/dolthub/dolt/go/store/prolly/tree"
 	"github.com/dolthub/dolt/go/store/val"
-	"github.com/dolthub/go-mysql-server/sql"
-	"github.com/dolthub/go-mysql-server/sql/expression"
-	"github.com/dolthub/go-mysql-server/sql/transform"
-	"github.com/dolthub/go-mysql-server/sql/types"
-	"golang.org/x/exp/maps"
-	errorkinds "gopkg.in/src-d/go-errors.v1"
-	"io"
 )
 
 // ErrUnableToMergeColumnDefaultValue is returned when a column's default value cannot be Eval'ed and we are unable to

go/libraries/doltcore/merge/three_way_json_differ.go

@@ -16,10 +16,12 @@ package merge
 
 import (
 	"bytes"
-	"github.com/dolthub/dolt/go/store/prolly/tree"
-	"github.com/dolthub/go-mysql-server/sql/types"
 	"io"
 	"strings"
+
+	"github.com/dolthub/go-mysql-server/sql/types"
+
+	"github.com/dolthub/dolt/go/store/prolly/tree"
 )
 
 type ThreeWayJsonDiffer struct {

go/libraries/doltcore/sqle/dsess/autoincrement_tracker.go

@@ -16,7 +16,6 @@ package dsess
 
 import (
 	"context"
-	"github.com/dolthub/dolt/go/store/prolly/tree"
 	"io"
 	"math"
 	"strings"
@@ -30,6 +29,7 @@ import (
 	"github.com/dolthub/dolt/go/libraries/doltcore/ref"
 	"github.com/dolthub/dolt/go/libraries/doltcore/schema"
 	"github.com/dolthub/dolt/go/libraries/doltcore/sqle/globalstate"
+	"github.com/dolthub/dolt/go/store/prolly/tree"
 	"github.com/dolthub/dolt/go/store/types"
 )
 

go/libraries/doltcore/sqle/dtables/conflicts_tables_prolly.go

@@ -18,6 +18,7 @@ import (
 	"context"
 	"encoding/base64"
 	"fmt"
+
 	"github.com/dolthub/go-mysql-server/sql"
 	"github.com/zeebo/xxh3"
 

go/libraries/doltcore/sqle/dtables/constraint_violations_prolly.go

@@ -16,6 +16,7 @@ package dtables
 
 import (
 	"encoding/json"
+
 	"github.com/dolthub/go-mysql-server/sql"
 
 	"github.com/dolthub/dolt/go/libraries/doltcore/doltdb"

go/libraries/doltcore/sqle/dtables/prolly_row_conv.go

@@ -16,6 +16,7 @@ package dtables
 
 import (
 	"context"
+
 	"github.com/dolthub/go-mysql-server/sql"
 
 	"github.com/dolthub/dolt/go/libraries/doltcore/rowconv"

go/libraries/doltcore/sqle/stats/rebuild_test.go

@@ -18,7 +18,6 @@ import (
 	"container/heap"
 	"context"
 	"fmt"
-	"github.com/dolthub/dolt/go/store/prolly/tree"
 	"testing"
 
 	"github.com/dolthub/go-mysql-server/sql"
@@ -26,6 +25,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/dolthub/dolt/go/store/pool"
+	"github.com/dolthub/dolt/go/store/prolly/tree"
 	"github.com/dolthub/dolt/go/store/val"
 )
 

go/libraries/doltcore/sqle/testutil.go

@@ -18,7 +18,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/dolthub/dolt/go/store/prolly/tree"
 	"io"
 	"strings"
 
@@ -37,6 +36,7 @@ import (
 	"github.com/dolthub/dolt/go/libraries/doltcore/table/editor"
 	config2 "github.com/dolthub/dolt/go/libraries/utils/config"
 	"github.com/dolthub/dolt/go/libraries/utils/filesys"
+	"github.com/dolthub/dolt/go/store/prolly/tree"
 	"github.com/dolthub/dolt/go/store/types"
 	"github.com/dolthub/dolt/go/store/val"
 )

go/libraries/doltcore/sqle/writer/prolly_fk_indexer.go

@@ -16,13 +16,13 @@ package writer
 
 import (
 	"fmt"
-	"github.com/dolthub/dolt/go/store/prolly/tree"
 	"io"
 
 	"github.com/dolthub/go-mysql-server/sql"
 
 	"github.com/dolthub/dolt/go/libraries/doltcore/sqle/index"
 	"github.com/dolthub/dolt/go/store/prolly"
+	"github.com/dolthub/dolt/go/store/prolly/tree"
 	"github.com/dolthub/dolt/go/store/val"
 )
 

go/libraries/doltcore/sqle/writer/prolly_index_writer.go

@@ -16,7 +16,6 @@ package writer
 
 import (
 	"context"
-	"github.com/dolthub/dolt/go/store/prolly/tree"
 	"io"
 	"strings"
 
@@ -26,6 +25,7 @@ import (
 	"github.com/dolthub/dolt/go/libraries/doltcore/doltdb/durable"
 	"github.com/dolthub/dolt/go/libraries/doltcore/schema"
 	"github.com/dolthub/dolt/go/store/prolly"
+	"github.com/dolthub/dolt/go/store/prolly/tree"
 	"github.com/dolthub/dolt/go/store/val"
 )
 

go/libraries/doltcore/sqle/writer/prolly_index_writer_keyless.go

@@ -16,12 +16,12 @@ package writer
 
 import (
 	"context"
-	"github.com/dolthub/dolt/go/store/prolly/tree"
 	"io"
 
 	"github.com/dolthub/go-mysql-server/sql"
 
 	"github.com/dolthub/dolt/go/store/prolly"
+	"github.com/dolthub/dolt/go/store/prolly/tree"
 	"github.com/dolthub/dolt/go/store/val"
 )
 

go/store/prolly/tree/json_diff.go

@@ -17,10 +17,11 @@ package tree
 import (
 	"bytes"
 	"fmt"
-	"github.com/dolthub/go-mysql-server/sql/types"
 	"io"
 	"reflect"
 	"strings"
+
+	"github.com/dolthub/go-mysql-server/sql/types"
 )
 
 type JsonDiff struct {

go/store/prolly/tree/json_diff_test.go

@@ -15,11 +15,12 @@
 package tree
 
 import (
+	"io"
+	"testing"
+
 	"github.com/dolthub/go-mysql-server/sql/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"io"
-	"testing"
 )
 
 type jsonDiffTest struct {

go/store/prolly/tree/node.go

@@ -18,9 +18,10 @@ import (
 	"context"
 	"encoding/hex"
 	"fmt"
-	"github.com/dolthub/dolt/go/libraries/doltcore/schema"
 	"io"
 
+	"github.com/dolthub/dolt/go/libraries/doltcore/schema"
+
 	"github.com/dolthub/dolt/go/gen/fb/serial"
 	"github.com/dolthub/dolt/go/store/hash"
 	"github.com/dolthub/dolt/go/store/prolly/message"