Merge pull request #489 from erizocosmico/fix/squash-exchange

vendor: upgrade go-mysql-server

Author: ajnavarro

Gopkg.lock

@@ -1,6 +1,6 @@
 [[constraint]]
   name = "gopkg.in/src-d/go-mysql-server.v0"
-  revision = "255f4a35c69f573b6b19d73f03dd7265961dcba3"
+  revision = "95285948912f7edaf92e2e66e44fa6c6ad509942"
 
 [[constraint]]
   name = "github.com/jessevdk/go-flags"

Gopkg.toml

@@ -17,4 +17,4 @@ To make some common tasks easier for the user, there are some functions to inter
 
 ## Standard functions
 
-You can check standard functions in [`go-mysql-server` documentation](https://github.com/src-d/go-mysql-server/tree/255f4a35c69f573b6b19d73f03dd7265961dcba3#custom-functions).
+You can check standard functions in [`go-mysql-server` documentation](https://github.com/src-d/go-mysql-server/tree/95285948912f7edaf92e2e66e44fa6c6ad509942#custom-functions).

docs/using-gitbase/functions.md

@@ -10,4 +10,4 @@ Note that you can create an index either **on one or more columns** or **on a si
 
 You can find some more examples in the [examples](./examples.md#create-an-index-for-columns-on-a-table) section.
 
-See [go-mysql-server](https://github.com/src-d/go-mysql-server/tree/255f4a35c69f573b6b19d73f03dd7265961dcba3#indexes) documentation for more details
+See [go-mysql-server](https://github.com/src-d/go-mysql-server/tree/95285948912f7edaf92e2e66e44fa6c6ad509942#indexes) documentation for more details

docs/using-gitbase/indexes.md

@@ -1,3 +1,3 @@
 ## Supported syntax
 
-To see the SQL subset currently supported take a look at [this list](https://github.com/src-d/go-mysql-server/blob/255f4a35c69f573b6b19d73f03dd7265961dcba3/SUPPORTED.md) from [src-d/go-mysql-server](https://github.com/src-d/go-mysql-server).
+To see the SQL subset currently supported take a look at [this list](https://github.com/src-d/go-mysql-server/blob/95285948912f7edaf92e2e66e44fa6c6ad509942/SUPPORTED.md) from [src-d/go-mysql-server](https://github.com/src-d/go-mysql-server).

docs/using-gitbase/supported-syntax.md

@@ -23,7 +23,7 @@ func TestAnalyzeSquashJoinsExchange(t *testing.T) {
 		WithParallelism(2).
 		AddPostAnalyzeRule(SquashJoinsRule, SquashJoins).
 		Build()
-	a.Batches = a.Batches[:len(a.Batches)-1] // remove the track_process rule
+	a.Batches[len(a.Batches)-1].Rules = a.Batches[len(a.Batches)-1].Rules[1:]
 	a.CurrentDatabase = "foo"
 	ctx := sql.NewEmptyContext()
 
@@ -33,14 +33,14 @@ func TestAnalyzeSquashJoinsExchange(t *testing.T) {
 	result, err := a.Analyze(ctx, node)
 	require.NoError(err)
 
-	project, ok := result.(*plan.Project)
+	exchange, ok := result.(*plan.Exchange)
 	require.True(ok)
+	require.Equal(2, exchange.Parallelism)
 
-	exchange, ok := project.Child.(*plan.Exchange)
+	project, ok := exchange.Child.(*plan.Project)
 	require.True(ok)
-	require.Equal(2, exchange.Parallelism)
 
-	rt, ok := exchange.Child.(*plan.ResolvedTable)
+	rt, ok := project.Child.(*plan.ResolvedTable)
 	require.True(ok)
 
 	_, ok = rt.Table.(*gitbase.SquashedTable)

internal/rule/squashjoins_test.go

@@ -241,7 +241,7 @@ func connectToBblfsh(endpoint string) (*bblfsh.Client, error) {
 // NewSessionBuilder creates a SessionBuilder with the given Repository Pool.
 func NewSessionBuilder(pool *RepositoryPool, opts ...SessionOption) server.SessionBuilder {
 	return func(c *mysql.Conn, host string) sql.Session {
-		opts = append(opts, WithBaseSession(sql.NewSession(host, c.User)))
+		opts = append(opts, WithBaseSession(sql.NewSession(host, c.User, c.ConnectionID)))
 		return NewSession(pool, opts...)
 	}
 }