Repository: src-d/go-mysql-server
Pull request #736 (2019-05-30 14:55:53)

replace all gopkg.in imports and use only go mods
First step of moving gitbase to go modules is moving this to go modules. We already do the versioning with it, so there's no point in versioning with gopkg.in as well.


Patch:
diff --git a/.travis.yml b/.travis.yml
index ea620c2..1b32462 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,10 @@
 language: go
-go_import_path: gopkg.in/src-d/go-mysql-server.v0
+go_import_path: github.com/src-d/go-mysql-server
 
 env:
   global:
     - LD_LIBRARY_PATH="/usr/local/lib":${LD_LIBRARY_PATH}
+    - GO111MODULE=on
 
 addons:
   apt:
@@ -20,8 +21,7 @@ services:
   - docker
 
 install:
-  - GO111MODULE=on go get ./...
-  - GO111MODULE=on go mod vendor
+  - go get ./...
   - make dependencies
 
 before_script:
@@ -45,7 +45,7 @@ jobs:
       before_install:
         - eval "$(gimme 1.12.4)"
       install:
-        - GO111MODULE=on go get ./...
+        - go get ./...
       script:
         - make TEST=python-pymysql integration
 
@@ -54,7 +54,7 @@ jobs:
       before_install:
         - eval "$(gimme 1.12.4)"
       install:
-        - GO111MODULE=on go get ./...
+        - go get ./...
       script:
         - make TEST=php integration
 
@@ -63,7 +63,7 @@ jobs:
       before_install:
         - eval "$(gimme 1.12.4)"
       install:
-        - GO111MODULE=on go get ./...
+        - go get ./...
       script:
         - make TEST=ruby integration
 
@@ -72,7 +72,7 @@ jobs:
       before_install:
         - eval "$(gimme 1.12.4)"
       install:
-        - GO111MODULE=on go get ./...
+        - go get ./...
       script:
         - make TEST=jdbc-mariadb integration
 
@@ -81,7 +81,7 @@ jobs:
       before_install:
         - eval "$(gimme 1.12.4)"
       install:
-        - GO111MODULE=on go get ./...
+        - go get ./...
       script:
         - make TEST=javascript integration
 
@@ -91,7 +91,7 @@ jobs:
       before_install:
         - eval "$(gimme 1.12.4)"
       install:
-        - GO111MODULE=on go get ./...
+        - go get ./...
       script:
         - make TEST=dotnet integration
 
@@ -100,6 +100,6 @@ jobs:
       before_install:
         - eval "$(gimme 1.12.4)"
       install:
-        - GO111MODULE=on go get ./...
+        - go get ./...
       script:
         - make TEST=c integration
\ No newline at end of file
diff --git a/README.md b/README.md
index abe6d11..3676607 100644
--- a/README.md
+++ b/README.md
@@ -33,12 +33,12 @@ Having data in another format that you want as tabular data to query using SQL,
 
 ## Installation
 
-The import path for the package is `gopkg.in/src-d/go-mysql-server.v0`.
+The import path for the package is `github.com/src-d/go-mysql-server`.
 
 To install it, run:
 
 ```
-go get gopkg.in/src-d/go-mysql-server.v0
+go get github.com/src-d/go-mysql-server
 ```
 
 ## Documentation
diff --git a/_example/main.go b/_example/main.go
index 7f245f3..e98f0e5 100644
--- a/_example/main.go
+++ b/_example/main.go
@@ -3,11 +3,11 @@ package main
 import (
 	"time"
 
-	"gopkg.in/src-d/go-mysql-server.v0"
-	"gopkg.in/src-d/go-mysql-server.v0/auth"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/server"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server"
+	"github.com/src-d/go-mysql-server/auth"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/server"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // Example of how to implement a MySQL server based on a Engine:
diff --git a/_integration/go/go.mod b/_integration/go/go.mod
index 1979183..01e7159 100644
--- a/_integration/go/go.mod
+++ b/_integration/go/go.mod
@@ -1,4 +1,4 @@
-module gopkg.in/src-d/go-mysql-server.v0/integration/go
+module github.com/src-d/go-mysql-server/integration/go
 
 require (
 	github.com/go-sql-driver/mysql v1.4.0
diff --git a/auth/audit.go b/auth/audit.go
index e28942d..7cfb519 100644
--- a/auth/audit.go
+++ b/auth/audit.go
@@ -4,7 +4,7 @@ import (
 	"net"
 	"time"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 	"gopkg.in/src-d/go-vitess.v1/mysql"
 
 	"github.com/sirupsen/logrus"
diff --git a/auth/auth.go b/auth/auth.go
index 40042cc..47a793c 100644
--- a/auth/auth.go
+++ b/auth/auth.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 
 	"gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 	"gopkg.in/src-d/go-vitess.v1/mysql"
 )
 
diff --git a/auth/native.go b/auth/native.go
index 7801681..ebef4e1 100644
--- a/auth/native.go
+++ b/auth/native.go
@@ -9,7 +9,7 @@ import (
 	"regexp"
 	"strings"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 
 	"gopkg.in/src-d/go-errors.v1"
 	"gopkg.in/src-d/go-vitess.v1/mysql"
diff --git a/auth/none.go b/auth/none.go
index 100f482..6a88787 100644
--- a/auth/none.go
+++ b/auth/none.go
@@ -1,7 +1,7 @@
 package auth
 
 import (
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 
 	"gopkg.in/src-d/go-vitess.v1/mysql"
 )
diff --git a/benchmark/metadata.go b/benchmark/metadata.go
index b8867cf..16545ef 100644
--- a/benchmark/metadata.go
+++ b/benchmark/metadata.go
@@ -1,6 +1,6 @@
 package benchmark
 
-import "gopkg.in/src-d/go-mysql-server.v0/sql"
+import "github.com/src-d/go-mysql-server/sql"
 
 type tableMetadata struct {
 	schema sql.Schema
diff --git a/engine.go b/engine.go
index f42cf8f..3be26ba 100644
--- a/engine.go
+++ b/engine.go
@@ -1,14 +1,14 @@
-package sqle // import "gopkg.in/src-d/go-mysql-server.v0"
+package sqle // import "github.com/src-d/go-mysql-server"
 
 import (
 	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/sirupsen/logrus"
-	"gopkg.in/src-d/go-mysql-server.v0/auth"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/analyzer"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression/function"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/parse"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/auth"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/analyzer"
+	"github.com/src-d/go-mysql-server/sql/expression/function"
+	"github.com/src-d/go-mysql-server/sql/parse"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 // Config for the Engine.
diff --git a/go.mod b/go.mod
index 4ba4986..7701384 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module gopkg.in/src-d/go-mysql-server.v0
+module github.com/src-d/go-mysql-server
 
 require (
 	github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705 // indirect
diff --git a/go.sum b/go.sum
index b1ac166..feba079 100644
--- a/go.sum
+++ b/go.sum
@@ -160,8 +160,6 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/src-d/go-errors.v1 v1.0.0 h1:cooGdZnCjYbeS1zb1s6pVAAimTdKceRrpn7aKOnNIfc=
 gopkg.in/src-d/go-errors.v1 v1.0.0/go.mod h1:q1cBlomlw2FnDBDNGlnh6X0jPihy+QxZfMMNxPCbdYg=
-gopkg.in/src-d/go-vitess.v1 v1.6.0 h1:jIe2MXLIewejW6sebf7IPnSzwt4fPQIj53nPuzg/xD8=
-gopkg.in/src-d/go-vitess.v1 v1.6.0/go.mod h1:+g/wDtovsUgE2ioi32fo5Vavrtvfd/N1AvnknTmTvZE=
 gopkg.in/src-d/go-vitess.v1 v1.7.0 h1:7hYhf5sesJDLxl8//V/q6IyQJ4mOktLmkkfosMM9d00=
 gopkg.in/src-d/go-vitess.v1 v1.7.0/go.mod h1:+g/wDtovsUgE2ioi32fo5Vavrtvfd/N1AvnknTmTvZE=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
diff --git a/mem/database.go b/mem/database.go
index 0cd30a1..e42e2fa 100644
--- a/mem/database.go
+++ b/mem/database.go
@@ -1,7 +1,7 @@
-package mem // import "gopkg.in/src-d/go-mysql-server.v0/mem"
+package mem // import "github.com/src-d/go-mysql-server/mem"
 
 import (
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // Database is an in-memory database.
diff --git a/mem/table.go b/mem/table.go
index fc92d06..8217a12 100644
--- a/mem/table.go
+++ b/mem/table.go
@@ -8,8 +8,8 @@ import (
 	"strconv"
 
 	errors "gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 // Table represents an in-memory database table.
diff --git a/server/context.go b/server/context.go
index a006019..b250997 100644
--- a/server/context.go
+++ b/server/context.go
@@ -5,7 +5,7 @@ import (
 	"sync"
 
 	opentracing "github.com/opentracing/opentracing-go"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 	"gopkg.in/src-d/go-vitess.v1/mysql"
 )
 
diff --git a/server/handler.go b/server/handler.go
index 0f079b1..34e2e70 100644
--- a/server/handler.go
+++ b/server/handler.go
@@ -9,9 +9,9 @@ import (
 	"time"
 
 	errors "gopkg.in/src-d/go-errors.v1"
-	sqle "gopkg.in/src-d/go-mysql-server.v0"
-	"gopkg.in/src-d/go-mysql-server.v0/auth"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	sqle "github.com/src-d/go-mysql-server"
+	"github.com/src-d/go-mysql-server/auth"
+	"github.com/src-d/go-mysql-server/sql"
 
 	"github.com/sirupsen/logrus"
 	"gopkg.in/src-d/go-vitess.v1/mysql"
diff --git a/server/server.go b/server/server.go
index 48ac7fb..bed7da7 100644
--- a/server/server.go
+++ b/server/server.go
@@ -1,11 +1,11 @@
-package server // import "gopkg.in/src-d/go-mysql-server.v0/server"
+package server // import "github.com/src-d/go-mysql-server/server"
 
 import (
 	"time"
 
 	opentracing "github.com/opentracing/opentracing-go"
-	"gopkg.in/src-d/go-mysql-server.v0"
-	"gopkg.in/src-d/go-mysql-server.v0/auth"
+	"github.com/src-d/go-mysql-server"
+	"github.com/src-d/go-mysql-server/auth"
 
 	"gopkg.in/src-d/go-vitess.v1/mysql"
 )
diff --git a/sql/analyzer/aggregations.go b/sql/analyzer/aggregations.go
index 0f67e94..90e5baa 100644
--- a/sql/analyzer/aggregations.go
+++ b/sql/analyzer/aggregations.go
@@ -1,9 +1,9 @@
 package analyzer
 
 import (
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 func reorderAggregations(ctx *sql.Context, a *Analyzer, n sql.Node) (sql.Node, error) {
diff --git a/sql/analyzer/analyzer.go b/sql/analyzer/analyzer.go
index 8097ca9..6041534 100644
--- a/sql/analyzer/analyzer.go
+++ b/sql/analyzer/analyzer.go
@@ -1,4 +1,4 @@
-package analyzer // import "gopkg.in/src-d/go-mysql-server.v0/sql/analyzer"
+package analyzer // import "github.com/src-d/go-mysql-server/sql/analyzer"
 
 import (
 	"os"
@@ -6,7 +6,7 @@ import (
 	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/sirupsen/logrus"
 	"gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 const debugAnalyzerKey = "DEBUG_ANALYZER"
diff --git a/sql/analyzer/assign_catalog.go b/sql/analyzer/assign_catalog.go
index 8d07247..409ae08 100644
--- a/sql/analyzer/assign_catalog.go
+++ b/sql/analyzer/assign_catalog.go
@@ -1,8 +1,8 @@
 package analyzer
 
 import (
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 // assignCatalog sets the catalog in the required nodes.
diff --git a/sql/analyzer/assign_indexes.go b/sql/analyzer/assign_indexes.go
index 7c0e17f..1b3a4da 100644
--- a/sql/analyzer/assign_indexes.go
+++ b/sql/analyzer/assign_indexes.go
@@ -4,9 +4,9 @@ import (
 	"reflect"
 
 	errors "gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 var errInvalidInRightEvaluation = errors.NewKind("expecting evaluation of IN expression right hand side to be a tuple, but it is %T")
diff --git a/sql/analyzer/batch.go b/sql/analyzer/batch.go
index 9d6484a..8153e32 100644
--- a/sql/analyzer/batch.go
+++ b/sql/analyzer/batch.go
@@ -3,7 +3,7 @@ package analyzer
 import (
 	"reflect"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // RuleFunc is the function to be applied in a rule.
diff --git a/sql/analyzer/convert_dates.go b/sql/analyzer/convert_dates.go
index 60c5b31..5307463 100644
--- a/sql/analyzer/convert_dates.go
+++ b/sql/analyzer/convert_dates.go
@@ -1,11 +1,11 @@
 package analyzer
 
 import (
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression/function"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression/function/aggregation"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/expression/function"
+	"github.com/src-d/go-mysql-server/sql/expression/function/aggregation"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 // convertDates wraps all expressions of date and datetime type with converts
diff --git a/sql/analyzer/filters.go b/sql/analyzer/filters.go
index 2932e71..9cad520 100644
--- a/sql/analyzer/filters.go
+++ b/sql/analyzer/filters.go
@@ -3,8 +3,8 @@ package analyzer
 import (
 	"reflect"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 type filters map[string][]sql.Expression
diff --git a/sql/analyzer/optimization_rules.go b/sql/analyzer/optimization_rules.go
index b1c51e5..bfa83ae 100644
--- a/sql/analyzer/optimization_rules.go
+++ b/sql/analyzer/optimization_rules.go
@@ -2,9 +2,9 @@ package analyzer
 
 import (
 	"gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 func eraseProjection(ctx *sql.Context, a *Analyzer, node sql.Node) (sql.Node, error) {
diff --git a/sql/analyzer/parallelize.go b/sql/analyzer/parallelize.go
index 126ab6d..53e0276 100644
--- a/sql/analyzer/parallelize.go
+++ b/sql/analyzer/parallelize.go
@@ -1,8 +1,8 @@
 package analyzer
 
 import (
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 func shouldParallelize(node sql.Node) bool {
diff --git a/sql/analyzer/process.go b/sql/analyzer/process.go
index 5d486ac..2d2d0f3 100644
--- a/sql/analyzer/process.go
+++ b/sql/analyzer/process.go
@@ -1,8 +1,8 @@
 package analyzer
 
 import (
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 // trackProcess will wrap the query in a process node and add progress items
diff --git a/sql/analyzer/prune_columns.go b/sql/analyzer/prune_columns.go
index 008c4cc..db424de 100644
--- a/sql/analyzer/prune_columns.go
+++ b/sql/analyzer/prune_columns.go
@@ -3,9 +3,9 @@ package analyzer
 import (
 	"fmt"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 type usedColumns map[string]map[string]struct{}
diff --git a/sql/analyzer/pushdown.go b/sql/analyzer/pushdown.go
index f9cb40c..56bae25 100644
--- a/sql/analyzer/pushdown.go
+++ b/sql/analyzer/pushdown.go
@@ -4,9 +4,9 @@ import (
 	"reflect"
 	"sync"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 func pushdown(ctx *sql.Context, a *Analyzer, n sql.Node) (sql.Node, error) {
diff --git a/sql/analyzer/resolve_columns.go b/sql/analyzer/resolve_columns.go
index 1fa006e..e005217 100644
--- a/sql/analyzer/resolve_columns.go
+++ b/sql/analyzer/resolve_columns.go
@@ -6,10 +6,10 @@ import (
 	"strings"
 
 	"gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/internal/similartext"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/internal/similartext"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/plan"
 	"gopkg.in/src-d/go-vitess.v1/vt/sqlparser"
 )
 
diff --git a/sql/analyzer/resolve_database.go b/sql/analyzer/resolve_database.go
index c503759..6590e07 100644
--- a/sql/analyzer/resolve_database.go
+++ b/sql/analyzer/resolve_database.go
@@ -1,7 +1,7 @@
 package analyzer
 
 import (
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func resolveDatabase(ctx *sql.Context, a *Analyzer, n sql.Node) (sql.Node, error) {
diff --git a/sql/analyzer/resolve_functions.go b/sql/analyzer/resolve_functions.go
index ec034a7..a1a200a 100644
--- a/sql/analyzer/resolve_functions.go
+++ b/sql/analyzer/resolve_functions.go
@@ -1,8 +1,8 @@
 package analyzer
 
 import (
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func resolveFunctions(ctx *sql.Context, a *Analyzer, n sql.Node) (sql.Node, error) {
diff --git a/sql/analyzer/resolve_having.go b/sql/analyzer/resolve_having.go
index 06bca91..64399b3 100644
--- a/sql/analyzer/resolve_having.go
+++ b/sql/analyzer/resolve_having.go
@@ -4,10 +4,10 @@ import (
 	"reflect"
 
 	"gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression/function/aggregation"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/expression/function/aggregation"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 func resolveHaving(ctx *sql.Context, a *Analyzer, node sql.Node) (sql.Node, error) {
diff --git a/sql/analyzer/resolve_natural_joins.go b/sql/analyzer/resolve_natural_joins.go
index 2de60b6..97f2561 100644
--- a/sql/analyzer/resolve_natural_joins.go
+++ b/sql/analyzer/resolve_natural_joins.go
@@ -3,9 +3,9 @@ package analyzer
 import (
 	"reflect"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 type transformedJoin struct {
diff --git a/sql/analyzer/resolve_orderby.go b/sql/analyzer/resolve_orderby.go
index ef973fa..dc24e67 100644
--- a/sql/analyzer/resolve_orderby.go
+++ b/sql/analyzer/resolve_orderby.go
@@ -4,9 +4,9 @@ import (
 	"strings"
 
 	errors "gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 func resolveOrderBy(ctx *sql.Context, a *Analyzer, n sql.Node) (sql.Node, error) {
diff --git a/sql/analyzer/resolve_stars.go b/sql/analyzer/resolve_stars.go
index c334329..9f8e853 100644
--- a/sql/analyzer/resolve_stars.go
+++ b/sql/analyzer/resolve_stars.go
@@ -1,9 +1,9 @@
 package analyzer
 
 import (
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 func resolveStar(ctx *sql.Context, a *Analyzer, n sql.Node) (sql.Node, error) {
diff --git a/sql/analyzer/resolve_subqueries.go b/sql/analyzer/resolve_subqueries.go
index 89fdb46..6c315b5 100644
--- a/sql/analyzer/resolve_subqueries.go
+++ b/sql/analyzer/resolve_subqueries.go
@@ -1,8 +1,8 @@
 package analyzer
 
 import (
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 func resolveSubqueries(ctx *sql.Context, a *Analyzer, n sql.Node) (sql.Node, error) {
diff --git a/sql/analyzer/resolve_tables.go b/sql/analyzer/resolve_tables.go
index d9b4619..afe00d4 100644
--- a/sql/analyzer/resolve_tables.go
+++ b/sql/analyzer/resolve_tables.go
@@ -1,9 +1,9 @@
 package analyzer
 
 import (
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 const dualTableName = "dual"
diff --git a/sql/analyzer/validation_rules.go b/sql/analyzer/validation_rules.go
index 288163f..3d4dae5 100644
--- a/sql/analyzer/validation_rules.go
+++ b/sql/analyzer/validation_rules.go
@@ -4,10 +4,10 @@ import (
 	"strings"
 
 	"gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression/function"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/expression/function"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 const (
diff --git a/sql/analyzer/warnings.go b/sql/analyzer/warnings.go
index 642ab92..a2b7dfb 100644
--- a/sql/analyzer/warnings.go
+++ b/sql/analyzer/warnings.go
@@ -1,8 +1,8 @@
 package analyzer
 
 import (
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 func clearWarnings(ctx *sql.Context, a *Analyzer, node sql.Node) (sql.Node, error) {
diff --git a/sql/catalog.go b/sql/catalog.go
index c2b35ee..1281815 100644
--- a/sql/catalog.go
+++ b/sql/catalog.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"sync"
 
-	"gopkg.in/src-d/go-mysql-server.v0/internal/similartext"
+	"github.com/src-d/go-mysql-server/internal/similartext"
 
 	"gopkg.in/src-d/go-errors.v1"
 )
diff --git a/sql/core.go b/sql/core.go
index ed8bf61..57e5797 100644
--- a/sql/core.go
+++ b/sql/core.go
@@ -1,4 +1,4 @@
-package sql // import "gopkg.in/src-d/go-mysql-server.v0/sql"
+package sql // import "github.com/src-d/go-mysql-server/sql"
 
 import (
 	"fmt"
diff --git a/sql/expression/alias.go b/sql/expression/alias.go
index ee382b6..6b9b1ed 100644
--- a/sql/expression/alias.go
+++ b/sql/expression/alias.go
@@ -3,7 +3,7 @@ package expression
 import (
 	"fmt"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // Alias is a node that gives a name to an expression.
diff --git a/sql/expression/arithmetic.go b/sql/expression/arithmetic.go
index 46b83bf..41444e6 100644
--- a/sql/expression/arithmetic.go
+++ b/sql/expression/arithmetic.go
@@ -8,7 +8,7 @@ import (
 	errors "gopkg.in/src-d/go-errors.v1"
 	"gopkg.in/src-d/go-vitess.v1/vt/sqlparser"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 var (
diff --git a/sql/expression/between.go b/sql/expression/between.go
index 15ad002..ce89215 100644
--- a/sql/expression/between.go
+++ b/sql/expression/between.go
@@ -3,7 +3,7 @@ package expression
 import (
 	"fmt"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // Between checks a value is between two given values.
diff --git a/sql/expression/boolean.go b/sql/expression/boolean.go
index caef111..c499102 100644
--- a/sql/expression/boolean.go
+++ b/sql/expression/boolean.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // Not is a node that negates an expression.
diff --git a/sql/expression/case.go b/sql/expression/case.go
index 77d751a..388f3a7 100644
--- a/sql/expression/case.go
+++ b/sql/expression/case.go
@@ -3,7 +3,7 @@ package expression
 import (
 	"bytes"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // CaseBranch is a single branch of a case expression.
diff --git a/sql/expression/common.go b/sql/expression/common.go
index 8d1a5ef..b124f26 100644
--- a/sql/expression/common.go
+++ b/sql/expression/common.go
@@ -1,7 +1,7 @@
 package expression
 
 import (
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // IsUnary returns whether the expression is unary or not.
diff --git a/sql/expression/comparison.go b/sql/expression/comparison.go
index dc8b90c..c1fd93e 100644
--- a/sql/expression/comparison.go
+++ b/sql/expression/comparison.go
@@ -5,8 +5,8 @@ import (
 	"sync"
 
 	errors "gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/internal/regex"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/internal/regex"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // Comparer implements a comparison expression.
diff --git a/sql/expression/convert.go b/sql/expression/convert.go
index 0d25021..d406403 100644
--- a/sql/expression/convert.go
+++ b/sql/expression/convert.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/spf13/cast"
 	errors "gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // ErrConvertExpression is returned when a conversion is not possible.
diff --git a/sql/expression/default.go b/sql/expression/default.go
index 7d1153b..5757a6c 100644
--- a/sql/expression/default.go
+++ b/sql/expression/default.go
@@ -1,7 +1,7 @@
 package expression
 
 import (
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // DefaultColumn is an default expression of a column that is not yet resolved.
diff --git a/sql/expression/doc.go b/sql/expression/doc.go
index 4e82f94..820316f 100644
--- a/sql/expression/doc.go
+++ b/sql/expression/doc.go
@@ -1,1 +1,1 @@
-package expression // import "gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+package expression // import "github.com/src-d/go-mysql-server/sql/expression"
diff --git a/sql/expression/function/aggregation/avg.go b/sql/expression/function/aggregation/avg.go
index a13ea41..57153f1 100644
--- a/sql/expression/function/aggregation/avg.go
+++ b/sql/expression/function/aggregation/avg.go
@@ -1,10 +1,10 @@
-package aggregation // import "gopkg.in/src-d/go-mysql-server.v0/sql/expression/function/aggregation"
+package aggregation // import "github.com/src-d/go-mysql-server/sql/expression/function/aggregation"
 
 import (
 	"fmt"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 // Avg node to calculate the average from numeric column
diff --git a/sql/expression/function/aggregation/count.go b/sql/expression/function/aggregation/count.go
index e1f03e8..96406b1 100644
--- a/sql/expression/function/aggregation/count.go
+++ b/sql/expression/function/aggregation/count.go
@@ -3,8 +3,8 @@ package aggregation
 import (
 	"fmt"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 // Count node to count how many rows are in the result set.
diff --git a/sql/expression/function/aggregation/max.go b/sql/expression/function/aggregation/max.go
index 1c793a8..40ec863 100644
--- a/sql/expression/function/aggregation/max.go
+++ b/sql/expression/function/aggregation/max.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"reflect"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 // Max agregation returns the greatest value of the selected column.
diff --git a/sql/expression/function/aggregation/min.go b/sql/expression/function/aggregation/min.go
index 3fef114..19c08c2 100644
--- a/sql/expression/function/aggregation/min.go
+++ b/sql/expression/function/aggregation/min.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"reflect"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 // Min aggregation returns the smallest value of the selected column.
diff --git a/sql/expression/function/aggregation/sum.go b/sql/expression/function/aggregation/sum.go
index 104de36..dd62e0d 100644
--- a/sql/expression/function/aggregation/sum.go
+++ b/sql/expression/function/aggregation/sum.go
@@ -3,8 +3,8 @@ package aggregation
 import (
 	"fmt"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 // Sum agregation returns the sum of all values in the selected column.
diff --git a/sql/expression/function/arraylength.go b/sql/expression/function/arraylength.go
index 98b0197..0b48103 100644
--- a/sql/expression/function/arraylength.go
+++ b/sql/expression/function/arraylength.go
@@ -1,11 +1,11 @@
-package function // import "gopkg.in/src-d/go-mysql-server.v0/sql/expression/function"
+package function // import "github.com/src-d/go-mysql-server/sql/expression/function"
 
 import (
 	"fmt"
 	"reflect"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 // ArrayLength returns the length of an array.
diff --git a/sql/expression/function/ceil_round_floor.go b/sql/expression/function/ceil_round_floor.go
index 1c91197..1aafa66 100644
--- a/sql/expression/function/ceil_round_floor.go
+++ b/sql/expression/function/ceil_round_floor.go
@@ -5,8 +5,8 @@ import (
 	"math"
 	"reflect"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 // Ceil returns the smallest integer value not less than X.
diff --git a/sql/expression/function/coalesce.go b/sql/expression/function/coalesce.go
index e7a0b76..529a8c4 100644
--- a/sql/expression/function/coalesce.go
+++ b/sql/expression/function/coalesce.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // Coalesce returns the first non-NULL value in the list, or NULL if there are no non-NULL values.
diff --git a/sql/expression/function/concat.go b/sql/expression/function/concat.go
index dc81f11..77a384a 100644
--- a/sql/expression/function/concat.go
+++ b/sql/expression/function/concat.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 
 	errors "gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // Concat joins several strings together.
diff --git a/sql/expression/function/concat_ws.go b/sql/expression/function/concat_ws.go
index 46b4dd2..7ceffc1 100644
--- a/sql/expression/function/concat_ws.go
+++ b/sql/expression/function/concat_ws.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // ConcatWithSeparator joins several strings together. The first argument is
diff --git a/sql/expression/function/connection_id.go b/sql/expression/function/connection_id.go
index 8fc6a65..a34ba02 100644
--- a/sql/expression/function/connection_id.go
+++ b/sql/expression/function/connection_id.go
@@ -1,6 +1,6 @@
 package function
 
-import "gopkg.in/src-d/go-mysql-server.v0/sql"
+import "github.com/src-d/go-mysql-server/sql"
 
 // ConnectionID returns the current connection id.
 type ConnectionID struct{}
diff --git a/sql/expression/function/database.go b/sql/expression/function/database.go
index 8e1d986..f9d6ac5 100644
--- a/sql/expression/function/database.go
+++ b/sql/expression/function/database.go
@@ -1,7 +1,7 @@
 package function
 
 import (
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // Database stands for DATABASE() function
diff --git a/sql/expression/function/date.go b/sql/expression/function/date.go
index fd1a997..cdca256 100644
--- a/sql/expression/function/date.go
+++ b/sql/expression/function/date.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 // DateAdd adds an interval to a date.
diff --git a/sql/expression/function/ifnull.go b/sql/expression/function/ifnull.go
index 95c10e3..f607da7 100644
--- a/sql/expression/function/ifnull.go
+++ b/sql/expression/function/ifnull.go
@@ -3,8 +3,8 @@ package function
 import (
 	"fmt"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 // IfNull function returns the specified value IF the expression is NULL, otherwise return the expression.
diff --git a/sql/expression/function/isbinary.go b/sql/expression/function/isbinary.go
index 09f6dd3..1500483 100644
--- a/sql/expression/function/isbinary.go
+++ b/sql/expression/function/isbinary.go
@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"fmt"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 // IsBinary is a function that returns whether a blob is binary or not.
diff --git a/sql/expression/function/json_extract.go b/sql/expression/function/json_extract.go
index 1b35c90..1dbdb75 100644
--- a/sql/expression/function/json_extract.go
+++ b/sql/expression/function/json_extract.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"github.com/oliveagle/jsonpath"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // JSONExtract extracts data from a json document using json paths.
diff --git a/sql/expression/function/length.go b/sql/expression/function/length.go
index c2f4105..5e3d7c8 100644
--- a/sql/expression/function/length.go
+++ b/sql/expression/function/length.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"unicode/utf8"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 // Length returns the length of a string or binary content, either in bytes
diff --git a/sql/expression/function/logarithm.go b/sql/expression/function/logarithm.go
index 18f74b1..61afc2d 100644
--- a/sql/expression/function/logarithm.go
+++ b/sql/expression/function/logarithm.go
@@ -6,8 +6,8 @@ import (
 	"reflect"
 
 	"gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 // ErrInvalidArgumentForLogarithm is returned when an invalid argument value is passed to a
diff --git a/sql/expression/function/lower_upper.go b/sql/expression/function/lower_upper.go
index 519509c..2c2b099 100644
--- a/sql/expression/function/lower_upper.go
+++ b/sql/expression/function/lower_upper.go
@@ -2,8 +2,8 @@ package function
 
 import (
 	"fmt"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 	"strings"
 )
 
diff --git a/sql/expression/function/nullif.go b/sql/expression/function/nullif.go
index 9307470..fc08b98 100644
--- a/sql/expression/function/nullif.go
+++ b/sql/expression/function/nullif.go
@@ -3,8 +3,8 @@ package function
 import (
 	"fmt"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 // NullIf function compares two expressions and returns NULL if they are equal. Otherwise, the first expression is returned.
diff --git a/sql/expression/function/registry.go b/sql/expression/function/registry.go
index 3760904..ffa93a3 100644
--- a/sql/expression/function/registry.go
+++ b/sql/expression/function/registry.go
@@ -3,8 +3,8 @@ package function
 import (
 	"math"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression/function/aggregation"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression/function/aggregation"
 )
 
 // Defaults is the function map with all the default functions.
diff --git a/sql/expression/function/reverse_repeat_replace.go b/sql/expression/function/reverse_repeat_replace.go
index 2bb9919..5ec196f 100644
--- a/sql/expression/function/reverse_repeat_replace.go
+++ b/sql/expression/function/reverse_repeat_replace.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
 	"gopkg.in/src-d/go-errors.v1"
 )
 
diff --git a/sql/expression/function/rpad_lpad.go b/sql/expression/function/rpad_lpad.go
index cc37eee..74c1d76 100644
--- a/sql/expression/function/rpad_lpad.go
+++ b/sql/expression/function/rpad_lpad.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 var ErrDivisionByZero = errors.NewKind("division by zero")
diff --git a/sql/expression/function/sleep.go b/sql/expression/function/sleep.go
index 61aa12f..c8119bc 100644
--- a/sql/expression/function/sleep.go
+++ b/sql/expression/function/sleep.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 // Sleep is a function that just waits for the specified number of seconds
diff --git a/sql/expression/function/soundex.go b/sql/expression/function/soundex.go
index fb95dda..1f33767 100644
--- a/sql/expression/function/soundex.go
+++ b/sql/expression/function/soundex.go
@@ -5,8 +5,8 @@ import (
 	"strings"
 	"unicode"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 // Soundex is a function that returns the soundex of a string. Two strings that
diff --git a/sql/expression/function/split.go b/sql/expression/function/split.go
index 0c9955b..57765c7 100644
--- a/sql/expression/function/split.go
+++ b/sql/expression/function/split.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"regexp"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 // Split receives a string and returns the parts of it splitted by a
diff --git a/sql/expression/function/sqrt_power.go b/sql/expression/function/sqrt_power.go
index 60061c2..c5bdf63 100644
--- a/sql/expression/function/sqrt_power.go
+++ b/sql/expression/function/sqrt_power.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"math"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // Sqrt is a function that returns the square value of the number provided.
diff --git a/sql/expression/function/substring.go b/sql/expression/function/substring.go
index f907f32..bc1337d 100644
--- a/sql/expression/function/substring.go
+++ b/sql/expression/function/substring.go
@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"strings"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // Substring is a function to return a part of a string.
diff --git a/sql/expression/function/time.go b/sql/expression/function/time.go
index 5e96f9d..345c5b9 100644
--- a/sql/expression/function/time.go
+++ b/sql/expression/function/time.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"time"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func getDate(ctx *sql.Context,
diff --git a/sql/expression/function/tobase64_frombase64.go b/sql/expression/function/tobase64_frombase64.go
index c6d484e..543d482 100644
--- a/sql/expression/function/tobase64_frombase64.go
+++ b/sql/expression/function/tobase64_frombase64.go
@@ -6,8 +6,8 @@ import (
 	"reflect"
 	"strings"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 // ToBase64 is a function to encode a string to the Base64 format
diff --git a/sql/expression/function/trim_ltrim_rtrim.go b/sql/expression/function/trim_ltrim_rtrim.go
index 9f3d310..9aacacb 100644
--- a/sql/expression/function/trim_ltrim_rtrim.go
+++ b/sql/expression/function/trim_ltrim_rtrim.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"unicode"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 type trimType rune
diff --git a/sql/expression/function/version.go b/sql/expression/function/version.go
index 2870d94..b100128 100644
--- a/sql/expression/function/version.go
+++ b/sql/expression/function/version.go
@@ -3,7 +3,7 @@ package function
 import (
 	"fmt"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 const mysqlVersion = "8.0.11"
diff --git a/sql/expression/get_field.go b/sql/expression/get_field.go
index 75690a5..cb8ac9a 100644
--- a/sql/expression/get_field.go
+++ b/sql/expression/get_field.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	errors "gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // GetField is an expression to get the field of a table.
diff --git a/sql/expression/interval.go b/sql/expression/interval.go
index 0053b83..6ec5cfa 100644
--- a/sql/expression/interval.go
+++ b/sql/expression/interval.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	errors "gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // Interval defines a time duration.
diff --git a/sql/expression/isnull.go b/sql/expression/isnull.go
index cf0c0c7..252b95f 100644
--- a/sql/expression/isnull.go
+++ b/sql/expression/isnull.go
@@ -1,6 +1,6 @@
 package expression
 
-import "gopkg.in/src-d/go-mysql-server.v0/sql"
+import "github.com/src-d/go-mysql-server/sql"
 
 // IsNull is an expression that checks if an expression is null.
 type IsNull struct {
diff --git a/sql/expression/like.go b/sql/expression/like.go
index 4049b4d..6c361b2 100644
--- a/sql/expression/like.go
+++ b/sql/expression/like.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"sync"
 
-	"gopkg.in/src-d/go-mysql-server.v0/internal/regex"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/internal/regex"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // Like performs pattern matching against two strings.
diff --git a/sql/expression/literal.go b/sql/expression/literal.go
index d263a79..cb41588 100644
--- a/sql/expression/literal.go
+++ b/sql/expression/literal.go
@@ -3,7 +3,7 @@ package expression
 import (
 	"fmt"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // Literal represents a literal expression (string, number, bool, ...).
diff --git a/sql/expression/logic.go b/sql/expression/logic.go
index 008de91..6551c79 100644
--- a/sql/expression/logic.go
+++ b/sql/expression/logic.go
@@ -3,7 +3,7 @@ package expression
 import (
 	"fmt"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // And checks whether two expressions are true.
diff --git a/sql/expression/star.go b/sql/expression/star.go
index 0fbd6d7..c2ce869 100644
--- a/sql/expression/star.go
+++ b/sql/expression/star.go
@@ -3,7 +3,7 @@ package expression
 import (
 	"fmt"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // Star represents the selection of all available fields.
diff --git a/sql/expression/tuple.go b/sql/expression/tuple.go
index 3f3dbaf..05af036 100644
--- a/sql/expression/tuple.go
+++ b/sql/expression/tuple.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // Tuple is a fixed-size collection of expressions.
diff --git a/sql/expression/unresolved.go b/sql/expression/unresolved.go
index 537ed09..276367c 100644
--- a/sql/expression/unresolved.go
+++ b/sql/expression/unresolved.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // UnresolvedColumn is an expression of a column that is not yet resolved.
diff --git a/sql/expression/walk.go b/sql/expression/walk.go
index 36debed..f040867 100644
--- a/sql/expression/walk.go
+++ b/sql/expression/walk.go
@@ -1,6 +1,6 @@
 package expression
 
-import "gopkg.in/src-d/go-mysql-server.v0/sql"
+import "github.com/src-d/go-mysql-server/sql"
 
 // Visitor visits exprs in the plan.
 type Visitor interface {
diff --git a/sql/functionregistry.go b/sql/functionregistry.go
index 04ece9d..b366ded 100644
--- a/sql/functionregistry.go
+++ b/sql/functionregistry.go
@@ -2,7 +2,7 @@ package sql
 
 import (
 	"gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/internal/similartext"
+	"github.com/src-d/go-mysql-server/internal/similartext"
 )
 
 // ErrFunctionAlreadyRegistered is thrown when a function is already registered
diff --git a/sql/index.go b/sql/index.go
index e7278ec..0cb33c5 100644
--- a/sql/index.go
+++ b/sql/index.go
@@ -1,7 +1,7 @@
 package sql
 
 import (
-	"gopkg.in/src-d/go-mysql-server.v0/internal/similartext"
+	"github.com/src-d/go-mysql-server/internal/similartext"
 	"io"
 	"strings"
 	"sync"
diff --git a/sql/index/pilosa/driver.go b/sql/index/pilosa/driver.go
index 48f19a2..7bf6212 100644
--- a/sql/index/pilosa/driver.go
+++ b/sql/index/pilosa/driver.go
@@ -20,8 +20,8 @@ import (
 	"github.com/pilosa/pilosa/syswrap"
 	"github.com/sirupsen/logrus"
 	errors "gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/index"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/index"
 )
 
 const (
diff --git a/sql/index/pilosa/index.go b/sql/index/pilosa/index.go
index 55e8982..54d0c1f 100644
--- a/sql/index/pilosa/index.go
+++ b/sql/index/pilosa/index.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/pilosa/pilosa"
 	errors "gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/index"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/index"
 )
 
 // concurrentPilosaIndex is a wrapper of pilosa.Index that can be opened and closed
diff --git a/sql/index/pilosa/lookup.go b/sql/index/pilosa/lookup.go
index 27a8cef..8c6daf8 100644
--- a/sql/index/pilosa/lookup.go
+++ b/sql/index/pilosa/lookup.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/pilosa/pilosa"
 	errors "gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 var (
diff --git a/sql/index/pilosa/mapping.go b/sql/index/pilosa/mapping.go
index 7f6fa3d..949d499 100644
--- a/sql/index/pilosa/mapping.go
+++ b/sql/index/pilosa/mapping.go
@@ -10,7 +10,7 @@ import (
 	"sync"
 
 	bolt "go.etcd.io/bbolt"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // mapping
diff --git a/sql/information_schema.go b/sql/information_schema.go
index fb17bf9..0a30478 100644
--- a/sql/information_schema.go
+++ b/sql/information_schema.go
@@ -1,4 +1,4 @@
-package sql // import "gopkg.in/src-d/go-mysql-server.v0/sql"
+package sql // import "github.com/src-d/go-mysql-server/sql"
 
 import (
 	"bytes"
diff --git a/sql/parse/describe.go b/sql/parse/describe.go
index d35cb0a..5fd0d4e 100644
--- a/sql/parse/describe.go
+++ b/sql/parse/describe.go
@@ -5,8 +5,8 @@ import (
 	"strings"
 
 	errors "gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 var (
diff --git a/sql/parse/indexes.go b/sql/parse/indexes.go
index 70b6b2d..4a0ac4e 100644
--- a/sql/parse/indexes.go
+++ b/sql/parse/indexes.go
@@ -7,9 +7,9 @@ import (
 	"strings"
 	"unicode"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/sql/plan"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func parseShowIndex(s string) (sql.Node, error) {
diff --git a/sql/parse/lock.go b/sql/parse/lock.go
index 065c56c..b4d6d67 100644
--- a/sql/parse/lock.go
+++ b/sql/parse/lock.go
@@ -5,8 +5,8 @@ import (
 	"io"
 	"strings"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 func parseLockTables(ctx *sql.Context, query string) (sql.Node, error) {
diff --git a/sql/parse/parse.go b/sql/parse/parse.go
index 722a4c5..195559d 100644
--- a/sql/parse/parse.go
+++ b/sql/parse/parse.go
@@ -1,4 +1,4 @@
-package parse // import "gopkg.in/src-d/go-mysql-server.v0/sql/parse"
+package parse // import "github.com/src-d/go-mysql-server/sql/parse"
 
 import (
 	"bufio"
@@ -11,10 +11,10 @@ import (
 
 	opentracing "github.com/opentracing/opentracing-go"
 	"gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression/function"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/expression/function"
+	"github.com/src-d/go-mysql-server/sql/plan"
 	"gopkg.in/src-d/go-vitess.v1/vt/sqlparser"
 )
 
diff --git a/sql/parse/show_create.go b/sql/parse/show_create.go
index 09bb7d3..3b96480 100644
--- a/sql/parse/show_create.go
+++ b/sql/parse/show_create.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 
 	"gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 var errUnsupportedShowCreateQuery = errors.NewKind("Unsupported query: SHOW CREATE %s")
diff --git a/sql/parse/util.go b/sql/parse/util.go
index e76de37..4db2b6a 100644
--- a/sql/parse/util.go
+++ b/sql/parse/util.go
@@ -10,7 +10,7 @@ import (
 	"unicode"
 
 	errors "gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 	"gopkg.in/src-d/go-vitess.v1/vt/sqlparser"
 )
 
diff --git a/sql/parse/variables.go b/sql/parse/variables.go
index c92b535..df48443 100644
--- a/sql/parse/variables.go
+++ b/sql/parse/variables.go
@@ -4,8 +4,8 @@ import (
 	"bufio"
 	"strings"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 func parseShowVariables(ctx *sql.Context, s string) (sql.Node, error) {
diff --git a/sql/parse/warnings.go b/sql/parse/warnings.go
index 10a01c3..4e0a160 100644
--- a/sql/parse/warnings.go
+++ b/sql/parse/warnings.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 
 	errors "gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 var errInvalidIndex = errors.NewKind("invalid %s index %d (index must be non-negative)")
diff --git a/sql/plan/common.go b/sql/plan/common.go
index d089e20..061a9f1 100644
--- a/sql/plan/common.go
+++ b/sql/plan/common.go
@@ -1,6 +1,6 @@
-package plan // import "gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+package plan // import "github.com/src-d/go-mysql-server/sql/plan"
 
-import "gopkg.in/src-d/go-mysql-server.v0/sql"
+import "github.com/src-d/go-mysql-server/sql"
 
 // IsUnary returns whether the node is unary or not.
 func IsUnary(node sql.Node) bool {
diff --git a/sql/plan/create_index.go b/sql/plan/create_index.go
index b1d7a96..ce170bb 100644
--- a/sql/plan/create_index.go
+++ b/sql/plan/create_index.go
@@ -9,8 +9,8 @@ import (
 	otlog "github.com/opentracing/opentracing-go/log"
 	"github.com/sirupsen/logrus"
 	errors "gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 var (
diff --git a/sql/plan/cross_join.go b/sql/plan/cross_join.go
index d74fa8e..6943719 100644
--- a/sql/plan/cross_join.go
+++ b/sql/plan/cross_join.go
@@ -5,7 +5,7 @@ import (
 	"reflect"
 
 	opentracing "github.com/opentracing/opentracing-go"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // CrossJoin is a cross join between two tables.
diff --git a/sql/plan/ddl.go b/sql/plan/ddl.go
index d097aa9..b92075e 100644
--- a/sql/plan/ddl.go
+++ b/sql/plan/ddl.go
@@ -2,7 +2,7 @@ package plan
 
 import (
 	"gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // ErrCreateTable is thrown when the database doesn't support table creation
diff --git a/sql/plan/describe.go b/sql/plan/describe.go
index 110cfb1..aed8aea 100644
--- a/sql/plan/describe.go
+++ b/sql/plan/describe.go
@@ -4,7 +4,7 @@ import (
 	"io"
 	"strings"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // Describe is a node that describes its children.
diff --git a/sql/plan/distinct.go b/sql/plan/distinct.go
index 345d6c9..556c137 100644
--- a/sql/plan/distinct.go
+++ b/sql/plan/distinct.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/mitchellh/hashstructure"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // Distinct is a node that ensures all rows that come from it are unique.
diff --git a/sql/plan/drop_index.go b/sql/plan/drop_index.go
index fda16ec..e6917ec 100644
--- a/sql/plan/drop_index.go
+++ b/sql/plan/drop_index.go
@@ -2,8 +2,8 @@ package plan
 
 import (
 	"gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/internal/similartext"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/internal/similartext"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 var (
diff --git a/sql/plan/empty_table.go b/sql/plan/empty_table.go
index e2c9aa9..9a10ebe 100644
--- a/sql/plan/empty_table.go
+++ b/sql/plan/empty_table.go
@@ -1,6 +1,6 @@
 package plan
 
-import "gopkg.in/src-d/go-mysql-server.v0/sql"
+import "github.com/src-d/go-mysql-server/sql"
 
 // EmptyTable is a node representing an empty table.
 var EmptyTable = new(emptyTable)
diff --git a/sql/plan/exchange.go b/sql/plan/exchange.go
index b43f767..18c7ac0 100644
--- a/sql/plan/exchange.go
+++ b/sql/plan/exchange.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 
 	errors "gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // ErrNoPartitionable is returned when no Partitionable node is found
diff --git a/sql/plan/filter.go b/sql/plan/filter.go
index ad3bae2..ac2a477 100644
--- a/sql/plan/filter.go
+++ b/sql/plan/filter.go
@@ -1,7 +1,7 @@
 package plan
 
 import (
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // Filter skips rows that don't match a certain expression.
diff --git a/sql/plan/group_by.go b/sql/plan/group_by.go
index 9503678..a61b920 100644
--- a/sql/plan/group_by.go
+++ b/sql/plan/group_by.go
@@ -8,8 +8,8 @@ import (
 
 	opentracing "github.com/opentracing/opentracing-go"
 	errors "gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 // ErrGroupBy is returned when the aggregation is not supported.
diff --git a/sql/plan/having.go b/sql/plan/having.go
index 14f966f..4a7f81b 100644
--- a/sql/plan/having.go
+++ b/sql/plan/having.go
@@ -1,6 +1,6 @@
 package plan
 
-import "gopkg.in/src-d/go-mysql-server.v0/sql"
+import "github.com/src-d/go-mysql-server/sql"
 
 // Having node is a filter that supports aggregate expressions. A having node
 // is identical to a filter node in behaviour. The difference is that some
diff --git a/sql/plan/insert.go b/sql/plan/insert.go
index 5df3f7b..ebd6482 100644
--- a/sql/plan/insert.go
+++ b/sql/plan/insert.go
@@ -5,8 +5,8 @@ import (
 	"strings"
 
 	"gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 // ErrInsertIntoNotSupported is thrown when a table doesn't support inserts
diff --git a/sql/plan/join.go b/sql/plan/join.go
index 348296b..62d9dea 100644
--- a/sql/plan/join.go
+++ b/sql/plan/join.go
@@ -11,7 +11,7 @@ import (
 	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/pbnjay/memory"
 	"github.com/sirupsen/logrus"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 const (
diff --git a/sql/plan/limit.go b/sql/plan/limit.go
index b2831ef..004b750 100644
--- a/sql/plan/limit.go
+++ b/sql/plan/limit.go
@@ -4,7 +4,7 @@ import (
 	"io"
 
 	opentracing "github.com/opentracing/opentracing-go"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 var _ sql.Node = &Limit{}
diff --git a/sql/plan/lock.go b/sql/plan/lock.go
index 21aebe9..d7582c9 100644
--- a/sql/plan/lock.go
+++ b/sql/plan/lock.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	errors "gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // TableLock is a read or write lock on a table.
diff --git a/sql/plan/naturaljoin.go b/sql/plan/naturaljoin.go
index 5a1a931..fe8ec7a 100644
--- a/sql/plan/naturaljoin.go
+++ b/sql/plan/naturaljoin.go
@@ -1,6 +1,6 @@
 package plan
 
-import "gopkg.in/src-d/go-mysql-server.v0/sql"
+import "github.com/src-d/go-mysql-server/sql"
 
 // NaturalJoin is a join that automatically joins by all the columns with the
 // same name.
diff --git a/sql/plan/nothing.go b/sql/plan/nothing.go
index aab307d..70d12c7 100644
--- a/sql/plan/nothing.go
+++ b/sql/plan/nothing.go
@@ -1,6 +1,6 @@
 package plan
 
-import "gopkg.in/src-d/go-mysql-server.v0/sql"
+import "github.com/src-d/go-mysql-server/sql"
 
 // Nothing is a node that will return no rows.
 var Nothing nothing
diff --git a/sql/plan/offset.go b/sql/plan/offset.go
index a023572..da481b7 100644
--- a/sql/plan/offset.go
+++ b/sql/plan/offset.go
@@ -2,7 +2,7 @@ package plan
 
 import (
 	opentracing "github.com/opentracing/opentracing-go"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // Offset is a node that skips the first N rows.
diff --git a/sql/plan/process.go b/sql/plan/process.go
index fe5c87e..e565e42 100644
--- a/sql/plan/process.go
+++ b/sql/plan/process.go
@@ -3,7 +3,7 @@ package plan
 import (
 	"io"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // QueryProcess represents a running query process node. It will use a callback
diff --git a/sql/plan/processlist.go b/sql/plan/processlist.go
index 182cf33..8a362a6 100644
--- a/sql/plan/processlist.go
+++ b/sql/plan/processlist.go
@@ -5,7 +5,7 @@ import (
 	"sort"
 	"strings"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 type process struct {
diff --git a/sql/plan/project.go b/sql/plan/project.go
index 0e49315..99779e8 100644
--- a/sql/plan/project.go
+++ b/sql/plan/project.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 
 	opentracing "github.com/opentracing/opentracing-go"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // Project is a projection of certain expression from the children node.
diff --git a/sql/plan/resolved_table.go b/sql/plan/resolved_table.go
index bf3e102..2706739 100644
--- a/sql/plan/resolved_table.go
+++ b/sql/plan/resolved_table.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"io"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // ResolvedTable represents a resolved SQL Table.
diff --git a/sql/plan/set.go b/sql/plan/set.go
index 509c672..0bc2047 100644
--- a/sql/plan/set.go
+++ b/sql/plan/set.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 	"gopkg.in/src-d/go-vitess.v1/vt/sqlparser"
 )
 
diff --git a/sql/plan/show_collation.go b/sql/plan/show_collation.go
index 35b63fe..4b01feb 100644
--- a/sql/plan/show_collation.go
+++ b/sql/plan/show_collation.go
@@ -1,6 +1,6 @@
 package plan
 
-import "gopkg.in/src-d/go-mysql-server.v0/sql"
+import "github.com/src-d/go-mysql-server/sql"
 
 // ShowCollation shows all available collations.
 type ShowCollation struct{}
diff --git a/sql/plan/show_create_database.go b/sql/plan/show_create_database.go
index 477aa13..57ca976 100644
--- a/sql/plan/show_create_database.go
+++ b/sql/plan/show_create_database.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"fmt"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // ShowCreateDatabase returns the SQL for creating a database.
diff --git a/sql/plan/show_create_table.go b/sql/plan/show_create_table.go
index 70d8efa..89c27f6 100644
--- a/sql/plan/show_create_table.go
+++ b/sql/plan/show_create_table.go
@@ -5,9 +5,9 @@ import (
 	"io"
 	"strings"
 
-	"gopkg.in/src-d/go-mysql-server.v0/internal/similartext"
+	"github.com/src-d/go-mysql-server/internal/similartext"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // ShowCreateTable is a node that shows the CREATE TABLE statement for a table.
diff --git a/sql/plan/show_indexes.go b/sql/plan/show_indexes.go
index 1bf9dd4..b28a4cb 100644
--- a/sql/plan/show_indexes.go
+++ b/sql/plan/show_indexes.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"io"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // ShowIndexes is a node that shows the indexes on a table.
diff --git a/sql/plan/show_tables.go b/sql/plan/show_tables.go
index 984c1e1..7d44f73 100644
--- a/sql/plan/show_tables.go
+++ b/sql/plan/show_tables.go
@@ -3,7 +3,7 @@ package plan
 import (
 	"sort"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // ShowTables is a node that shows the database tables.
diff --git a/sql/plan/showcolumns.go b/sql/plan/showcolumns.go
index 364e527..88a6a63 100644
--- a/sql/plan/showcolumns.go
+++ b/sql/plan/showcolumns.go
@@ -3,7 +3,7 @@ package plan
 import (
 	"fmt"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // ShowColumns shows the columns details of a table.
diff --git a/sql/plan/showdatabases.go b/sql/plan/showdatabases.go
index 309e9ca..f370d7e 100644
--- a/sql/plan/showdatabases.go
+++ b/sql/plan/showdatabases.go
@@ -4,7 +4,7 @@ import (
 	"sort"
 	"strings"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // ShowDatabases is a node that shows the databases.
diff --git a/sql/plan/showtablestatus.go b/sql/plan/showtablestatus.go
index 604bc6b..b30bf91 100644
--- a/sql/plan/showtablestatus.go
+++ b/sql/plan/showtablestatus.go
@@ -5,7 +5,7 @@ import (
 	"sort"
 	"strings"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // ShowTableStatus returns the status of the tables in the databases.
diff --git a/sql/plan/showvariables.go b/sql/plan/showvariables.go
index 151fa53..7c4648d 100644
--- a/sql/plan/showvariables.go
+++ b/sql/plan/showvariables.go
@@ -3,8 +3,8 @@ package plan
 import (
 	"fmt"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 // ShowVariables is a node that shows the global and session variables
diff --git a/sql/plan/showwarnings.go b/sql/plan/showwarnings.go
index 388c46e..5de5fb1 100644
--- a/sql/plan/showwarnings.go
+++ b/sql/plan/showwarnings.go
@@ -1,7 +1,7 @@
 package plan
 
 import (
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // ShowWarnings is a node that shows the session warnings
diff --git a/sql/plan/sort.go b/sql/plan/sort.go
index 3fd70d5..d6836ba 100644
--- a/sql/plan/sort.go
+++ b/sql/plan/sort.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // ErrUnableSort is thrown when something happens on sorting
diff --git a/sql/plan/subqueryalias.go b/sql/plan/subqueryalias.go
index 47c42c1..70233a0 100644
--- a/sql/plan/subqueryalias.go
+++ b/sql/plan/subqueryalias.go
@@ -1,7 +1,7 @@
 package plan
 
 import (
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // SubqueryAlias is a node that gives a subquery a name.
diff --git a/sql/plan/tablealias.go b/sql/plan/tablealias.go
index aa68d2d..02795b1 100644
--- a/sql/plan/tablealias.go
+++ b/sql/plan/tablealias.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 
 	opentracing "github.com/opentracing/opentracing-go"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // TableAlias is a node that acts as a table with a given name.
diff --git a/sql/plan/transaction.go b/sql/plan/transaction.go
index 9e84cca..6565cff 100644
--- a/sql/plan/transaction.go
+++ b/sql/plan/transaction.go
@@ -1,6 +1,6 @@
 package plan
 
-import "gopkg.in/src-d/go-mysql-server.v0/sql"
+import "github.com/src-d/go-mysql-server/sql"
 
 // Rollback undoes the changes performed in a transaction.
 type Rollback struct{}
diff --git a/sql/plan/unresolved.go b/sql/plan/unresolved.go
index 11709fb..8416080 100644
--- a/sql/plan/unresolved.go
+++ b/sql/plan/unresolved.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	errors "gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // ErrUnresolvedTable is thrown when a table cannot be resolved
diff --git a/sql/plan/use.go b/sql/plan/use.go
index 89553a5..fb721f8 100644
--- a/sql/plan/use.go
+++ b/sql/plan/use.go
@@ -3,7 +3,7 @@ package plan
 import (
 	"fmt"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // Use changes the current database.
diff --git a/sql/plan/values.go b/sql/plan/values.go
index 65e06e7..d07eb5b 100644
--- a/sql/plan/values.go
+++ b/sql/plan/values.go
@@ -3,7 +3,7 @@ package plan
 import (
 	"fmt"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 // Values represents a set of tuples of expressions.
diff --git a/sql/plan/walk.go b/sql/plan/walk.go
index f76ae14..6e43524 100644
--- a/sql/plan/walk.go
+++ b/sql/plan/walk.go
@@ -1,8 +1,8 @@
 package plan
 
 import (
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 // Visitor visits nodes in the plan.


Test patch:
diff --git a/auth/audit_test.go b/auth/audit_test.go
index a41ee1d..9ba3a4d 100644
--- a/auth/audit_test.go
+++ b/auth/audit_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
-	"gopkg.in/src-d/go-mysql-server.v0/auth"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/auth"
+	"github.com/src-d/go-mysql-server/sql"
 
 	"github.com/sanity-io/litter"
 	"github.com/sirupsen/logrus"
diff --git a/auth/common_test.go b/auth/common_test.go
index d9e784c..7b68f15 100644
--- a/auth/common_test.go
+++ b/auth/common_test.go
@@ -9,13 +9,13 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	sqle "gopkg.in/src-d/go-mysql-server.v0"
-	"gopkg.in/src-d/go-mysql-server.v0/auth"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/server"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/analyzer"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/index/pilosa"
+	sqle "github.com/src-d/go-mysql-server"
+	"github.com/src-d/go-mysql-server/auth"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/server"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/analyzer"
+	"github.com/src-d/go-mysql-server/sql/index/pilosa"
 )
 
 const port = 3336
diff --git a/auth/native_test.go b/auth/native_test.go
index 9b16f40..9d1baab 100644
--- a/auth/native_test.go
+++ b/auth/native_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"gopkg.in/src-d/go-mysql-server.v0/auth"
+	"github.com/src-d/go-mysql-server/auth"
 
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/stretchr/testify/require"
diff --git a/auth/none_test.go b/auth/none_test.go
index abeb4a5..6ea99c3 100644
--- a/auth/none_test.go
+++ b/auth/none_test.go
@@ -3,7 +3,7 @@ package auth_test
 import (
 	"testing"
 
-	"gopkg.in/src-d/go-mysql-server.v0/auth"
+	"github.com/src-d/go-mysql-server/auth"
 )
 
 func TestNoneAuthentication(t *testing.T) {
diff --git a/benchmark/tpc_h_test.go b/benchmark/tpc_h_test.go
index 63d3cb7..3afc448 100644
--- a/benchmark/tpc_h_test.go
+++ b/benchmark/tpc_h_test.go
@@ -10,10 +10,10 @@ import (
 	"path/filepath"
 	"testing"
 
-	"gopkg.in/src-d/go-mysql-server.v0"
+	"github.com/src-d/go-mysql-server"
 
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 var scriptsPath = "../_scripts/tpc-h/"
diff --git a/engine_test.go b/engine_test.go
index 541425e..e7cc828 100644
--- a/engine_test.go
+++ b/engine_test.go
@@ -11,15 +11,15 @@ import (
 	"testing"
 	"time"
 
-	sqle "gopkg.in/src-d/go-mysql-server.v0"
-	"gopkg.in/src-d/go-mysql-server.v0/auth"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/analyzer"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/index/pilosa"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/parse"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
-	"gopkg.in/src-d/go-mysql-server.v0/test"
+	sqle "github.com/src-d/go-mysql-server"
+	"github.com/src-d/go-mysql-server/auth"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/analyzer"
+	"github.com/src-d/go-mysql-server/sql/index/pilosa"
+	"github.com/src-d/go-mysql-server/sql/parse"
+	"github.com/src-d/go-mysql-server/sql/plan"
+	"github.com/src-d/go-mysql-server/test"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/example_test.go b/example_test.go
index ec76535..a5e8772 100644
--- a/example_test.go
+++ b/example_test.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"io"
 
-	"gopkg.in/src-d/go-mysql-server.v0"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func Example() {
diff --git a/mem/database_test.go b/mem/database_test.go
index dcaf0cc..6266921 100644
--- a/mem/database_test.go
+++ b/mem/database_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func TestDatabase_Name(t *testing.T) {
diff --git a/mem/table_test.go b/mem/table_test.go
index 9871a68..8257615 100644
--- a/mem/table_test.go
+++ b/mem/table_test.go
@@ -6,8 +6,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestTablePartitionsCount(t *testing.T) {
diff --git a/server/handler_test.go b/server/handler_test.go
index f9bfefb..61b0eee 100644
--- a/server/handler_test.go
+++ b/server/handler_test.go
@@ -7,9 +7,9 @@ import (
 	"testing"
 	"unsafe"
 
-	sqle "gopkg.in/src-d/go-mysql-server.v0"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	sqle "github.com/src-d/go-mysql-server"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
 	"gopkg.in/src-d/go-vitess.v1/mysql"
 	"gopkg.in/src-d/go-vitess.v1/sqltypes"
 	"gopkg.in/src-d/go-vitess.v1/vt/proto/query"
diff --git a/sql/analyzer/aggregations_test.go b/sql/analyzer/aggregations_test.go
index c6a0104..0b64ff1 100644
--- a/sql/analyzer/aggregations_test.go
+++ b/sql/analyzer/aggregations_test.go
@@ -4,11 +4,11 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression/function/aggregation"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/expression/function/aggregation"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 func TestReorderAggregations(t *testing.T) {
diff --git a/sql/analyzer/analyzer_test.go b/sql/analyzer/analyzer_test.go
index 335ce19..355b211 100644
--- a/sql/analyzer/analyzer_test.go
+++ b/sql/analyzer/analyzer_test.go
@@ -5,10 +5,10 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 func TestAnalyzer_Analyze(t *testing.T) {
diff --git a/sql/analyzer/assign_catalog_test.go b/sql/analyzer/assign_catalog_test.go
index 67377bf..45d2b1b 100644
--- a/sql/analyzer/assign_catalog_test.go
+++ b/sql/analyzer/assign_catalog_test.go
@@ -4,9 +4,9 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 func TestAssignCatalog(t *testing.T) {
diff --git a/sql/analyzer/assign_indexes_test.go b/sql/analyzer/assign_indexes_test.go
index ac70056..a50bd1c 100644
--- a/sql/analyzer/assign_indexes_test.go
+++ b/sql/analyzer/assign_indexes_test.go
@@ -6,10 +6,10 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 func TestNegateIndex(t *testing.T) {
diff --git a/sql/analyzer/common_test.go b/sql/analyzer/common_test.go
index d21c972..a5beb26 100644
--- a/sql/analyzer/common_test.go
+++ b/sql/analyzer/common_test.go
@@ -1,8 +1,8 @@
 package analyzer
 
 import (
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func not(e sql.Expression) sql.Expression {
diff --git a/sql/analyzer/convert_dates_test.go b/sql/analyzer/convert_dates_test.go
index defcbde..82cac24 100644
--- a/sql/analyzer/convert_dates_test.go
+++ b/sql/analyzer/convert_dates_test.go
@@ -4,12 +4,12 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression/function"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression/function/aggregation"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/expression/function"
+	"github.com/src-d/go-mysql-server/sql/expression/function/aggregation"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 func TestConvertDates(t *testing.T) {
diff --git a/sql/analyzer/filters_test.go b/sql/analyzer/filters_test.go
index 0e171ad..1153c2d 100644
--- a/sql/analyzer/filters_test.go
+++ b/sql/analyzer/filters_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestFiltersMerge(t *testing.T) {
diff --git a/sql/analyzer/optimization_rules_test.go b/sql/analyzer/optimization_rules_test.go
index 6e0d5c1..2ac9efc 100644
--- a/sql/analyzer/optimization_rules_test.go
+++ b/sql/analyzer/optimization_rules_test.go
@@ -4,10 +4,10 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 func TestReorderProjection(t *testing.T) {
diff --git a/sql/analyzer/parallelize_test.go b/sql/analyzer/parallelize_test.go
index 8cbeb1d..7af884a 100644
--- a/sql/analyzer/parallelize_test.go
+++ b/sql/analyzer/parallelize_test.go
@@ -4,10 +4,10 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 func TestParallelize(t *testing.T) {
diff --git a/sql/analyzer/process_test.go b/sql/analyzer/process_test.go
index 0c20074..0d9b25b 100644
--- a/sql/analyzer/process_test.go
+++ b/sql/analyzer/process_test.go
@@ -6,10 +6,10 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 func TestTrackProcess(t *testing.T) {
diff --git a/sql/analyzer/prune_columns_test.go b/sql/analyzer/prune_columns_test.go
index fb98bb2..848a476 100644
--- a/sql/analyzer/prune_columns_test.go
+++ b/sql/analyzer/prune_columns_test.go
@@ -4,10 +4,10 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 func TestPruneColumns(t *testing.T) {
diff --git a/sql/analyzer/pushdown_test.go b/sql/analyzer/pushdown_test.go
index ba2ffa8..b30a546 100644
--- a/sql/analyzer/pushdown_test.go
+++ b/sql/analyzer/pushdown_test.go
@@ -4,10 +4,10 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 func TestPushdownProjectionAndFilters(t *testing.T) {
diff --git a/sql/analyzer/resolve_columns_test.go b/sql/analyzer/resolve_columns_test.go
index a465443..c114ded 100644
--- a/sql/analyzer/resolve_columns_test.go
+++ b/sql/analyzer/resolve_columns_test.go
@@ -5,10 +5,10 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 func TestQualifyColumnsProject(t *testing.T) {
diff --git a/sql/analyzer/resolve_having_test.go b/sql/analyzer/resolve_having_test.go
index a349da8..6d279d6 100644
--- a/sql/analyzer/resolve_having_test.go
+++ b/sql/analyzer/resolve_having_test.go
@@ -4,11 +4,11 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression/function/aggregation"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/expression/function/aggregation"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 func TestResolveHaving(t *testing.T) {
diff --git a/sql/analyzer/resolve_natural_joins_test.go b/sql/analyzer/resolve_natural_joins_test.go
index 1698565..1c1a41f 100644
--- a/sql/analyzer/resolve_natural_joins_test.go
+++ b/sql/analyzer/resolve_natural_joins_test.go
@@ -4,10 +4,10 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 func TestResolveNaturalJoins(t *testing.T) {
diff --git a/sql/analyzer/resolve_orderby_test.go b/sql/analyzer/resolve_orderby_test.go
index 29186c4..680df95 100644
--- a/sql/analyzer/resolve_orderby_test.go
+++ b/sql/analyzer/resolve_orderby_test.go
@@ -4,10 +4,10 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 func TestResolveOrderBy(t *testing.T) {
diff --git a/sql/analyzer/resolve_stars_test.go b/sql/analyzer/resolve_stars_test.go
index 691f544..4816bf2 100644
--- a/sql/analyzer/resolve_stars_test.go
+++ b/sql/analyzer/resolve_stars_test.go
@@ -4,10 +4,10 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 func TestResolveStar(t *testing.T) {
diff --git a/sql/analyzer/resolve_subqueries_test.go b/sql/analyzer/resolve_subqueries_test.go
index ec05cc8..e418e93 100644
--- a/sql/analyzer/resolve_subqueries_test.go
+++ b/sql/analyzer/resolve_subqueries_test.go
@@ -4,10 +4,10 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 func TestResolveSubqueries(t *testing.T) {
diff --git a/sql/analyzer/resolve_tables_test.go b/sql/analyzer/resolve_tables_test.go
index 86bc68d..cb984af 100644
--- a/sql/analyzer/resolve_tables_test.go
+++ b/sql/analyzer/resolve_tables_test.go
@@ -4,10 +4,10 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 func TestResolveTables(t *testing.T) {
diff --git a/sql/analyzer/validation_rules_test.go b/sql/analyzer/validation_rules_test.go
index b1fa359..2d915de 100644
--- a/sql/analyzer/validation_rules_test.go
+++ b/sql/analyzer/validation_rules_test.go
@@ -3,12 +3,12 @@ package analyzer
 import (
 	"testing"
 
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression/function"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression/function/aggregation"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/expression/function"
+	"github.com/src-d/go-mysql-server/sql/expression/function/aggregation"
+	"github.com/src-d/go-mysql-server/sql/plan"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/sql/catalog_test.go b/sql/catalog_test.go
index 7072131..87af266 100644
--- a/sql/catalog_test.go
+++ b/sql/catalog_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func TestCatalogCurrentDatabase(t *testing.T) {
diff --git a/sql/expression/arithmetic_test.go b/sql/expression/arithmetic_test.go
index 44b1e75..afb97c9 100644
--- a/sql/expression/arithmetic_test.go
+++ b/sql/expression/arithmetic_test.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func TestPlus(t *testing.T) {
diff --git a/sql/expression/between_test.go b/sql/expression/between_test.go
index eb0ced0..34cce2a 100644
--- a/sql/expression/between_test.go
+++ b/sql/expression/between_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func TestBetween(t *testing.T) {
diff --git a/sql/expression/boolean_test.go b/sql/expression/boolean_test.go
index d9ece9c..dd98f49 100644
--- a/sql/expression/boolean_test.go
+++ b/sql/expression/boolean_test.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func TestNot(t *testing.T) {
diff --git a/sql/expression/case_test.go b/sql/expression/case_test.go
index 3168bd8..6319db2 100644
--- a/sql/expression/case_test.go
+++ b/sql/expression/case_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func TestCase(t *testing.T) {
diff --git a/sql/expression/common_test.go b/sql/expression/common_test.go
index 571008c..a406a4c 100644
--- a/sql/expression/common_test.go
+++ b/sql/expression/common_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func eval(t *testing.T, e sql.Expression, row sql.Row) interface{} {
diff --git a/sql/expression/comparison_test.go b/sql/expression/comparison_test.go
index 20129e8..af2c0b9 100644
--- a/sql/expression/comparison_test.go
+++ b/sql/expression/comparison_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	errors "gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/internal/regex"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/internal/regex"
+	"github.com/src-d/go-mysql-server/sql"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/sql/expression/convert_test.go b/sql/expression/convert_test.go
index 45f12d7..b2eab45 100644
--- a/sql/expression/convert_test.go
+++ b/sql/expression/convert_test.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func TestConvert(t *testing.T) {
diff --git a/sql/expression/function/aggregation/avg_test.go b/sql/expression/function/aggregation/avg_test.go
index b77cb6a..491b56b 100644
--- a/sql/expression/function/aggregation/avg_test.go
+++ b/sql/expression/function/aggregation/avg_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestAvg_String(t *testing.T) {
diff --git a/sql/expression/function/aggregation/common_test.go b/sql/expression/function/aggregation/common_test.go
index 5e22bc3..b98e4b7 100644
--- a/sql/expression/function/aggregation/common_test.go
+++ b/sql/expression/function/aggregation/common_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func eval(t *testing.T, e sql.Expression, row sql.Row) interface{} {
diff --git a/sql/expression/function/aggregation/count_test.go b/sql/expression/function/aggregation/count_test.go
index b1e4100..316d931 100644
--- a/sql/expression/function/aggregation/count_test.go
+++ b/sql/expression/function/aggregation/count_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestCount_String(t *testing.T) {
diff --git a/sql/expression/function/aggregation/max_test.go b/sql/expression/function/aggregation/max_test.go
index 8f467bc..2f40594 100644
--- a/sql/expression/function/aggregation/max_test.go
+++ b/sql/expression/function/aggregation/max_test.go
@@ -5,8 +5,8 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestMax_String(t *testing.T) {
diff --git a/sql/expression/function/aggregation/min_test.go b/sql/expression/function/aggregation/min_test.go
index c5090aa..d76662a 100644
--- a/sql/expression/function/aggregation/min_test.go
+++ b/sql/expression/function/aggregation/min_test.go
@@ -5,8 +5,8 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestMin_Name(t *testing.T) {
diff --git a/sql/expression/function/aggregation/sum_test.go b/sql/expression/function/aggregation/sum_test.go
index f5d6897..e749f13 100644
--- a/sql/expression/function/aggregation/sum_test.go
+++ b/sql/expression/function/aggregation/sum_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestSum(t *testing.T) {
diff --git a/sql/expression/function/arraylength_test.go b/sql/expression/function/arraylength_test.go
index 034b6af..410f386 100644
--- a/sql/expression/function/arraylength_test.go
+++ b/sql/expression/function/arraylength_test.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 	errors "gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestArrayLength(t *testing.T) {
diff --git a/sql/expression/function/ceil_round_floor_test.go b/sql/expression/function/ceil_round_floor_test.go
index d221b59..9c3abd1 100644
--- a/sql/expression/function/ceil_round_floor_test.go
+++ b/sql/expression/function/ceil_round_floor_test.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 	"gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestCeil(t *testing.T) {
diff --git a/sql/expression/function/coalesce_test.go b/sql/expression/function/coalesce_test.go
index b2c8123..6f6faf3 100644
--- a/sql/expression/function/coalesce_test.go
+++ b/sql/expression/function/coalesce_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestEmptyCoalesce(t *testing.T) {
diff --git a/sql/expression/function/common_test.go b/sql/expression/function/common_test.go
index 2d86f8c..61c2564 100644
--- a/sql/expression/function/common_test.go
+++ b/sql/expression/function/common_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func eval(t *testing.T, e sql.Expression, row sql.Row) interface{} {
diff --git a/sql/expression/function/concat_test.go b/sql/expression/function/concat_test.go
index dccadab..7fb5e6f 100644
--- a/sql/expression/function/concat_test.go
+++ b/sql/expression/function/concat_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestConcat(t *testing.T) {
diff --git a/sql/expression/function/concat_ws_test.go b/sql/expression/function/concat_ws_test.go
index abeb5b7..80367f4 100644
--- a/sql/expression/function/concat_ws_test.go
+++ b/sql/expression/function/concat_ws_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestConcatWithSeparator(t *testing.T) {
diff --git a/sql/expression/function/connection_id_test.go b/sql/expression/function/connection_id_test.go
index 29cb8a2..ffd20ce 100644
--- a/sql/expression/function/connection_id_test.go
+++ b/sql/expression/function/connection_id_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func TestConnectionID(t *testing.T) {
diff --git a/sql/expression/function/date_test.go b/sql/expression/function/date_test.go
index bc1ca61..85940ee 100644
--- a/sql/expression/function/date_test.go
+++ b/sql/expression/function/date_test.go
@@ -5,8 +5,8 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestDateAdd(t *testing.T) {
diff --git a/sql/expression/function/greatest_least.go b/sql/expression/function/greatest_least.go
index f7bed5e..0dcc679 100644
--- a/sql/expression/function/greatest_least.go
+++ b/sql/expression/function/greatest_least.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 var ErrUintOverflow = errors.NewKind(
diff --git a/sql/expression/function/greatest_least_test.go b/sql/expression/function/greatest_least_test.go
index 3d2c451..e57bc91 100644
--- a/sql/expression/function/greatest_least_test.go
+++ b/sql/expression/function/greatest_least_test.go
@@ -2,8 +2,8 @@ package function
 
 import (
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 	"testing"
 	"unsafe"
 )
diff --git a/sql/expression/function/ifnull_test.go b/sql/expression/function/ifnull_test.go
index 481975b..a7a6d27 100644
--- a/sql/expression/function/ifnull_test.go
+++ b/sql/expression/function/ifnull_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestIfNull(t *testing.T) {
diff --git a/sql/expression/function/isbinary_test.go b/sql/expression/function/isbinary_test.go
index d8cc4ae..bb0b00e 100644
--- a/sql/expression/function/isbinary_test.go
+++ b/sql/expression/function/isbinary_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestIsBinary(t *testing.T) {
diff --git a/sql/expression/function/json_extract_test.go b/sql/expression/function/json_extract_test.go
index 7e7b9d7..05ec703 100644
--- a/sql/expression/function/json_extract_test.go
+++ b/sql/expression/function/json_extract_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestJSONExtract(t *testing.T) {
diff --git a/sql/expression/function/length_test.go b/sql/expression/function/length_test.go
index b1ab213..96e736f 100644
--- a/sql/expression/function/length_test.go
+++ b/sql/expression/function/length_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestLength(t *testing.T) {
diff --git a/sql/expression/function/logarithm_test.go b/sql/expression/function/logarithm_test.go
index 1ab718c..0b4cfcc 100644
--- a/sql/expression/function/logarithm_test.go
+++ b/sql/expression/function/logarithm_test.go
@@ -5,8 +5,8 @@ import (
 	"math"
 	"fmt"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
 	"gopkg.in/src-d/go-errors.v1"
 	"github.com/stretchr/testify/require"
 )
diff --git a/sql/expression/function/lower_upper_test.go b/sql/expression/function/lower_upper_test.go
index f2099da..57f7a7b 100644
--- a/sql/expression/function/lower_upper_test.go
+++ b/sql/expression/function/lower_upper_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestLower(t *testing.T) {
diff --git a/sql/expression/function/nullif_test.go b/sql/expression/function/nullif_test.go
index 24dd839..9d2a4d5 100644
--- a/sql/expression/function/nullif_test.go
+++ b/sql/expression/function/nullif_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestNullIf(t *testing.T) {
diff --git a/sql/expression/function/reverse_repeat_replace_test.go b/sql/expression/function/reverse_repeat_replace_test.go
index 51266aa..b18271a 100644
--- a/sql/expression/function/reverse_repeat_replace_test.go
+++ b/sql/expression/function/reverse_repeat_replace_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestReverse(t *testing.T) {
diff --git a/sql/expression/function/rpad_lpad_test.go b/sql/expression/function/rpad_lpad_test.go
index c6fd44c..81e1dbc 100644
--- a/sql/expression/function/rpad_lpad_test.go
+++ b/sql/expression/function/rpad_lpad_test.go
@@ -3,8 +3,8 @@ package function
 import (
 	"testing"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/sql/expression/function/sleep_test.go b/sql/expression/function/sleep_test.go
index 7a5126e..50187f3 100644
--- a/sql/expression/function/sleep_test.go
+++ b/sql/expression/function/sleep_test.go
@@ -5,8 +5,8 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestSleep(t *testing.T) {
diff --git a/sql/expression/function/soundex_test.go b/sql/expression/function/soundex_test.go
index 32c1b65..4bada3a 100644
--- a/sql/expression/function/soundex_test.go
+++ b/sql/expression/function/soundex_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestSoundex(t *testing.T) {
diff --git a/sql/expression/function/split_test.go b/sql/expression/function/split_test.go
index 0de25db..f0162ed 100644
--- a/sql/expression/function/split_test.go
+++ b/sql/expression/function/split_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestSplit(t *testing.T) {
diff --git a/sql/expression/function/sqrt_power_test.go b/sql/expression/function/sqrt_power_test.go
index 8e2d8f3..4d86a05 100644
--- a/sql/expression/function/sqrt_power_test.go
+++ b/sql/expression/function/sqrt_power_test.go
@@ -5,8 +5,8 @@ import (
 	"math"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestSqrt(t *testing.T) {
diff --git a/sql/expression/function/substring_test.go b/sql/expression/function/substring_test.go
index a0eb2f7..ef515b9 100644
--- a/sql/expression/function/substring_test.go
+++ b/sql/expression/function/substring_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestSubstring(t *testing.T) {
diff --git a/sql/expression/function/time_test.go b/sql/expression/function/time_test.go
index 867e2e8..de6fdd7 100644
--- a/sql/expression/function/time_test.go
+++ b/sql/expression/function/time_test.go
@@ -5,8 +5,8 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 const (
diff --git a/sql/expression/function/tobase64_frombase64_test.go b/sql/expression/function/tobase64_frombase64_test.go
index f1dd461..f214031 100644
--- a/sql/expression/function/tobase64_frombase64_test.go
+++ b/sql/expression/function/tobase64_frombase64_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestBase64(t *testing.T) {
diff --git a/sql/expression/function/trim_ltrim_rtrim_test.go b/sql/expression/function/trim_ltrim_rtrim_test.go
index dabf7b0..84edd2d 100644
--- a/sql/expression/function/trim_ltrim_rtrim_test.go
+++ b/sql/expression/function/trim_ltrim_rtrim_test.go
@@ -3,8 +3,8 @@ package function
 import (
 	"testing"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/sql/expression/function/version_test.go b/sql/expression/function/version_test.go
index a35a3bb..05989eb 100644
--- a/sql/expression/function/version_test.go
+++ b/sql/expression/function/version_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 const versionPostfix = "test"
diff --git a/sql/expression/interval_test.go b/sql/expression/interval_test.go
index 9c5442d..c19a833 100644
--- a/sql/expression/interval_test.go
+++ b/sql/expression/interval_test.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func TestTimeDelta(t *testing.T) {
diff --git a/sql/expression/isnull_test.go b/sql/expression/isnull_test.go
index f158455..5e638ba 100644
--- a/sql/expression/isnull_test.go
+++ b/sql/expression/isnull_test.go
@@ -3,7 +3,7 @@ package expression
 import (
 	"testing"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/sql/expression/like_test.go b/sql/expression/like_test.go
index 93ac14d..22c47c1 100644
--- a/sql/expression/like_test.go
+++ b/sql/expression/like_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func TestPatternToRegex(t *testing.T) {
diff --git a/sql/expression/logic_test.go b/sql/expression/logic_test.go
index 399da8f..3828f95 100644
--- a/sql/expression/logic_test.go
+++ b/sql/expression/logic_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func TestAnd(t *testing.T) {
diff --git a/sql/expression/tuple_test.go b/sql/expression/tuple_test.go
index 947463d..b4a5d32 100644
--- a/sql/expression/tuple_test.go
+++ b/sql/expression/tuple_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func TestTuple(t *testing.T) {
diff --git a/sql/expression/unresolved_test.go b/sql/expression/unresolved_test.go
index 59ceb35..61db6ff 100644
--- a/sql/expression/unresolved_test.go
+++ b/sql/expression/unresolved_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func TestUnresolvedExpression(t *testing.T) {
diff --git a/sql/expression/walk_test.go b/sql/expression/walk_test.go
index f093c4c..25488bb 100644
--- a/sql/expression/walk_test.go
+++ b/sql/expression/walk_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func TestWalk(t *testing.T) {
diff --git a/sql/functionregistry_test.go b/sql/functionregistry_test.go
index 7c9fdef..846bea7 100644
--- a/sql/functionregistry_test.go
+++ b/sql/functionregistry_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestFunctionRegistry(t *testing.T) {
diff --git a/sql/index/pilosa/driver_test.go b/sql/index/pilosa/driver_test.go
index 752de6a..be7edbb 100644
--- a/sql/index/pilosa/driver_test.go
+++ b/sql/index/pilosa/driver_test.go
@@ -12,9 +12,9 @@ import (
 
 	"github.com/pilosa/pilosa"
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/test"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/test"
 )
 
 var tmpDir string
diff --git a/sql/index/pilosa/lookup_test.go b/sql/index/pilosa/lookup_test.go
index a3b05ff..3f23168 100644
--- a/sql/index/pilosa/lookup_test.go
+++ b/sql/index/pilosa/lookup_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/pilosa/pilosa"
 	"github.com/stretchr/testify/require"
 	errors "gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func TestCompare(t *testing.T) {
diff --git a/sql/parse/describe_test.go b/sql/parse/describe_test.go
index 5aedc68..e699894 100644
--- a/sql/parse/describe_test.go
+++ b/sql/parse/describe_test.go
@@ -5,9 +5,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 	errors "gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 func TestParseDescribeQuery(t *testing.T) {
diff --git a/sql/parse/indexes_test.go b/sql/parse/indexes_test.go
index 5929fba..833be6b 100644
--- a/sql/parse/indexes_test.go
+++ b/sql/parse/indexes_test.go
@@ -5,12 +5,12 @@ import (
 	"strings"
 	"testing"
 
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/plan"
 
 	"github.com/stretchr/testify/require"
 	errors "gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func TestParseCreateIndex(t *testing.T) {
diff --git a/sql/parse/parse_test.go b/sql/parse/parse_test.go
index f2caa2b..02ebe99 100644
--- a/sql/parse/parse_test.go
+++ b/sql/parse/parse_test.go
@@ -4,11 +4,11 @@ import (
 	"testing"
 
 	errors "gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/plan"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 var fixtures = map[string]sql.Node{
diff --git a/sql/parse/show_create_test.go b/sql/parse/show_create_test.go
index 3b26f2b..be52a64 100644
--- a/sql/parse/show_create_test.go
+++ b/sql/parse/show_create_test.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 	"gopkg.in/src-d/go-errors.v1"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/plan"
 )
 
 func TestParseShowCreateTableQuery(t *testing.T) {
diff --git a/sql/plan/common_test.go b/sql/plan/common_test.go
index d9d3a86..301ae0d 100644
--- a/sql/plan/common_test.go
+++ b/sql/plan/common_test.go
@@ -7,8 +7,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 var benchtable = func() *mem.Table {
diff --git a/sql/plan/create_index_test.go b/sql/plan/create_index_test.go
index a4110f7..d176b0a 100644
--- a/sql/plan/create_index_test.go
+++ b/sql/plan/create_index_test.go
@@ -7,10 +7,10 @@ import (
 	"testing"
 	"time"
 
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/test"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/test"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/sql/plan/cross_join_test.go b/sql/plan/cross_join_test.go
index ab91704..6198d44 100644
--- a/sql/plan/cross_join_test.go
+++ b/sql/plan/cross_join_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 var lSchema = sql.Schema{
diff --git a/sql/plan/ddl_test.go b/sql/plan/ddl_test.go
index 8d97440..f099e29 100644
--- a/sql/plan/ddl_test.go
+++ b/sql/plan/ddl_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func TestCreateTable(t *testing.T) {
diff --git a/sql/plan/describe_test.go b/sql/plan/describe_test.go
index 56cf59e..5b23e2e 100644
--- a/sql/plan/describe_test.go
+++ b/sql/plan/describe_test.go
@@ -5,9 +5,9 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestDescribe(t *testing.T) {
diff --git a/sql/plan/distinct_test.go b/sql/plan/distinct_test.go
index 7f75224..0aa6461 100644
--- a/sql/plan/distinct_test.go
+++ b/sql/plan/distinct_test.go
@@ -5,9 +5,9 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestDistinct(t *testing.T) {
diff --git a/sql/plan/drop_index_test.go b/sql/plan/drop_index_test.go
index f067e8c..86ba9ae 100644
--- a/sql/plan/drop_index_test.go
+++ b/sql/plan/drop_index_test.go
@@ -5,9 +5,9 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestDeleteIndex(t *testing.T) {
diff --git a/sql/plan/exchange_test.go b/sql/plan/exchange_test.go
index 55c51d2..eca2842 100644
--- a/sql/plan/exchange_test.go
+++ b/sql/plan/exchange_test.go
@@ -7,8 +7,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestExchange(t *testing.T) {
diff --git a/sql/plan/filter_test.go b/sql/plan/filter_test.go
index 42dc63c..6c0f8f7 100644
--- a/sql/plan/filter_test.go
+++ b/sql/plan/filter_test.go
@@ -4,9 +4,9 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestFilter(t *testing.T) {
diff --git a/sql/plan/group_by_test.go b/sql/plan/group_by_test.go
index 8a78e6e..9e14a6f 100644
--- a/sql/plan/group_by_test.go
+++ b/sql/plan/group_by_test.go
@@ -4,10 +4,10 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression/function/aggregation"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
+	"github.com/src-d/go-mysql-server/sql/expression/function/aggregation"
 )
 
 func TestGroupBySchema(t *testing.T) {
diff --git a/sql/plan/having_test.go b/sql/plan/having_test.go
index a075e7e..34ccc64 100644
--- a/sql/plan/having_test.go
+++ b/sql/plan/having_test.go
@@ -4,9 +4,9 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestHaving(t *testing.T) {
diff --git a/sql/plan/join_test.go b/sql/plan/join_test.go
index ea14f51..5c26011 100644
--- a/sql/plan/join_test.go
+++ b/sql/plan/join_test.go
@@ -5,9 +5,9 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestJoinSchema(t *testing.T) {
diff --git a/sql/plan/limit_test.go b/sql/plan/limit_test.go
index 6f77885..3815e9c 100644
--- a/sql/plan/limit_test.go
+++ b/sql/plan/limit_test.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 var testingTable *mem.Table
diff --git a/sql/plan/lock_test.go b/sql/plan/lock_test.go
index 6f95eda..6393740 100644
--- a/sql/plan/lock_test.go
+++ b/sql/plan/lock_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func TestLockTables(t *testing.T) {
diff --git a/sql/plan/offset_test.go b/sql/plan/offset_test.go
index 6865ed1..be0d7de 100644
--- a/sql/plan/offset_test.go
+++ b/sql/plan/offset_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func TestOffsetPlan(t *testing.T) {
diff --git a/sql/plan/process_test.go b/sql/plan/process_test.go
index 0cc7c04..64ef90f 100644
--- a/sql/plan/process_test.go
+++ b/sql/plan/process_test.go
@@ -5,9 +5,9 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestQueryProcess(t *testing.T) {
diff --git a/sql/plan/processlist_test.go b/sql/plan/processlist_test.go
index 7cdcb6c..f0ec002 100644
--- a/sql/plan/processlist_test.go
+++ b/sql/plan/processlist_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func TestShowProcessList(t *testing.T) {
diff --git a/sql/plan/project_test.go b/sql/plan/project_test.go
index 7ada8ab..2efe29f 100644
--- a/sql/plan/project_test.go
+++ b/sql/plan/project_test.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestProject(t *testing.T) {
diff --git a/sql/plan/resolved_table_test.go b/sql/plan/resolved_table_test.go
index 2596393..cd8a2ef 100644
--- a/sql/plan/resolved_table_test.go
+++ b/sql/plan/resolved_table_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func TestResolvedTable(t *testing.T) {
diff --git a/sql/plan/set_test.go b/sql/plan/set_test.go
index 7241b64..5282ecd 100644
--- a/sql/plan/set_test.go
+++ b/sql/plan/set_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestSet(t *testing.T) {
diff --git a/sql/plan/show_create_database_test.go b/sql/plan/show_create_database_test.go
index 4f0da72..9c42b33 100644
--- a/sql/plan/show_create_database_test.go
+++ b/sql/plan/show_create_database_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func TestShowCreateDatabase(t *testing.T) {
diff --git a/sql/plan/show_create_table_test.go b/sql/plan/show_create_table_test.go
index 779ce44..3623f13 100644
--- a/sql/plan/show_create_table_test.go
+++ b/sql/plan/show_create_table_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func TestShowCreateTable(t *testing.T) {
diff --git a/sql/plan/show_indexes_test.go b/sql/plan/show_indexes_test.go
index e5e3dd8..e8e1bb4 100644
--- a/sql/plan/show_indexes_test.go
+++ b/sql/plan/show_indexes_test.go
@@ -4,9 +4,9 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestShowIndexes(t *testing.T) {
diff --git a/sql/plan/show_tables_test.go b/sql/plan/show_tables_test.go
index 316483a..349cac6 100644
--- a/sql/plan/show_tables_test.go
+++ b/sql/plan/show_tables_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func TestShowTables(t *testing.T) {
diff --git a/sql/plan/showcolumns_test.go b/sql/plan/showcolumns_test.go
index c65450e..f5d794f 100644
--- a/sql/plan/showcolumns_test.go
+++ b/sql/plan/showcolumns_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func TestShowColumns(t *testing.T) {
diff --git a/sql/plan/showtablestatus_test.go b/sql/plan/showtablestatus_test.go
index 28b56bc..46fbe7c 100644
--- a/sql/plan/showtablestatus_test.go
+++ b/sql/plan/showtablestatus_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func TestShowTableStatus(t *testing.T) {
diff --git a/sql/plan/showvariables_test.go b/sql/plan/showvariables_test.go
index e658c97..bb852dc 100644
--- a/sql/plan/showvariables_test.go
+++ b/sql/plan/showvariables_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func TestShowVariables(t *testing.T) {
diff --git a/sql/plan/showwarnings_test.go b/sql/plan/showwarnings_test.go
index e8595f1..67dfee6 100644
--- a/sql/plan/showwarnings_test.go
+++ b/sql/plan/showwarnings_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func TestShowWarnings(t *testing.T) {
diff --git a/sql/plan/sort_test.go b/sql/plan/sort_test.go
index 583046b..202668c 100644
--- a/sql/plan/sort_test.go
+++ b/sql/plan/sort_test.go
@@ -3,9 +3,9 @@ package plan
 import (
 	"testing"
 
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/sql/plan/subqueryalias_test.go b/sql/plan/subqueryalias_test.go
index a7b7724..94c045e 100644
--- a/sql/plan/subqueryalias_test.go
+++ b/sql/plan/subqueryalias_test.go
@@ -4,9 +4,9 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 )
 
 func TestSubqueryAliasSchema(t *testing.T) {
diff --git a/sql/plan/tablealias_test.go b/sql/plan/tablealias_test.go
index ced553f..9e5faf8 100644
--- a/sql/plan/tablealias_test.go
+++ b/sql/plan/tablealias_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func TestTableAlias(t *testing.T) {
diff --git a/sql/plan/transform_test.go b/sql/plan/transform_test.go
index 250fc9f..88a6cc8 100644
--- a/sql/plan/transform_test.go
+++ b/sql/plan/transform_test.go
@@ -3,9 +3,9 @@ package plan
 import (
 	"testing"
 
-	"gopkg.in/src-d/go-mysql-server.v0/mem"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
-	"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
+	"github.com/src-d/go-mysql-server/mem"
+	"github.com/src-d/go-mysql-server/sql"
+	"github.com/src-d/go-mysql-server/sql/expression"
 
 	"github.com/stretchr/testify/require"
 )
diff --git a/sql/plan/unresolved_test.go b/sql/plan/unresolved_test.go
index 3d0656c..662c578 100644
--- a/sql/plan/unresolved_test.go
+++ b/sql/plan/unresolved_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func TestUnresolvedTable(t *testing.T) {
diff --git a/sql/plan/walk_test.go b/sql/plan/walk_test.go
index 8d86981..dda866d 100644
--- a/sql/plan/walk_test.go
+++ b/sql/plan/walk_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gopkg.in/src-d/go-mysql-server.v0/sql"
+	"github.com/src-d/go-mysql-server/sql"
 )
 
 func TestWalk(t *testing.T) {