*: upgrade code after go-mysql-server update

erizocosmico · erizocosmico · commit cbca949b4b5d · 2018-04-10T13:40:07.000+02:00
Signed-off-by: Miguel Molina &lt;miguel@erizocosmi.co&gt;
diff --git a/cmd/gitbase/main.go b/cmd/gitbase/main.go
diff --git a/cmd/gitbase/server.go b/cmd/gitbase/server.go
diff --git a/cmd/gitbase/version.go b/cmd/gitbase/version.go
diff --git a/common_test.go b/common_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"testing"
 
-	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/stretchr/testify/require"
 	fixtures "gopkg.in/src-d/go-git-fixtures.v3"
 	sqle "gopkg.in/src-d/go-mysql-server.v0"
@@ -32,7 +31,7 @@ func setup(t *testing.T) (ctx *sql.Context, path string, cleanup CleanupFunc) {
 	}
 
 	session := NewSession(&pool)
-	ctx = sql.NewContext(context.TODO(), session, opentracing.NoopTracer{})
+	ctx = sql.NewContext(context.TODO(), sql.WithSession(session))
 
 	return ctx, path, cleanup
 }
diff --git a/integration_test.go b/integration_test.go
@@ -6,7 +6,6 @@ import (
 
 	"github.com/src-d/gitbase/internal/rule"
 
-	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/src-d/gitbase"
 	"github.com/src-d/gitbase/internal/function"
 	"github.com/stretchr/testify/require"
@@ -141,7 +140,7 @@ func TestIntegration(t *testing.T) {
 				require := require.New(t)
 
 				session := gitbase.NewSession(&pool)
-				ctx := sql.NewContext(context.TODO(), session, opentracing.NoopTracer{})
+				ctx := sql.NewContext(context.TODO(), sql.WithSession(session))
 
 				_, iter, err := engine.Query(ctx, tt.query)
 				require.NoError(err)
@@ -255,7 +254,7 @@ func benchmarkQuery(b *testing.B, query string) {
 	_, err := pool.AddGit(path)
 	require.NoError(b, err)
 	session := gitbase.NewSession(&pool)
-	ctx := sql.NewContext(context.TODO(), session, opentracing.NoopTracer{})
+	ctx := sql.NewContext(context.TODO(), sql.WithSession(session))
 
 	run := func(b *testing.B) {
 		for i := 0; i < b.N; i++ {
diff --git a/internal/function/commit_has_blob_test.go b/internal/function/commit_has_blob_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"testing"
 
-	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/src-d/gitbase"
 	"github.com/stretchr/testify/require"
 	fixtures "gopkg.in/src-d/go-git-fixtures.v3"
@@ -29,7 +28,7 @@ func TestCommitHasBlob(t *testing.T) {
 	}
 
 	session := gitbase.NewSession(&pool)
-	ctx := sql.NewContext(context.TODO(), session, opentracing.NoopTracer{})
+	ctx := sql.NewContext(context.TODO(), sql.WithSession(session))
 
 	testCases := []struct {
 		name     string
@@ -74,7 +73,7 @@ func BenchmarkCommitHasBlob(b *testing.B) {
 	}
 
 	session := gitbase.NewSession(&pool)
-	ctx := sql.NewContext(context.TODO(), session, opentracing.NoopTracer{})
+	ctx := sql.NewContext(context.TODO(), sql.WithSession(session))
 
 	rows := []sql.Row{
 		// blob is not on commit
diff --git a/internal/function/commit_has_tree_test.go b/internal/function/commit_has_tree_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"testing"
 
-	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/src-d/gitbase"
 	"github.com/stretchr/testify/require"
 	fixtures "gopkg.in/src-d/go-git-fixtures.v3"
@@ -29,7 +28,7 @@ func TestCommitHasTree(t *testing.T) {
 	}
 
 	session := gitbase.NewSession(&pool)
-	ctx := sql.NewContext(context.TODO(), session, opentracing.NoopTracer{})
+	ctx := sql.NewContext(context.TODO(), sql.WithSession(session))
 
 	testCases := []struct {
 		name     string
@@ -75,7 +74,7 @@ func BenchmarkCommitHasTree(b *testing.B) {
 	}
 
 	session := gitbase.NewSession(&pool)
-	ctx := sql.NewContext(context.TODO(), session, opentracing.NoopTracer{})
+	ctx := sql.NewContext(context.TODO(), sql.WithSession(session))
 
 	rows := []sql.Row{
 		// tree is not on commit
diff --git a/internal/function/history_idx_test.go b/internal/function/history_idx_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"testing"
 
-	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/src-d/gitbase"
 	"github.com/stretchr/testify/require"
 	fixtures "gopkg.in/src-d/go-git-fixtures.v3"
@@ -29,7 +28,7 @@ func TestHistoryIdx(t *testing.T) {
 	}
 
 	session := gitbase.NewSession(&pool)
-	ctx := sql.NewContext(context.TODO(), session, opentracing.NoopTracer{})
+	ctx := sql.NewContext(context.TODO(), sql.WithSession(session))
 
 	testCases := []struct {
 		name     string
@@ -82,7 +81,7 @@ func BenchmarkHistoryIdx(b *testing.B) {
 	}
 
 	session := gitbase.NewSession(&pool)
-	ctx := sql.NewContext(context.TODO(), session, opentracing.NoopTracer{})
+	ctx := sql.NewContext(context.TODO(), sql.WithSession(session))
 
 	cases := []struct {
 		row sql.Row
diff --git a/internal/function/is_remote_test.go b/internal/function/is_remote_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"testing"
 
-	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/src-d/go-mysql-server.v0/sql"
 	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
@@ -31,7 +30,7 @@ func TestIsRemote(t *testing.T) {
 			require := require.New(t)
 
 			session := sql.NewBaseSession()
-			ctx := sql.NewContext(context.TODO(), session, opentracing.NoopTracer{})
+			ctx := sql.NewContext(context.TODO(), sql.WithSession(session))
 
 			val, err := f.Eval(ctx, tt.row)
 			if tt.err {
diff --git a/internal/function/is_tag_test.go b/internal/function/is_tag_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"testing"
 
-	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/src-d/go-mysql-server.v0/sql"
 	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
@@ -31,7 +30,7 @@ func TestIsTag(t *testing.T) {
 			require := require.New(t)
 
 			session := sql.NewBaseSession()
-			ctx := sql.NewContext(context.TODO(), session, opentracing.NoopTracer{})
+			ctx := sql.NewContext(context.TODO(), sql.WithSession(session))
 
 			val, err := f.Eval(ctx, tt.row)
 			if tt.err {
diff --git a/internal/rule/squashjoins_test.go b/internal/rule/squashjoins_test.go
@@ -1,10 +1,8 @@
 package rule
 
 import (
-	"context"
 	"testing"
 
-	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/src-d/gitbase"
 	"github.com/src-d/gitbase/internal/function"
 	"github.com/stretchr/testify/require"
@@ -83,11 +81,7 @@ func TestSquashJoins(t *testing.T) {
 		),
 	)
 
-	result, err := SquashJoins(sql.NewContext(
-		context.TODO(),
-		sql.NewBaseSession(),
-		opentracing.NoopTracer{},
-	), analyzer.New(nil), node)
+	result, err := SquashJoins(sql.NewEmptyContext(), analyzer.New(nil), node)
 	require.NoError(err)
 	require.Equal(expected, result)
 }
@@ -112,11 +106,7 @@ func TestSquashJoinsUnsquashable(t *testing.T) {
 		),
 	)
 
-	result, err := SquashJoins(sql.NewContext(
-		context.TODO(),
-		sql.NewBaseSession(),
-		opentracing.NoopTracer{},
-	), analyzer.New(nil), node)
+	result, err := SquashJoins(sql.NewEmptyContext(), analyzer.New(nil), node)
 	require.NoError(err)
 	require.Equal(node, result)
 }
@@ -174,11 +164,7 @@ func TestSquashJoinsPartial(t *testing.T) {
 		),
 	)
 
-	result, err := SquashJoins(sql.NewContext(
-		context.TODO(),
-		sql.NewBaseSession(),
-		opentracing.NoopTracer{},
-	), analyzer.New(nil), node)
+	result, err := SquashJoins(sql.NewEmptyContext(), analyzer.New(nil), node)
 	require.NoError(err)
 	require.Equal(expected, result)
 }
@@ -219,11 +205,7 @@ func TestSquashJoinsSchema(t *testing.T) {
 		),
 	)
 
-	result, err := SquashJoins(sql.NewContext(
-		context.TODO(),
-		sql.NewBaseSession(),
-		opentracing.NoopTracer{},
-	), analyzer.New(nil), node)
+	result, err := SquashJoins(sql.NewEmptyContext(), analyzer.New(nil), node)
 	require.NoError(err)
 
 	expected := node.Schema()
diff --git a/iterator_test.go b/iterator_test.go
@@ -5,7 +5,6 @@ import (
 	"io"
 	"testing"
 
-	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/stretchr/testify/require"
 	fixtures "gopkg.in/src-d/go-git-fixtures.v3"
 	git "gopkg.in/src-d/go-git.v4"
@@ -437,7 +436,7 @@ func setupIter(t *testing.T) (*sql.Context, func()) {
 	}
 
 	session := NewSession(&pool)
-	ctx := sql.NewContext(context.TODO(), session, opentracing.NoopTracer{})
+	ctx := sql.NewContext(context.TODO(), sql.WithSession(session))
 	cleanup := func() {
 		require.NoError(t, fixtures.Clean())
 	}
diff --git a/repositories_test.go b/repositories_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"testing"
 
-	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/src-d/go-mysql-server.v0/sql"
 	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
@@ -44,7 +43,7 @@ func TestRepositoriesTable_RowIter(t *testing.T) {
 	}
 
 	session := NewSession(&pool)
-	ctx := sql.NewContext(context.TODO(), session, opentracing.NoopTracer{})
+	ctx := sql.NewContext(context.TODO(), sql.WithSession(session))
 
 	db := NewDatabase(RepositoriesTableName)
 	require.NotNil(db)
diff --git a/repository_pool_test.go b/repository_pool_test.go
@@ -10,7 +10,6 @@ import (
 	"sync"
 	"testing"
 
-	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/src-d/go-git-fixtures.v3"
 	"gopkg.in/src-d/go-git.v4"
@@ -189,7 +188,7 @@ func TestRepositoryRowIterator(t *testing.T) {
 
 	pool := NewRepositoryPool()
 	session := NewSession(&pool)
-	ctx := sql.NewContext(context.TODO(), session, opentracing.NoopTracer{})
+	ctx := sql.NewContext(context.TODO(), sql.WithSession(session))
 	max := 64
 
 	for i := 0; i < max; i++ {

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ import (`
`4`	`4`	`"context"`
`5`	`5`	`"testing"`
`6`	`6`
`7`		`- opentracing "github.com/opentracing/opentracing-go"`
`8`	`7`	`"github.com/stretchr/testify/require"`
`9`	`8`	`fixtures "gopkg.in/src-d/go-git-fixtures.v3"`
`10`	`9`	`sqle "gopkg.in/src-d/go-mysql-server.v0"`
`@@ -32,7 +31,7 @@ func setup(t testing.T) (ctx sql.Context, path string, cleanup CleanupFunc) {`
`32`	`31`	`}`
`33`	`32`
`34`	`33`	`session := NewSession(&pool)`
`35`		`- ctx = sql.NewContext(context.TODO(), session, opentracing.NoopTracer{})`
	`34`	`+ ctx = sql.NewContext(context.TODO(), sql.WithSession(session))`
`36`	`35`
`37`	`36`	`return ctx, path, cleanup`
`38`	`37`	`}`